lib: fs namespacing 4/5: add -N command-line parameter

this adds a -N option to all daemons which specifies the namespace name
to include in all paths through path_set_namespace

6 files changed, 38 insertions, 7 deletions

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index f6dc1cae..f761f238 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -53,6 +53,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 static const struct option longopts[] = 
 {
   { "daemon",      no_argument,       NULL, 'd'},
+  { "namespace",   required_argument, NULL, 'N'},
   { "config_file", required_argument, NULL, 'f'},
   { "pid_file",    required_argument, NULL, 'i'},
   { "bgp_port",    required_argument, NULL, 'p'},
@@ -151,6 +152,7 @@ usage (char *progname, int status)
 Daemon which manages kernel routing table management and \
 redistribution between different routing protocols.\n\n\
 -d, --daemon       Runs in daemon mode\n\
+-N, --namespace    Insert argument into all paths\n\
 -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\
 -p, --bgp_port     Set bgp protocol's port number\n\
@@ -331,7 +333,7 @@ main (int argc, char **argv)
   /* Command line argument treatment. */
   while (1) 
     {
-      opt = getopt_long (argc, argv, "df:i:hp:l:A:P:rnu:g:vC", longopts, 0);
+      opt = getopt_long (argc, argv, "dN:f:i:hp:l:A:P:rnu:g:vC", longopts, 0);
     
       if (opt == EOF)
 	break;
@@ -343,6 +345,9 @@ main (int argc, char **argv)
 	case 'd':
 	  daemon_mode = 1;
 	  break;
+	case 'N':
+	  path_set_namespace (optarg);
+	  break;
 	case 'f':
 	  config_file = optarg;
 	  break;
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index b924b77f..d457d25e 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -77,6 +77,7 @@ struct zebra_privs_t isisd_privs = {
 /* isisd options */
 struct option longopts[] = {
   {"daemon", no_argument, NULL, 'd'},
+  {"namespace", required_argument, NULL, 'N'},
   {"config_file", required_argument, NULL, 'f'},
   {"pid_file", required_argument, NULL, 'i'},
   {"vty_addr", required_argument, NULL, 'A'},
@@ -135,6 +136,7 @@ usage (int status)
       printf ("Usage : %s [OPTION...]\n\n\
 Daemon which manages IS-IS routing\n\n\
 -d, --daemon       Runs in daemon mode\n\
+-N, --namespace    Insert argument into all paths\n\
 -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\
 -A, --vty_addr     Set vty's bind address\n\
@@ -253,7 +255,7 @@ main (int argc, char **argv, char **envp)
   /* Command line argument treatment. */
   while (1)
     {
-      opt = getopt_long (argc, argv, "df:i:hA:p:P:u:g:vC", longopts, 0);
+      opt = getopt_long (argc, argv, "dN:f:i:hA:p:P:u:g:vC", longopts, 0);
 
       if (opt == EOF)
 	break;
@@ -265,6 +267,9 @@ main (int argc, char **argv, char **envp)
 	case 'd':
 	  daemon_mode = 1;
 	  break;
+	case 'N':
+	  path_set_namespace (optarg);
+	  break;
 	case 'f':
 	  config_file = optarg;
 	  break;
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 980cf794..c33fe9f2 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -73,6 +73,7 @@ struct zebra_privs_t ospf6d_privs =
 struct option longopts[] = 
 {
   { "daemon",      no_argument,       NULL, 'd'},
+  { "namespace",   required_argument, NULL, 'N'},
   { "config_file", required_argument, NULL, 'f'},
   { "pid_file",    required_argument, NULL, 'i'},
   { "vty_addr",    required_argument, NULL, 'A'},
@@ -114,6 +115,7 @@ usage (char *progname, int status)
       printf ("Usage : %s [OPTION...]\n\n\
 Daemon which manages OSPF version 3.\n\n\
 -d, --daemon       Runs in daemon mode\n\
+-N, --namespace    Insert argument into all paths\n\
 -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\
 -A, --vty_addr     Set vty's bind address\n\
@@ -203,7 +205,7 @@ main (int argc, char *argv[], char *envp[])
   /* Command line argument treatment. */
   while (1) 
     {
-      opt = getopt_long (argc, argv, "df:i:hp:A:P:u:g:vC", longopts, 0);
+      opt = getopt_long (argc, argv, "dN:f:i:hp:A:P:u:g:vC", longopts, 0);
     
       if (opt == EOF)
         break;
@@ -215,6 +217,9 @@ main (int argc, char *argv[], char *envp[])
         case 'd':
           daemon_mode = 1;
           break;
+	case 'N':
+	  path_set_namespace (optarg);
+	  break;
         case 'f':
           config_file = optarg;
           break;
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index d392baf8..72348a04 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -40,6 +40,7 @@
 static struct option longopts[] = 
 {
   { "daemon",      no_argument,       NULL, 'd'},
+  { "namespace",   required_argument, NULL, 'N'},
   { "config_file", required_argument, NULL, 'f'},
   { "pid_file",    required_argument, NULL, 'i'},
   { "help",        no_argument,       NULL, 'h'},
@@ -111,6 +112,7 @@ usage (char *progname, int status)
       printf ("Usage : %s [OPTION...]\n\
 Daemon which manages RIP version 1 and 2.\n\n\
 -d, --daemon       Runs in daemon mode\n\
+-N, --namespace    Insert argument into all paths\n\
 -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\
 -A, --vty_addr     Set vty's bind address\n\
@@ -210,7 +212,7 @@ main (int argc, char **argv)
     {
       int opt;
 
-      opt = getopt_long (argc, argv, "df:i:hA:P:u:g:rvC", longopts, 0);
+      opt = getopt_long (argc, argv, "dN:f:i:hA:P:u:g:rvC", longopts, 0);
     
       if (opt == EOF)
 	break;
@@ -222,6 +224,9 @@ main (int argc, char **argv)
 	case 'd':
 	  daemon_mode = 1;
 	  break;
+	case 'N':
+	  path_set_namespace (optarg);
+	  break;
 	case 'f':
 	  config_file = optarg;
 	  break;
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 54e3b69d..62477b6f 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -34,6 +34,7 @@
 #include "if.h"
 #include "privs.h"
 #include "sigevent.h"
+#include "paths.h"
 
 #include "ripngd/ripngd.h"
 
@@ -45,6 +46,7 @@ char *config_file = NULL;
 struct option longopts[] = 
 {
   { "daemon",      no_argument,       NULL, 'd'},
+  { "namespace",   required_argument, NULL, 'N'},
   { "config_file", required_argument, NULL, 'f'},
   { "pid_file",    required_argument, NULL, 'i'},
   { "dryrun",      no_argument,       NULL, 'C'},
@@ -113,6 +115,7 @@ usage (char *progname, int status)
       printf ("Usage : %s [OPTION...]\n\
 Daemon which manages RIPng.\n\n\
 -d, --daemon       Runs in daemon mode\n\
+-N, --namespace    Insert argument into all paths\n\
 -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\
 -A, --vty_addr     Set vty's bind address\n\
@@ -208,7 +211,7 @@ main (int argc, char **argv)
     {
       int opt;
 
-      opt = getopt_long (argc, argv, "df:i:hA:P:u:g:vC", longopts, 0);
+      opt = getopt_long (argc, argv, "dN:f:i:hA:P:u:g:vC", longopts, 0);
     
       if (opt == EOF)
 	break;
@@ -220,6 +223,9 @@ main (int argc, char **argv)
 	case 'd':
 	  daemon_mode = 1;
 	  break;
+	case 'N':
+	  path_set_namespace (optarg);
+	  break;
 	case 'f':
 	  config_file = optarg;
 	  break;
diff --git a/zebra/main.c b/zebra/main.c
index 293e22b8..b58fed12 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -69,6 +69,7 @@ struct option longopts[] =
 {
   { "batch",       no_argument,       NULL, 'b'},
   { "daemon",      no_argument,       NULL, 'd'},
+  { "namespace",   required_argument, NULL, 'N'},
   { "keep_kernel", no_argument,       NULL, 'k'},
   { "config_file", required_argument, NULL, 'f'},
   { "pid_file",    required_argument, NULL, 'i'},
@@ -130,6 +131,7 @@ usage (char *progname, int status)
 	      "redistribution between different routing protocols.\n\n"\
 	      "-b, --batch        Runs in batch mode\n"\
 	      "-d, --daemon       Runs in daemon mode\n"\
+	      "-N, --namespace    Insert argument into all paths\n"\
 	      "-f, --config_file  Set configuration file name\n"\
 	      "-i, --pid_file     Set process identifier file name\n"\
 	      "-k, --keep_kernel  Don't delete old routes which installed by "\
@@ -233,9 +235,9 @@ main (int argc, char **argv)
       int opt;
   
 #ifdef HAVE_NETLINK  
-      opt = getopt_long (argc, argv, "bdkf:i:hA:P:ru:g:vs:C", longopts, 0);
+      opt = getopt_long (argc, argv, "bdN:kf:i:hA:P:ru:g:vs:C", longopts, 0);
 #else
-      opt = getopt_long (argc, argv, "bdkf:i:hA:P:ru:g:vC", longopts, 0);
+      opt = getopt_long (argc, argv, "bdN:kf:i:hA:P:ru:g:vC", longopts, 0);
 #endif /* HAVE_NETLINK */
 
       if (opt == EOF)
@@ -250,6 +252,9 @@ main (int argc, char **argv)
 	case 'd':
 	  daemon_mode = 1;
 	  break;
+	case 'N':
+	  path_set_namespace (optarg);
+	  break;
 	case 'k':
 	  keep_kernel_mode = 1;
 	  break;