diff options
author | Jamal Hadi Salim <hadi@cyberus.ca> | 2009-02-13 09:14:17 -0500 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2009-02-13 15:46:52 +0100 |
commit | 7e4db2f50133007f549f222468bde4f3adcf41ac (patch) | |
tree | 161425eb53b09d37cc86f961fdb1760548b8e338 /iptables-standalone.c | |
parent | 70581922f873a88306dd5b1cb83c5081ee239eb8 (diff) |
libxtables: consolidate init calls into one function
Introduce xtables_init_all() which hides three calls xtables_init(),
xtables_set_nfproto(), and xtables_set_params(). Make
ip[6]tables-restore, ip[6]tables-save and ip[6]tables-standalone use
it.
I moved xtables_set_params around for readability reasons.
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Diffstat (limited to 'iptables-standalone.c')
-rw-r--r-- | iptables-standalone.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/iptables-standalone.c b/iptables-standalone.c index 007f2c2d..6090ea15 100644 --- a/iptables-standalone.c +++ b/iptables-standalone.c @@ -54,9 +54,14 @@ main(int argc, char *argv[]) program_version = IPTABLES_VERSION; xtables_program_name = program_name; - xtables_init(); - xtables_set_nfproto(NFPROTO_IPV4); iptables_globals.program_name = "iptables"; + ret = xtables_init_all(&iptables_globals, NFPROTO_IPV4); + if (ret < 0) { + fprintf(stderr, "%s/%s Failed to initialize xtables\n", + iptables_globals.program_name, + iptables_globals.program_version); + exit(1); + } #ifdef NO_SHARED_LIBS init_extensions(); #endif |