diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/libip6t_policy.c | 2 | ||||
| -rw-r--r-- | extensions/libipt_policy.c | 2 | ||||
| -rw-r--r-- | extensions/libxt_conntrack.c | 5 | ||||
| -rw-r--r-- | extensions/libxt_time.c | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index 83ee48ec..7c1a1e71 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -244,7 +244,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --proto option"); - e->proto = parse_protocol(argv[optind-1]); + e->proto = xtables_parse_protocol(argv[optind-1]); if (e->proto != IPPROTO_AH && e->proto != IPPROTO_ESP && e->proto != IPPROTO_COMP) exit_error(PARAMETER_PROBLEM, diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index 742eeba9..6ae51e7c 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -212,7 +212,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --proto option"); - e->proto = parse_protocol(argv[optind-1]); + e->proto = xtables_parse_protocol(argv[optind-1]); if (e->proto != IPPROTO_AH && e->proto != IPPROTO_ESP && e->proto != IPPROTO_COMP) exit_error(PARAMETER_PROBLEM, diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index 914b253b..45783f4d 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -317,7 +317,8 @@ static int conntrack_parse(int c, char **argv, int invert, unsigned int *flags, *protocol = tolower(*protocol); protocol = argv[optind-1]; - sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum = parse_protocol(protocol); + sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum = + xtables_parse_protocol(protocol); if (sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum == 0 && (sinfo->invflags & XT_INV_PROTO)) @@ -455,7 +456,7 @@ conntrack_mt_parse(int c, char **argv, int invert, unsigned int *flags, /* Canonicalize into lower case */ for (p = optarg; *p != '\0'; ++p) *p = tolower(*p); - info->l4proto = parse_protocol(optarg); + info->l4proto = xtables_parse_protocol(optarg); if (info->l4proto == 0 && (info->invert_flags & XT_INV_PROTO)) exit_error(PARAMETER_PROBLEM, "conntrack: rule would " diff --git a/extensions/libxt_time.c b/extensions/libxt_time.c index 989806de..41aa5c77 100644 --- a/extensions/libxt_time.c +++ b/extensions/libxt_time.c @@ -22,7 +22,6 @@ #include <linux/netfilter/xt_time.h> #include <xtables.h> -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x)) enum { /* getopt "seen" bits */ F_DATE_START = 1 << 0, |