diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-02-09 18:58:45 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-02-09 18:58:45 +0100 |
| commit | 300e2909ba4714abc6093cba0ed860708282bd3e (patch) | |
| tree | 545c79c9fcbe036db503e50a3643acb3d5ff088d /extensions/libxt_multiport.c | |
| parent | 9cfc59f71f83ee97c4513fd340acf1e45073562b (diff) | |
| parent | 1eb619f3a0508d62847c311e69a09f4a8534c4df (diff) | |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'extensions/libxt_multiport.c')
| -rw-r--r-- | extensions/libxt_multiport.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c index dae6e335..d0e830df 100644 --- a/extensions/libxt_multiport.c +++ b/extensions/libxt_multiport.c @@ -81,7 +81,7 @@ parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto) { next=strchr(cp, ','); if (next) *next++='\0'; - ports[i] = parse_port(cp, proto); + ports[i] = xtables_parse_port(cp, proto); } if (cp) exit_error(PARAMETER_PROBLEM, "too many ports specified"); free(buffer); @@ -113,10 +113,10 @@ parse_multi_ports_v1(const char *portstring, "too many ports specified"); *range++ = '\0'; } - multiinfo->ports[i] = parse_port(cp, proto); + multiinfo->ports[i] = xtables_parse_port(cp, proto); if (range) { multiinfo->pflags[i] = 1; - multiinfo->ports[++i] = parse_port(range, proto); + multiinfo->ports[++i] = xtables_parse_port(range, proto); if (multiinfo->ports[i-1] >= multiinfo->ports[i]) exit_error(PARAMETER_PROBLEM, "invalid portrange specified"); @@ -161,7 +161,7 @@ __multiport_parse(int c, char **argv, int invert, unsigned int *flags, switch (c) { case '1': - check_inverse(argv[optind-1], &invert, &optind, 0); + xtables_check_inverse(argv[optind-1], &invert, &optind, 0); proto = check_proto(pnum, invflags); multiinfo->count = parse_multi_ports(argv[optind-1], multiinfo->ports, proto); @@ -169,7 +169,7 @@ __multiport_parse(int c, char **argv, int invert, unsigned int *flags, break; case '2': - check_inverse(argv[optind-1], &invert, &optind, 0); + xtables_check_inverse(argv[optind-1], &invert, &optind, 0); proto = check_proto(pnum, invflags); multiinfo->count = parse_multi_ports(argv[optind-1], multiinfo->ports, proto); @@ -177,7 +177,7 @@ __multiport_parse(int c, char **argv, int invert, unsigned int *flags, break; case '3': - check_inverse(argv[optind-1], &invert, &optind, 0); + xtables_check_inverse(argv[optind-1], &invert, &optind, 0); proto = check_proto(pnum, invflags); multiinfo->count = parse_multi_ports(argv[optind-1], multiinfo->ports, proto); @@ -228,21 +228,21 @@ __multiport_parse_v1(int c, char **argv, int invert, unsigned int *flags, switch (c) { case '1': - check_inverse(argv[optind-1], &invert, &optind, 0); + xtables_check_inverse(argv[optind-1], &invert, &optind, 0); proto = check_proto(pnum, invflags); parse_multi_ports_v1(argv[optind-1], multiinfo, proto); multiinfo->flags = XT_MULTIPORT_SOURCE; break; case '2': - check_inverse(argv[optind-1], &invert, &optind, 0); + xtables_check_inverse(argv[optind-1], &invert, &optind, 0); proto = check_proto(pnum, invflags); parse_multi_ports_v1(argv[optind-1], multiinfo, proto); multiinfo->flags = XT_MULTIPORT_DESTINATION; break; case '3': - check_inverse(argv[optind-1], &invert, &optind, 0); + xtables_check_inverse(argv[optind-1], &invert, &optind, 0); proto = check_proto(pnum, invflags); parse_multi_ports_v1(argv[optind-1], multiinfo, proto); multiinfo->flags = XT_MULTIPORT_EITHER; |