diff options
| -rw-r--r-- | include/ip6tables.h | 5 | ||||
| -rw-r--r-- | include/iptables_common.h | 5 | ||||
| -rw-r--r-- | ip6tables.c | 8 | ||||
| -rw-r--r-- | iptables.c | 8 |
4 files changed, 14 insertions, 12 deletions
diff --git a/include/ip6tables.h b/include/ip6tables.h index 89bdd54..8afe2ce 100644 --- a/include/ip6tables.h +++ b/include/ip6tables.h @@ -174,7 +174,8 @@ 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); extern int delete_chain(const ip6t_chainlabel chain, int verbose, ip6tc_handle_t *handle); -extern int ip6tables_insmod(const char *modname, const char *modprobe, int quit); -extern int load_ip6tables_ko(const char *modprobe, int quit); +extern int +ip6tables_insmod(const char *modname, const char *modprobe, int quiet); +extern int load_ip6tables_ko(const char *modprobe, int quiet); #endif /*_IP6TABLES_USER_H*/ diff --git a/include/iptables_common.h b/include/iptables_common.h index 0852906..3b29327 100644 --- a/include/iptables_common.h +++ b/include/iptables_common.h @@ -27,8 +27,9 @@ extern int string_to_number_ll(const char *, unsigned long long int, unsigned long long int, unsigned long long *); -extern int iptables_insmod(const char *modname, const char *modprobe, int quit); -extern int load_iptables_ko(const char *modprobe, int quit); +extern int +iptables_insmod(const char *modname, const char *modprobe, int quiet); +extern int load_iptables_ko(const char *modprobe, int quiet); void exit_error(enum exittype, char *, ...)__attribute__((noreturn, format(printf,2,3))); extern const char *program_name, *program_version; diff --git a/ip6tables.c b/ip6tables.c index 5cd7417..d2314b7 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -1751,7 +1751,7 @@ static char *get_modprobe(void) return NULL; } -int ip6tables_insmod(const char *modname, const char *modprobe, int quit) +int ip6tables_insmod(const char *modname, const char *modprobe, int quiet) { char *buf = NULL; char *argv[4]; @@ -1769,7 +1769,7 @@ int ip6tables_insmod(const char *modname, const char *modprobe, int quit) case 0: argv[0] = (char *)modprobe; argv[1] = (char *)modname; - if (quit) { + if (quiet) { argv[2] = "-q"; argv[3] = NULL; } else { @@ -1793,13 +1793,13 @@ int ip6tables_insmod(const char *modname, const char *modprobe, int quit) return -1; } -int load_ip6tables_ko(const char *modprobe, int quit) +int load_ip6tables_ko(const char *modprobe, int quiet) { static int loaded = 0; static int ret = -1; if (!loaded) { - ret = ip6tables_insmod("ip6_tables", modprobe, quit); + ret = ip6tables_insmod("ip6_tables", modprobe, quiet); loaded = (ret == 0); } @@ -1813,7 +1813,7 @@ static char *get_modprobe(void) return NULL; } -int iptables_insmod(const char *modname, const char *modprobe, int quit) +int iptables_insmod(const char *modname, const char *modprobe, int quiet) { char *buf = NULL; char *argv[4]; @@ -1831,7 +1831,7 @@ int iptables_insmod(const char *modname, const char *modprobe, int quit) case 0: argv[0] = (char *)modprobe; argv[1] = (char *)modname; - if (quit) { + if (quiet) { argv[2] = "-q"; argv[3] = NULL; } else { @@ -1855,13 +1855,13 @@ int iptables_insmod(const char *modname, const char *modprobe, int quit) return -1; } -int load_iptables_ko(const char *modprobe, int quit) +int load_iptables_ko(const char *modprobe, int quiet) { static int loaded = 0; static int ret = -1; if (!loaded) { - ret = iptables_insmod("ip_tables", NULL, quit); + ret = iptables_insmod("ip_tables", NULL, quiet); loaded = (ret == 0); } |