On Wed, Jun 04, 2014 at 08:46:29PM +0800, Yuxuan Shui wrote:
> Add a new datatype for ip headers which specify the byteorder, this
> fixes bug 918.
>
> Signed-off-by: Yuxuan Shui <yshuiv7@xxxxxxxxx>
> ---
> src/proto.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/src/proto.c b/src/proto.c
> index 0a37a65..f1556db 100644
> --- a/src/proto.c
> +++ b/src/proto.c
> @@ -184,13 +184,21 @@ void proto_ctx_update(struct proto_ctx *ctx, enum proto_bases base,
> proto_ctx_debug(ctx, base);
> }
>
> +const struct datatype net_integer = {
> + .type = TYPE_INTEGER,
> + .byteorder = BYTEORDER_BIG_ENDIAN,
> + .name = "net_integer",
> + .desc = "network integer",
> + .basetype = &integer_type,
> +};
> +
> #define HDR_TEMPLATE(__name, __dtype, __type, __member) \
> PROTO_HDR_TEMPLATE(__name, __dtype, \
> offsetof(__type, __member) * 8, \
> field_sizeof(__type, __member) * 8)
>
> #define HDR_FIELD(__name, __struct, __member) \
> - HDR_TEMPLATE(__name, &integer_type, __struct, __member)
> + HDR_TEMPLATE(__name, &net_integer, __struct, __member)
> #define HDR_BITFIELD(__name, __dtype, __offset, __len) \
> PROTO_HDR_TEMPLATE(__name, __dtype, __offset, __len)
> #define HDR_TYPE(__name, __dtype, __struct, __member) \
While this does make some sense, I would rather change
byteorder_conversion_op() to return immediately for expressions of size <= 8.
There is obviously no byteorder in this case, so this seems more like
working around incorrect behaviour of that function.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
