- Use PFRULE_STATESLOPPY if supported

1 files changed, 27 insertions, 27 deletions

diff --git a/net/relayd/files/patch-freebsd-relayd b/net/relayd/files/patch-freebsd-relayd
index 369ae0fbaeda..5f2e80c11a94 100644
--- a/net/relayd/files/patch-freebsd-relayd
+++ b/net/relayd/files/patch-freebsd-relayd
@@ -1,6 +1,6 @@
 diff -Naur relayd.orig/carp.c relayd/carp.c
---- relayd.orig/carp.c	2010-06-09 22:44:47.709807443 +0200
-+++ relayd/carp.c	2010-06-09 22:44:55.816582245 +0200
+--- relayd.orig/carp.c	2010-06-10 08:50:20.370081718 +0200
++++ relayd/carp.c	2010-06-10 08:50:24.487544459 +0200
 @@ -19,6 +19,7 @@
  #include <sys/param.h>
  #include <sys/socket.h>
@@ -10,8 +10,8 @@ diff -Naur relayd.orig/carp.c relayd/carp.c
  #include <net/if.h>
  
 diff -Naur relayd.orig/check_tcp.c relayd/check_tcp.c
---- relayd.orig/check_tcp.c	2010-06-09 22:44:47.710811474 +0200
-+++ relayd/check_tcp.c	2010-06-09 22:44:55.816582245 +0200
+--- relayd.orig/check_tcp.c	2010-06-10 08:50:20.371085750 +0200
++++ relayd/check_tcp.c	2010-06-10 08:50:24.488548211 +0200
 @@ -31,7 +31,7 @@
  #include <stdlib.h>
  #include <errno.h>
