o remove useless backlog parameter in multicast sockets

o remove reminiscents of delay destroy message and relax transitions
o remove confusing StripNAT parameter: NAT support enabled by default
o relax event tracking: *_update callbacks use cache_update_force
o use wraparound-aware functions after/before/between
o lots of cleanups

4 files changed, 27 insertions, 18 deletions

diff --git a/include/conntrackd.h b/include/conntrackd.h
index 76b9747..a620400 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -30,22 +30,13 @@
 #define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
 
 enum {
-	STRIP_NAT_BIT = 0,
-	STRIP_NAT = (1 << STRIP_NAT_BIT),
-
-	DELAY_DESTROY_MSG_BIT = 1,
-	DELAY_DESTROY_MSG = (1 << DELAY_DESTROY_MSG_BIT),
-
-	RELAX_TRANSITIONS_BIT = 2,
-	RELAX_TRANSITIONS = (1 << RELAX_TRANSITIONS_BIT),
-
-	SYNC_MODE_PERSISTENT_BIT = 3,
+	SYNC_MODE_PERSISTENT_BIT = 0,
 	SYNC_MODE_PERSISTENT = (1 << SYNC_MODE_PERSISTENT_BIT),
 
-	SYNC_MODE_NACK_BIT = 4,
+	SYNC_MODE_NACK_BIT = 1,
 	SYNC_MODE_NACK = (1 << SYNC_MODE_NACK_BIT),
 
-	DONT_CHECKSUM_BIT = 5,
+	DONT_CHECKSUM_BIT = 2,
 	DONT_CHECKSUM = (1 << DONT_CHECKSUM_BIT),
 };
 
@@ -122,7 +113,7 @@ struct ct_sync_state {
 	struct mcast_sock *mcast_server;  /* multicast socket: incoming */
 	struct mcast_sock *mcast_client;  /* multicast socket: outgoing  */
 
-	struct sync_mode *mcast_sync;
+	struct sync_mode *sync;		/* sync mode */
 	struct buffer *buffer;
 
 	u_int32_t last_seq_sent;	/* last sequence number sent */
diff --git a/include/mcast.h b/include/mcast.h
index be1d0cd..66676dc 100644
--- a/include/mcast.h
+++ b/include/mcast.h
@@ -5,7 +5,6 @@
 
 struct mcast_conf {
 	int ipproto;
-	int backlog;
 	int reuseaddr;
 	int checksum;
 	unsigned short port;
diff --git a/include/network.h b/include/network.h
index 176274e..5ba808a 100644
--- a/include/network.h
+++ b/include/network.h
@@ -30,4 +30,23 @@ enum {
 	NET_ACK = (1 << NET_ACK_BIT),
 };
 
+/* extracted from net/tcp.h */
+
+/*
+ * The next routines deal with comparing 32 bit unsigned ints
+ * and worry about wraparound (automatic with unsigned arithmetic).
+ */
+
+static inline int before(__u32 seq1, __u32 seq2)
+{
+	return (__s32)(seq1-seq2) < 0;
+}
+#define after(seq2, seq1)       before(seq1, seq2)
+
+/* is s2<=s1<=s3 ? */
+static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
+{
+	return seq3 - seq2 >= seq1 - seq2;
+}
+
 #endif
diff --git a/include/sync.h b/include/sync.h
index d8f1bca..72f6313 100644
--- a/include/sync.h
+++ b/include/sync.h
@@ -13,10 +13,10 @@ struct sync_mode {
 	int  (*init)(void);
 	void (*kill)(void);
 	int  (*local)(int fd, int type, void *data);
-	int  (*pre_recv)(const struct nlnetwork *net);
-	void (*post_send)(int type,
-			  const struct nlnetwork *net,
-			  struct us_conntrack *u);
+	int  (*recv)(const struct nlnetwork *net); /* recv callback */
+	void (*send)(int type,			   /* send callback */
+		     const struct nlnetwork *net,
+		     struct us_conntrack *u);
 };
 
 extern struct sync_mode notrack;