diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2008-01-20 13:36:08 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-01-20 13:36:08 +0000 |
commit | 08b1616e068166e016b3ee7110db10ae5d853422 (patch) | |
tree | 488c6f587304c43ca94e6c0da62cf4547fcac564 /include | |
parent | a80b6046fa216c26dbc18d587f6255afa8444885 (diff) |
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 <jengelh@computergmbh.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/iptables.h | 3 | ||||
-rw-r--r-- | include/xtables.h | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/iptables.h b/include/iptables.h index 91a93c32..7c5c0f7c 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 5e4b2c7b..5fa34846 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 |