X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=transform-common.h;h=af62738c9120893761d377beaef09264e6ba6754;hp=de198176cdd81ef15e0c01cbb5a446969771341a;hb=423936d35d7671fd017d2d611d418d1b8eeb6195;hpb=1ce2f8bc69bc1bef98b48f450081d96e2c29cc00

diff --git a/transform-common.h b/transform-common.h
index de19817..af62738 100644
--- a/transform-common.h
+++ b/transform-common.h
@@ -2,6 +2,8 @@
 #ifndef TRANSFORM_COMMON_H
 #define TRANSFORM_COMMON_H
 
+#include "magic.h"
+
 #define KEYED_CHECK do{				\
 	if (!ti->keyed) {			\
 	    *errmsg="transform unkeyed";	\
@@ -9,20 +11,48 @@
 	}					\
     }while(0)
 
-#define SEQNUM_CHECK(seqnum, max_skew) do{	\
-	uint32_t skew=seqnum-ti->lastrecvseq;	\
-	if (skew<0x8fffffff) {			\
-	    /* Ok */				\
-	    ti->lastrecvseq=seqnum;		\
-	} else if ((0-skew)<max_skew) {	\
-	    /* Ok */				\
-	} else {				\
-	    /* Too much skew */			\
-	    *errmsg="seqnum: too much skew";	\
-	    return 2;				\
-	}					\
+#define RECVBITMAP_SIZE 32
+typedef uint32_t recvbitmap_type;
+
+#define SEQNUM_CHECK(seqnum, p) do{				\
+	uint32_t skew=seqnum-ti->lastrecvseq;			\
+	if (skew<0x8fffffff) {					\
+	    /* Ok */						\
+	    ti->lastrecvseq=seqnum;				\
+	    if (skew < RECVBITMAP_SIZE)				\
+                ti->recvbitmap <<= skew;			\
+            else						\
+                ti->recvbitmap=0;				\
+            skew=0;						\
+	} else if ((0-skew)<(p)->max_seq_skew) {		\
+	    /* Ok */						\
+	} else {						\
+	    /* Too much skew */					\
+	    *errmsg="seqnum: too much skew";			\
+	    return 2;						\
+	}							\
+	if ((p)->dedupe) {					\
+	    recvbitmap_type recvbit=(uint32_t)1 << skew;	\
+	    if (ti->recvbitmap & recvbit) {			\
+		*errmsg="seqnum: duplicate";			\
+		return 2;					\
+	    }							\
+	    ti->recvbitmap |= recvbit;				\
+	}							\
     }while(0)
 
+#define SEQNUM_KEYED_FIELDS						\
+    uint32_t sendseq;							\
+    uint32_t lastrecvseq;						\
+    recvbitmap_type recvbitmap; /* 1<<0 is lastrecvseq (i.e., most recent) */ \
+    bool_t keyed
+
+#define SEQNUM_KEYED_INIT(initlastrecvseq,initsendseq)	\
+    (ti->lastrecvseq=(initlastrecvseq),			\
+     ti->sendseq=(initsendseq),				\
+     ti->recvbitmap=0,					\
+     ti->keyed=True)
+
 #define TRANSFORM_VALID				\
     static bool_t transform_valid(void *sst)	\
     {						\
@@ -40,9 +70,17 @@
 	free(st);					\
     }
 
+#define SET_CAPAB_TRANSFORMNUM(def) do{					\
+        st->ops.capab_transformnum=dict_read_number(dict, "capab-num",	\
+                                     False, "transform", loc, (def));	\
+        if (st->ops.capab_transformnum > CAPAB_TRANSFORMNUM_MAX)	\
+	    cfgfatal(loc,"transform","capab-num out of range 0..%d\n",	\
+		     CAPAB_TRANSFORMNUM_MAX);				\
+    }while(0)
+
 #define TRANSFORM_CREATE_CORE				\
 	struct transform_inst *ti;			\
-	ti=safe_malloc(sizeof(*ti),"transform_create");	\
+	NEW(ti);					\
 	/* mlock XXX */					\
 	ti->ops.st=ti;					\
 	ti->ops.setkey=transform_setkey;		\
@@ -51,7 +89,21 @@
 	ti->ops.forwards=transform_forward;		\
 	ti->ops.reverse=transform_reverse;		\
 	ti->ops.destroy=transform_destroy;		\
-	ti->ops.max_start_pad=st->ops.max_start_pad;	\
 	ti->keyed=False;
 
+#define SEQNUM_PARAMS_FIELDS			\
+    uint32_t max_seq_skew;			\
+    bool_t dedupe;
+
+#define SEQNUM_PARAMS_INIT(dict,p,desc,loc)				\
+    (p)->max_seq_skew=dict_read_number((dict), "max-sequence-skew",	\
+					False, (desc), (loc), 10);	\
+    bool_t can_dedupe=(p)->max_seq_skew < RECVBITMAP_SIZE;		\
+    (p)->dedupe=dict_read_bool((dict), "dedupe",			\
+			       False,(desc),(loc), can_dedupe);		\
+    if ((p)->dedupe && !can_dedupe)					\
+	cfgfatal(loc,"transform",					\
+                 "cannot dedupe with max-sequence-skew>=32");		\
+    else (void)0
+
 #endif /*TRANSFORM_COMMON_H*/