X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/9c6a8729f6553615786878b382d4d44d2a54eec0..refs/heads/mdw/xdh:/transform-common.h diff --git a/transform-common.h b/transform-common.h index f35b5f6..4351ce8 100644 --- a/transform-common.h +++ b/transform-common.h @@ -25,7 +25,7 @@ #define KEYED_CHECK do{ \ if (!ti->keyed) { \ *errmsg="transform unkeyed"; \ - return 1; \ + return transform_apply_err; \ } \ }while(0) @@ -47,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; \ } \ @@ -88,12 +88,12 @@ 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 \