From f3479e41a8a8dfa59d8381b43c5cd2f655b025aa Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Sun, 20 Jan 2008 13:36:08 +0000 Subject: [PATCH]: bunch o' renames Move a few functions from iptables.c/ip6tables.c to xtables.c so they are available for combined (both AF_INET and AF_INET6) libxt modules. Rename overlapping function names. Signed-off-by: Jan Engelhardt --- include/iptables.h | 3 --- include/xtables.h | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/iptables.h b/include/iptables.h index 91a93c3..7c5c0f7 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -26,9 +26,6 @@ extern void register_target(struct iptables_target *me); extern struct in_addr *dotted_to_addr(const char *dotted); extern struct in_addr *dotted_to_mask(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); diff --git a/include/xtables.h b/include/xtables.h index 5e4b2c7..5fa3484 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -236,6 +236,14 @@ void exit_error(enum exittype, const char *, ...)__attribute__((noreturn, extern void param_act(unsigned int, const char *, ...); extern const char *program_name, *program_version; +extern const char *ipaddr_to_numeric(const struct in_addr *); +extern const char *ipaddr_to_anyname(const struct in_addr *); +extern const char *ipmask_to_numeric(const struct in_addr *); + +extern const char *ip6addr_to_numeric(const struct in6_addr *); +extern const char *ip6addr_to_anyname(const struct in6_addr *); +extern const char *ip6mask_to_numeric(const struct in6_addr *); + #ifdef NO_SHARED_LIBS # ifdef _INIT # undef _init -- cgit v1.2.3