From b93c79862b47f227ac908430a2c9f16b4ecc0631 Mon Sep 17 00:00:00 2001 From: Marc Boucher Date: Thu, 6 Dec 2001 14:50:19 +0000 Subject: Export addr_to_anyname(), mask_to_dotted(), parse_hostnetworkmask() and parse_protocol() as they are needed by the upcoming ipt_conntrack match module. --- include/iptables.h | 6 ++++++ iptables.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/iptables.h b/include/iptables.h index ac2a6b3b..858bbdc7 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -112,6 +112,12 @@ extern void register_target(struct iptables_target *me); extern struct in_addr *dotted_to_addr(const char *dotted); extern char *addr_to_dotted(const struct in_addr *addrp); +extern char *addr_to_anyname(const struct in_addr *addr); +extern char *mask_to_dotted(const struct in_addr *mask); + +extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp, + struct in_addr *maskp, unsigned int *naddrs); +extern u_int16_t parse_protocol(const char *s); extern int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle); diff --git a/iptables.c b/iptables.c index 07de8964..3ff05898 100644 --- a/iptables.c +++ b/iptables.c @@ -604,7 +604,7 @@ parse_mask(char *mask) return &maskaddr; } -static void +void parse_hostnetworkmask(const char *name, struct in_addr **addrpp, struct in_addr *maskp, unsigned int *naddrs) { @@ -695,7 +695,7 @@ find_proto(const char *pname, enum ipt_tryload tryload, int nolookup) return find_match(pname, tryload); } -static u_int16_t +u_int16_t parse_protocol(const char *s) { unsigned int proto; @@ -818,7 +818,8 @@ addr_to_dotted(const struct in_addr *addrp) sprintf(buf, "%d.%d.%d.%d", bytep[0], bytep[1], bytep[2], bytep[3]); return buf; } -static char * + +char * addr_to_anyname(const struct in_addr *addr) { char *name; @@ -830,7 +831,7 @@ addr_to_anyname(const struct in_addr *addr) return addr_to_dotted(addr); } -static char * +char * mask_to_dotted(const struct in_addr *mask) { int i; -- cgit v1.2.3