From 678ec919ffe3072468cb56de6eabf8cb8f7e9bdb Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 6 Feb 2012 22:51:32 +0100 Subject: expect: add expectfn support This patch allows you to set expectfn. Signed-off-by: Pablo Neira Ayuso --- include/internal/object.h | 3 +++ include/libnetfilter_conntrack/libnetfilter_conntrack.h | 1 + include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 1 + 3 files changed, 5 insertions(+) (limited to 'include') diff --git a/include/internal/object.h b/include/internal/object.h index 2bba5f7..94433bf 100644 --- a/include/internal/object.h +++ b/include/internal/object.h @@ -264,6 +264,8 @@ struct nfct_filter { * expectation object */ +#define __NFCT_EXPECTFN_MAX 24 /* maximum symbol length. */ + struct nf_expect { struct nfct_tuple_head master; struct nfct_tuple_head expected; @@ -277,6 +279,7 @@ struct nf_expect { u_int32_t class; char helper_name[NFCT_HELPER_NAME_MAX]; u_int32_t nat_dir; + char expectfn[__NFCT_EXPECTFN_MAX]; u_int32_t set[1]; }; diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index 28656ec..538dc2d 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -513,6 +513,7 @@ enum nf_expect_attr { ATTR_EXP_CLASS, /* u32 bits */ ATTR_EXP_NAT_TUPLE, /* pointer to conntrack object */ ATTR_EXP_NAT_DIR, /* u8 bits */ + ATTR_EXP_FN, /* string */ ATTR_EXP_MAX }; diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h index 3faf04f..2175799 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h @@ -178,6 +178,7 @@ enum ctattr_expect { CTA_EXPECT_FLAGS, CTA_EXPECT_CLASS, CTA_EXPECT_NAT, + CTA_EXPECT_FN, __CTA_EXPECT_MAX }; #define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) -- cgit v1.2.3