From da2b8f936185e0224e0c4f78e724c45c7a52b194 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 24 Dec 2011 17:03:41 +0100 Subject: src: export NFCT_HELPER_NAME_MAX NFCT_HELPER_NAME_MAX is 16, which is the maximum helper name allowed since 2.6.29. Signed-off-by: Pablo Neira Ayuso --- src/conntrack/copy.c | 4 ++-- src/conntrack/parse.c | 4 ++-- src/conntrack/setter.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/conntrack') diff --git a/src/conntrack/copy.c b/src/conntrack/copy.c index c3a4fcc..cdce0de 100644 --- a/src/conntrack/copy.c +++ b/src/conntrack/copy.c @@ -405,8 +405,8 @@ static void copy_attr_repl_off_aft(struct nf_conntrack *dest, static void copy_attr_helper_name(struct nf_conntrack *dest, const struct nf_conntrack *orig) { - strncpy(dest->helper_name, orig->helper_name, __NFCT_HELPER_NAMELEN); - dest->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + strncpy(dest->helper_name, orig->helper_name, NFCT_HELPER_NAME_MAX); + dest->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; } static void copy_attr_zone(struct nf_conntrack *dest, diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c index 8f8a01c..ee3074d 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -417,8 +417,8 @@ __parse_helper(const struct nfattr *attr, struct nf_conntrack *ct) strncpy(ct->helper_name, NFA_DATA(tb[CTA_HELP_NAME-1]), - __NFCT_HELPER_NAMELEN); - ct->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + NFCT_HELPER_NAME_MAX); + ct->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; set_bit(ATTR_HELPER_NAME, ct->set); } diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c index 3282035..df06b04 100644 --- a/src/conntrack/setter.c +++ b/src/conntrack/setter.c @@ -310,8 +310,8 @@ static void set_attr_repl_off_aft(struct nf_conntrack *ct, const void *value) static void set_attr_helper_name(struct nf_conntrack *ct, const void *value) { - strncpy(ct->helper_name, value, __NFCT_HELPER_NAMELEN); - ct->helper_name[__NFCT_HELPER_NAMELEN-1] = '\0'; + strncpy(ct->helper_name, value, NFCT_HELPER_NAME_MAX); + ct->helper_name[NFCT_HELPER_NAME_MAX-1] = '\0'; } static void set_attr_dccp_state(struct nf_conntrack *ct, const void *value) -- cgit v1.2.3