X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=transform-common.h;h=4351ce88991142588b5340a4626424d1dd4db5bf;hb=4d9d6e20e19c1aaa0d138e70897d136b36d673c0;hp=eea03c6be68b6c20f9fcfe5dcdb6e4db3ab42abb;hpb=83692003d26df90e149a3e627dbf4aaaad2ddb72;p=secnet.git

diff --git a/transform-common.h b/transform-common.h
index eea03c6..4351ce8 100644
--- a/transform-common.h
+++ b/transform-common.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
 
 #ifndef TRANSFORM_COMMON_H
 #define TRANSFORM_COMMON_H
@@ -7,7 +25,7 @@
 #define KEYED_CHECK do{				\
 	if (!ti->keyed) {			\
 	    *errmsg="transform unkeyed";	\
-	    return 1;				\
+	    return transform_apply_err;		\
 	}					\
     }while(0)
 
@@ -29,13 +47,13 @@ typedef uint32_t recvbitmap_type;
 	} else {						\
 	    /* Too much skew */					\
 	    *errmsg="seqnum: too much skew";			\
-	    return 2;						\
+	    return transform_apply_seqrange;			\
 	}							\
 	if ((p)->dedupe) {					\
 	    recvbitmap_type recvbit=(uint32_t)1 << skew;	\
 	    if (ti->recvbitmap & recvbit) {			\
 		*errmsg="seqnum: duplicate";			\
-		return 2;					\
+		return transform_apply_seqdupe;			\
 	    }							\
 	    ti->recvbitmap |= recvbit;				\
 	}							\
@@ -70,17 +88,17 @@ typedef uint32_t recvbitmap_type;
 	free(st);					\
     }
 
-#define SET_CAPAB_TRANSFORMNUM(def) do{					\
-        st->ops.capab_transformnum=dict_read_number(dict, "capab-num",	\
+#define SET_CAPAB_BIT(def) do{						\
+        st->ops.capab_bit=dict_read_number(dict, "capab-num",		\
                                      False, "transform", loc, (def));	\
-        if (st->ops.capab_transformnum > CAPAB_TRANSFORMNUM_MAX)	\
+        if (st->ops.capab_bit > CAPAB_BIT_MAX)				\
 	    cfgfatal(loc,"transform","capab-num out of range 0..%d\n",	\
-		     CAPAB_TRANSFORMNUM_MAX);				\
+		     CAPAB_BIT_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;		\