Runtime option for using ipv6 subtrees.

babeld.c

@@ -60,6 +60,7 @@ int debug = 0;
 
 int link_detect = 0;
 int all_wireless = 0;
+int has_ipv6_subtrees = 0;
 int default_wireless_hello_interval = -1;
 int default_wired_hello_interval = -1;
 int resend_delay = -1;

babeld.h

@@ -80,12 +80,6 @@ THE SOFTWARE.
 #endif
 #endif
 
-#ifdef IPV6_SUBTREES
-#define has_ipv6_subtrees 1
-#else
-#define has_ipv6_subtrees 0
-#endif
-
 extern struct timeval now;
 extern int debug;
 extern time_t reboot_time;
@@ -96,6 +90,7 @@ extern int do_daemonise;
 extern const char *logfile, *pidfile, *state_file;
 extern int link_detect;
 extern int all_wireless;
+extern int has_ipv6_subtrees;
 
 extern unsigned char myid[8];
 

babeld.man

@@ -188,6 +188,10 @@ This specifies whether to use a random router-id, and is
 equivalent to the command-line option
 .BR \-r .
 .TP
+.BR ipv6-subtrees " {" true | false }
+This specifies whether to use native source-specific table rather than using
+multiple tables with rules.
+.TP
 .BI debug " level"
 This specifies the debugging level, and is equivalent to the command-line
 option

configuration.c

@@ -691,6 +691,7 @@ parse_option(int c, gnc_t gnc, void *closure, char *token)
               strcmp(token, "link-detect") == 0 ||
               strcmp(token, "random-id") == 0 ||
               strcmp(token, "daemonise") == 0 ||
+              strcmp(token, "ipv6-subtrees") == 0 ||
               strcmp(token, "reflect-kernel-metric") == 0) {
         int b;
         c = getbool(c, &b, gnc, closure);
@@ -705,6 +706,8 @@ parse_option(int c, gnc_t gnc, void *closure, char *token)
             random_id = b;
         else if(strcmp(token, "daemonise") == 0)
             do_daemonise = b;
+        else if(strcmp(token, "ipv6-subtrees") == 0)
+            has_ipv6_subtrees = b;
         else if(strcmp(token, "reflect-kernel-metric") == 0)
             reflect_kernel_metric = b;
         else