diff options
| -rw-r--r-- | extensions/libipt_multiport.c | 21 | ||||
| -rw-r--r-- | include/iptables.h | 1 | ||||
| -rw-r--r-- | iptables.c | 3 |
3 files changed, 5 insertions, 20 deletions
diff --git a/extensions/libipt_multiport.c b/extensions/libipt_multiport.c index 2a10abd..28fd850 100644 --- a/extensions/libipt_multiport.c +++ b/extensions/libipt_multiport.c @@ -51,23 +51,6 @@ static struct option opts[] = { {0} }; -static char * -proto_to_name(u_int8_t proto) -{ - switch (proto) { - case IPPROTO_TCP: - return "tcp"; - case IPPROTO_UDP: - return "udp"; - case IPPROTO_SCTP: - return "sctp"; - case IPPROTO_DCCP: - return "dccp"; - default: - return NULL; - } -} - static unsigned int parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto) { @@ -143,7 +126,7 @@ check_proto(const struct ipt_entry *entry) exit_error(PARAMETER_PROBLEM, "multiport only works with TCP or UDP"); - if ((proto = proto_to_name(entry->ip.proto)) != NULL) + if ((proto = proto_to_name(entry->ip.proto, 1)) != NULL) return proto; else if (!entry->ip.proto) exit_error(PARAMETER_PROBLEM, @@ -264,7 +247,7 @@ port_to_service(int port, u_int8_t proto) { struct servent *service; - if ((service = getservbyport(htons(port), proto_to_name(proto)))) + if ((service = getservbyport(htons(port), proto_to_name(proto, 1)))) return service->s_name; return NULL; diff --git a/include/iptables.h b/include/iptables.h index ba27cac..d616c8c 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -151,6 +151,7 @@ extern int line; extern void register_match(struct iptables_match *me); extern void register_target(struct iptables_target *me); +extern char *proto_to_name(u_int8_t proto, int nolookup); extern int service_to_port(const char *name, const char *proto); extern u_int16_t parse_port(const char *port, const char *proto); extern struct in_addr *dotted_to_addr(const char *dotted); @@ -229,9 +229,10 @@ static const struct pprot chain_protos[] = { { "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "sctp", IPPROTO_SCTP }, + { "dccp", IPPROTO_DCCP }, }; -static char * +char * proto_to_name(u_int8_t proto, int nolookup) { unsigned int i; |