diff options
author | Yasuyuki KOZAKAI <yasuyuki@netfilter.org> | 2007-07-24 05:53:48 +0000 |
---|---|---|
committer | Yasuyuki KOZAKAI <yasuyuki@netfilter.org> | 2007-07-24 05:53:48 +0000 |
commit | 04f8c54dc52e19096d31d94593bd1040716afe4d (patch) | |
tree | df628c95c8f2f5f25cf5f7bdebcca8f8ae8d4e93 /include | |
parent | 0d502bcdbc97ed359e84f6a21dfa0049b3b60a6c (diff) |
Moves some duplicated functions in ip[6]tables.c to xtables.c
string_to_number_ll, string_to_number_l, string_to_number,
service_to_port, parse_port, parse_interface, are moved.
Diffstat (limited to 'include')
-rw-r--r-- | include/ip6tables.h | 3 | ||||
-rw-r--r-- | include/iptables.h | 3 | ||||
-rw-r--r-- | include/iptables_common.h | 12 | ||||
-rw-r--r-- | include/xtables.h | 17 |
4 files changed, 17 insertions, 18 deletions
diff --git a/include/ip6tables.h b/include/ip6tables.h index b9e364e9..90e32836 100644 --- a/include/ip6tables.h +++ b/include/ip6tables.h @@ -36,11 +36,8 @@ extern int line; extern void register_match6(struct ip6tables_match *me); extern void register_target6(struct ip6tables_target *me); -extern int service_to_port(const char *name, const char *proto); -extern u_int16_t parse_port(const char *port, const char *proto); extern int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle); -extern void parse_interface(const char *arg, char *vianame, unsigned char *mask); extern int for_each_chain(int (*fn)(const ip6t_chainlabel, int, ip6tc_handle_t *), int verbose, int builtinstoo, ip6tc_handle_t *handle); extern int flush_entries(const ip6t_chainlabel chain, int verbose, ip6tc_handle_t *handle); diff --git a/include/iptables.h b/include/iptables.h index 9df1a297..1f929772 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -35,8 +35,6 @@ extern int line; extern void register_match(struct iptables_match *me); extern void register_target(struct iptables_target *me); -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); extern struct in_addr *dotted_to_mask(const char *dotted); extern char *addr_to_dotted(const struct in_addr *addrp); @@ -46,7 +44,6 @@ 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 void parse_interface(const char *arg, char *vianame, unsigned char *mask); extern int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle); diff --git a/include/iptables_common.h b/include/iptables_common.h index 3e190805..cf8a4ba2 100644 --- a/include/iptables_common.h +++ b/include/iptables_common.h @@ -15,18 +15,6 @@ enum exittype { extern void exit_printhelp() __attribute__((noreturn)); extern void exit_tryhelp(int) __attribute__((noreturn)); int check_inverse(const char option[], int *invert, int *optind, int argc); -extern int string_to_number(const char *, - unsigned int, - unsigned int, - unsigned int *); -extern int string_to_number_l(const char *, - unsigned long int, - unsigned long int, - unsigned long *); -extern int string_to_number_ll(const char *, - unsigned long long int, - unsigned long long int, - unsigned long long *); void exit_error(enum exittype, char *, ...)__attribute__((noreturn, format(printf,2,3))); extern const char *program_name, *program_version; diff --git a/include/xtables.h b/include/xtables.h index 89b92c36..5ae30014 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -180,4 +180,21 @@ extern struct xtables_match *find_match(const char *name, enum xt_tryload, struct xtables_rule_match **match); extern struct xtables_target *find_target(const char *name, enum xt_tryload); +extern int string_to_number_ll(const char *s, + unsigned long long min, + unsigned long long max, + unsigned long long *ret); +extern int string_to_number_l(const char *s, + unsigned long min, + unsigned long max, + unsigned long *ret); +extern int string_to_number(const char *s, + unsigned int min, + unsigned int max, + unsigned int *ret); +extern int service_to_port(const char *name, const char *proto); +extern u_int16_t parse_port(const char *port, const char *proto); +extern void +parse_interface(const char *arg, char *vianame, unsigned char *mask); + #endif /* _XTABLES_H */ |