@@ -70,8 +70,8 @@ diff -Naur relayd.orig/check_tcp.c relayd/check_tcp.c
  	if (strcmp(cte->table->conf.digest, digest)) {
  		log_warnx("check_http_digest: %s failed "
 diff -Naur relayd.orig/hce.c relayd/hce.c
---- relayd.orig/hce.c	2010-06-09 22:44:47.708803690 +0200
-+++ relayd/hce.c	2010-06-09 22:44:55.817586277 +0200
+--- relayd.orig/hce.c	2010-06-10 08:50:20.370081718 +0200
++++ relayd/hce.c	2010-06-10 08:50:24.489552523 +0200
 @@ -167,7 +167,7 @@
  	struct timeval	 tv;
  	struct table	*table;
@@ -93,8 +93,8 @@ diff -Naur relayd.orig/hce.c relayd/hce.c
  	host->last_up = host->up;
  
 diff -Naur relayd.orig/log.c relayd/log.c
---- relayd.orig/log.c	2010-06-09 22:44:47.708803690 +0200
-+++ relayd/log.c	2010-06-09 22:44:55.817586277 +0200
+--- relayd.orig/log.c	2010-06-10 08:50:20.370081718 +0200
++++ relayd/log.c	2010-06-10 08:50:24.489552523 +0200
 @@ -16,7 +16,11 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -108,8 +108,8 @@ diff -Naur relayd.orig/log.c relayd/log.c
  #include <sys/socket.h>
  #include <sys/tree.h>
 diff -Naur relayd.orig/parse.y relayd/parse.y
---- relayd.orig/parse.y	2010-06-09 22:44:47.708803690 +0200
-+++ relayd/parse.y	2010-06-09 22:44:55.818590030 +0200
+--- relayd.orig/parse.y	2010-06-10 08:50:20.372089782 +0200
++++ relayd/parse.y	2010-06-10 08:50:24.490556275 +0200
 @@ -343,6 +343,7 @@
  			}
  			conf->sc_prefork_relay = $2;
@@ -171,8 +171,8 @@ diff -Naur relayd.orig/parse.y relayd/parse.y
  	if (error) {
  		log_warnx("host_dns: could not parse \"%s\": %s", s,
 diff -Naur relayd.orig/pfe.c relayd/pfe.c
---- relayd.orig/pfe.c	2010-06-09 22:44:47.710811474 +0200
-+++ relayd/pfe.c	2010-06-09 22:44:55.819593782 +0200
+--- relayd.orig/pfe.c	2010-06-10 08:50:20.369077965 +0200
++++ relayd/pfe.c	2010-06-10 08:50:24.491560307 +0200
 @@ -17,6 +17,9 @@
   */
  
@@ -210,8 +210,8 @@ diff -Naur relayd.orig/pfe.c relayd/pfe.c
  }
  
 diff -Naur relayd.orig/pfe_filter.c relayd/pfe_filter.c
---- relayd.orig/pfe_filter.c	2010-06-09 22:44:47.709807443 +0200
-+++ relayd/pfe_filter.c	2010-06-09 22:44:55.819593782 +0200
+--- relayd.orig/pfe_filter.c	2010-06-10 08:50:20.370081718 +0200
++++ relayd/pfe_filter.c	2010-06-10 08:51:10.599999014 +0200
 @@ -97,6 +97,10 @@
  		    sizeof(tables[i].pfrt_name))
  			goto toolong;
@@ -253,7 +253,7 @@ diff -Naur relayd.orig/pfe_filter.c relayd/pfe_filter.c
  
  			/* Use sloppy state handling for half connections */
  			rio.rule.keep_state = PF_STATE_NORMAL;
-+#if 0
++#ifdef PFRULE_STATESLOPPY
  			rio.rule.rule_flag = PFRULE_STATESLOPPY;
 +#endif
  			break;
@@ -270,8 +270,8 @@ diff -Naur relayd.orig/pfe_filter.c relayd/pfe_filter.c
  		if (rio.rule.proto == IPPROTO_TCP)
  			rio.rule.timeout[PFTM_TCP_ESTABLISHED] =
 diff -Naur relayd.orig/relay.c relayd/relay.c
---- relayd.orig/relay.c	2010-06-09 22:44:47.710811474 +0200
-+++ relayd/relay.c	2010-06-09 22:44:55.821601845 +0200
+--- relayd.orig/relay.c	2010-06-10 08:50:20.371085750 +0200
++++ relayd/relay.c	2010-06-10 08:50:24.492564339 +0200
 @@ -16,7 +16,11 @@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -382,8 +382,8 @@ diff -Naur relayd.orig/relay.c relayd/relay.c
  	if ((rlay->rl_ssl_key = relay_load_file(certfile,
  	    &rlay->rl_ssl_key_len)) == NULL)
 diff -Naur relayd.orig/relay_udp.c relayd/relay_udp.c
---- relayd.orig/relay_udp.c	2010-06-09 22:44:47.709807443 +0200
-+++ relayd/relay_udp.c	2010-06-09 22:44:55.821601845 +0200
+--- relayd.orig/relay_udp.c	2010-06-10 08:50:20.370081718 +0200
++++ relayd/relay_udp.c	2010-06-10 08:50:24.493571444 +0200
 @@ -16,7 +16,11 @@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -397,8 +397,8 @@ diff -Naur relayd.orig/relay_udp.c relayd/relay_udp.c
  #include <sys/time.h>
  #include <sys/stat.h>
 diff -Naur relayd.orig/relayd.8 relayd/relayd.8
---- relayd.orig/relayd.8	2010-06-09 22:44:47.710811474 +0200
-+++ relayd/relayd.8	2010-06-09 22:44:55.822606436 +0200
+--- relayd.orig/relayd.8	2010-06-10 08:50:20.371085750 +0200
++++ relayd/relayd.8	2010-06-10 08:50:24.493571444 +0200
 @@ -117,7 +117,7 @@
  .It Fl f Ar file
  Specify an alternative configuration file.
@@ -418,8 +418,8 @@ diff -Naur relayd.orig/relayd.8 relayd/relayd.8
  .It /var/run/relayd.sock
  Unix-domain socket used for communication with
 diff -Naur relayd.orig/relayd.c relayd/relayd.c
---- relayd.orig/relayd.c	2010-06-09 22:44:47.709807443 +0200
-+++ relayd/relayd.c	2010-06-09 22:45:54.535579649 +0200
+--- relayd.orig/relayd.c	2010-06-10 08:50:20.370081718 +0200
++++ relayd/relayd.c	2010-06-10 08:50:24.494572682 +0200
 @@ -17,7 +17,12 @@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -578,8 +578,8 @@ diff -Naur relayd.orig/relayd.c relayd/relayd.c
  	    bnd->bnd_ss.ss_len) == -1)
  		goto fail;
 diff -Naur relayd.orig/relayd.conf.5 relayd/relayd.conf.5
---- relayd.orig/relayd.conf.5	2010-06-09 22:44:47.708803690 +0200
-+++ relayd/relayd.conf.5	2010-06-09 22:44:55.823609909 +0200
+--- relayd.orig/relayd.conf.5	2010-06-10 08:50:20.371085750 +0200
++++ relayd/relayd.conf.5	2010-06-10 08:50:24.495576434 +0200
 @@ -78,7 +78,7 @@
  .Ic include
  keyword, for example:
@@ -699,8 +699,8 @@ diff -Naur relayd.orig/relayd.conf.5 relayd/relayd.conf.5
  .Sh HISTORY
  The
 diff -Naur relayd.orig/relayd.h relayd/relayd.h
---- relayd.orig/relayd.h	2010-06-09 22:44:47.710811474 +0200
-+++ relayd/relayd.h	2010-06-09 22:44:55.824617851 +0200
+--- relayd.orig/relayd.h	2010-06-10 08:50:20.372089782 +0200
++++ relayd/relayd.h	2010-06-10 08:50:24.496580466 +0200
 @@ -19,10 +19,18 @@
   */