Added support for iptables-restore module-load-on-demand (a. van schie)

diff --git a/include/ip6tables.h b/include/ip6tables.h
index baa3677e32dca3ee82a256fe2ea4bc2bc0db6f71..9ac3835cf195d5befeece3e83d9d324081c2deff 100644 (file)
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -122,5 +122,6 @@ extern struct ip6tables_match *find_match(const char *name, enum ip6t_tryload);
 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);
 
 #endif /*_IP6TABLES_USER_H*/

diff --git a/include/iptables_common.h b/include/iptables_common.h
index 90ca74d720318671a124854bdce09849e490f881..be9c55084c400e22dbbaa3b963867be556a8bd45 100644 (file)
--- a/include/iptables_common.h
+++ b/include/iptables_common.h
@@ -11,6 +11,7 @@ extern void exit_printhelp() __attribute__((noreturn));
 extern void exit_tryhelp(int) __attribute__((noreturn));
 int check_inverse(const char option[], int *invert);
 extern int string_to_number(const char *, int, int);
+extern int iptables_insmod(const char *modname, const char *modprobe);
 void exit_error(enum exittype, char *, ...)__attribute__((noreturn,
                                                          format(printf,2,3)));
 extern const char *program_name, *program_version;

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 9ebc5775b92df7b88ffdd9dd64620cce857da8f9..f7a94f2c888ef14affd353dd40047496b3213e57 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -35,6 +35,7 @@ static struct option options[] = {
 /*     { "verbose", 1, 0, 'v' }, */
        { "help", 0, 0, 'h' },
        { "noflush", 0, 0, 'n'},
+       { "modprobe", 1, 0, 'M'},
        { 0 }
 };
 
@@ -47,16 +48,24 @@ static void print_usage(const char *name, const char *version)
                        "          [ --counters ]\n"
                        "          [ --verbose ]\n"
                        "          [ --help ]\n"
-                       "          [ --noflush ]\n", name);
+                       "          [ --noflush ]\n"
+                       "          [ --modprobe=<command>]\n", name);
                
        exit(1);
 }
 
-ip6tc_handle_t create_handle(const char *tablename)
+ip6tc_handle_t create_handle(const char *tablename, const char* modprobe)
 {
        ip6tc_handle_t handle;
 
        handle = ip6tc_init(tablename);
+
+       if (!handle) {
+                /* try to insmod the module if iptc_init failed */
+                ip6tables_insmod("ip6_tables", modprobe);
+                handle = ip6tc_init(tablename);
+       }
+
        if (!handle) {
                exit_error(PARAMETER_PROBLEM, "%s: unable to initialize"
                        "table '%s'\n", program_name, tablename);
@@ -79,11 +88,12 @@ int main(int argc, char *argv[])
        char curtable[IP6T_TABLE_MAXNAMELEN + 1];
        char curchain[IP6T_FUNCTION_MAXNAMELEN + 1];
        FILE *in;
+       const char *modprobe = 0;
 
        program_name = "ip6tables-restore";
        program_version = NETFILTER_VERSION;
 
-       while ((c = getopt_long(argc, argv, "bcvhn", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "bcvhnM:", options, NULL)) != -1) {
                switch (c) {
                        case 'b':
                                binary = 1;
@@ -98,6 +108,9 @@ int main(int argc, char *argv[])
                        case 'n':
                                noflush = 1;
                                break;
+                       case 'M':
+                               modprobe = optarg;
+                               break;
                }
        }
        
@@ -151,7 +164,7 @@ int main(int argc, char *argv[])
                        }
                        strncpy(curtable, table, IP6T_TABLE_MAXNAMELEN);
 
-                       handle = create_handle(table);
+                       handle = create_handle(table, modprobe);
                        if (noflush == 0) {
                                DEBUGP("Cleaning all chains of table '%s'\n",
                                        table);

diff --git a/ip6tables.c b/ip6tables.c
index caa89950e028182c23b5878bfaa3ba7ac520f9d1..bce4b7bc6bf3f6e0e1281e8b0f6b72ae0c4067ff 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -1545,7 +1545,7 @@ static char *get_modprobe(void)
         return NULL;
 }
 
-static int ip6tables_insmod(const char *modname, const char *modprobe)
+int ip6tables_insmod(const char *modname, const char *modprobe)
 {
         char *buf = NULL;
         char *argv[3];

diff --git a/iptables-restore.c b/iptables-restore.c
index e5a28f3f6bf63a9cb56d5a2c2dc78eca3b663c45..b6bcb7b79bc47ccd71aa8e31957160bce108c808 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -4,7 +4,7 @@
  *
  * This coude is distributed under the terms of GNU GPL
  *
- * $Id: iptables-restore.c,v 1.11 2001/05/03 20:50:03 laforge Exp $
+ * $Id: iptables-restore.c,v 1.12 2001/05/26 04:41:56 laforge Exp $
  */
 
 #include <getopt.h>
@@ -30,6 +30,7 @@ static struct option options[] = {
 /*     { "verbose", 1, 0, 'v' }, */
        { "help", 0, 0, 'h' },
        { "noflush", 0, 0, 'n'},
+       { "modprobe", 1, 0, 'M'},
        { 0 }
 };
 
@@ -42,16 +43,24 @@ static void print_usage(const char *name, const char *version)
                        "          [ --counters ]\n"
                        "          [ --verbose ]\n"
                        "          [ --help ]\n"
-                       "          [ --noflush ]\n", name);
+                       "          [ --noflush ]\n"
+                       "          [ --modprobe=<command>]\n", name);
                
        exit(1);
 }
 
