Export addr_to_anyname(), mask_to_dotted(), parse_hostnetworkmask()

and parse_protocol() as they are needed by the upcoming ipt_conntrack match
module.

diff --git a/include/iptables.h b/include/iptables.h
index ac2a6b3b9b355668a6705b5c7fd3c7e197b1b3a0..858bbdc793ad8764709aba0699a4ad0331681384 100644 (file)
--- 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 07de8964a7a5f29c8b5957967ae7ddfd850f63c0..3ff05898b7245d9b00829077ba7933dd598bafb0 100644 (file)
--- 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;