-iptc_handle_t create_handle(const char *tablename)
+iptc_handle_t create_handle(const char *tablename, const char* modprobe )
 {
        iptc_handle_t handle;
 
        handle = iptc_init(tablename);
+
+       if (!handle) {
+               /* try to insmod the module if iptc_init failed */
+               iptables_insmod("ip_tables", modprobe);
+               handle = iptc_init(tablename);
+       }
+
        if (!handle) {
                exit_error(PARAMETER_PROBLEM, "%s: unable to initialize"
                        "table '%s'\n", program_name, tablename);
@@ -95,11 +104,12 @@ int main(int argc, char *argv[])
        int c;
        char curtable[IPT_TABLE_MAXNAMELEN + 1];
        FILE *in;
+       const char *modprobe = 0;
 
        program_name = "iptables-restore";
        program_version = NETFILTER_VERSION;
 
-       while ((c = getopt_long(argc, argv, "bcvhn", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "bcvhnM:", options, NULL)) != -1) {
                switch (c) {
                        case 'b':
                                binary = 1;
@@ -114,6 +124,9 @@ int main(int argc, char *argv[])
                        case 'n':
                                noflush = 1;
                                break;
+                       case 'M':
+                               modprobe = optarg;
+                               break;
                }
        }
        
@@ -157,7 +170,7 @@ int main(int argc, char *argv[])
                        }
                        strncpy(curtable, table, IPT_TABLE_MAXNAMELEN);
 
-                       handle = create_handle(table);
+                       handle = create_handle(table, modprobe);
                        if (noflush == 0) {
                                DEBUGP("Cleaning all chains of table '%s'\n",
                                        table);

diff --git a/iptables.c b/iptables.c
index 5e7db06fdcbf5a4d8f47d86ad42551f0ea5cbb62..e8ac2654970d3faa50abb366864f96984896329a 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -1551,7 +1551,7 @@ static char *get_modprobe(void)
        return NULL;
 }
 
-static int iptables_insmod(const char *modname, const char *modprobe)
+int iptables_insmod(const char *modname, const char *modprobe)
 {
        char *buf = NULL;
        char *argv[3];