Merge branch 'master' into net-next

[mirror_iproute2.git] / bridge / bridge.c

diff --git a/bridge/bridge.c b/bridge/bridge.c
index e2c33b0f5f55672945e25167684c0d4e2e2451cc..5ff038d672ad26459f2f8992898e8589bcff0e65 100644 (file)
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -9,17 +9,25 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <string.h>
+#include <errno.h>
 
 #include "SNAPSHOT.h"
 #include "utils.h"
 #include "br_common.h"
+#include "namespace.h"
 
 struct rtnl_handle rth = { .fd = -1 };
 int preferred_family = AF_UNSPEC;
 int resolve_hosts;
+int oneline;
 int show_stats;
 int show_details;
+int compress_vlans;
+int json_output;
 int timestamp;
+char *batch_file;
+int force;
+const char *_SL_;
 
 static void usage(void) __attribute__((noreturn));
 
@@ -27,8 +35,11 @@ static void usage(void)
 {
        fprintf(stderr,
 "Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\n"
-"where  OBJECT := { fdb |  monitor }\n"
-"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails]\n" );
+"       bridge [ -force ] -batch filename\n"
+"where OBJECT := { link | fdb | mdb | vlan | monitor }\n"
+"      OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] |\n"
+"                   -o[neline] | -t[imestamp] | -n[etns] name |\n"
+"                   -c[ompressvlans] -j{son} }\n");
        exit(-1);
 }
 
@@ -42,7 +53,10 @@ static const struct cmd {
        const char *cmd;
        int (*func)(int argc, char **argv);
 } cmds[] = {
-       { "fdb",        do_fdb },
+       { "link",       do_link },
+       { "fdb",        do_fdb },
+       { "mdb",        do_mdb },
+       { "vlan",       do_vlan },
        { "monitor",    do_monitor },
        { "help",       do_help },
        { 0 }
@@ -57,16 +71,62 @@ static int do_cmd(const char *argv0, int argc, char **argv)
                        return c->func(argc-1, argv+1);
        }
 
-       fprintf(stderr, "Object \"%s\" is unknown, try \"bridge help\".\n", argv0);
+       fprintf(stderr,
+               "Object \"%s\" is unknown, try \"bridge help\".\n", argv0);
        return -1;
 }
 
+static int batch(const char *name)
+{
+       char *line = NULL;
+       size_t len = 0;
+       int ret = EXIT_SUCCESS;
+
+       if (name && strcmp(name, "-") != 0) {
+               if (freopen(name, "r", stdin) == NULL) {
+                       fprintf(stderr,
+                               "Cannot open file \"%s\" for reading: %s\n",
+                               name, strerror(errno));
+                       return EXIT_FAILURE;
+               }
+       }
+
+       if (rtnl_open(&rth, 0) < 0) {
+               fprintf(stderr, "Cannot open rtnetlink\n");
+               return EXIT_FAILURE;
+       }
+
+       cmdlineno = 0;
+       while (getcmdline(&line, &len, stdin) != -1) {
+               char *largv[100];
+               int largc;
+
+               largc = makeargs(line, largv, 100);
+               if (largc == 0)
+                       continue;       /* blank line */
+
+               if (do_cmd(largv[0], largc, largv)) {
+                       fprintf(stderr, "Command failed %s:%d\n",
+                               name, cmdlineno);
+                       ret = EXIT_FAILURE;
+                       if (!force)
+                               break;
+               }
+       }
+       if (line)
+               free(line);
+
+       rtnl_close(&rth);
+       return ret;
+}
+
 int
 main(int argc, char **argv)
 {
        while (argc > 1) {
-               char *opt = argv[1];
-               if (strcmp(opt,"--") == 0) {
+               const char *opt = argv[1];
+
+               if (strcmp(opt, "--") == 0) {
                        argc--; argv++;
                        break;
                }
@@ -85,9 +145,11 @@ main(int argc, char **argv)
                        ++show_stats;
                } else if (matches(opt, "-details") == 0) {
                        ++show_details;
+               } else if (matches(opt, "-oneline") == 0) {
+                       ++oneline;
                } else if (matches(opt, "-timestamp") == 0) {
                        ++timestamp;
-                } else if (matches(opt, "-family") == 0) {
+               } else if (matches(opt, "-family") == 0) {
                        argc--;
                        argv++;
                        if (argc <= 1)
@@ -104,13 +166,36 @@ main(int argc, char **argv)
                        preferred_family = AF_INET;
                } else if (strcmp(opt, "-6") == 0) {
                        preferred_family = AF_INET6;
+               } else if (matches(opt, "-netns") == 0) {
+                       NEXT_ARG();
+                       if (netns_switch(argv[1]))
+                               exit(-1);
+               } else if (matches(opt, "-compressvlans") == 0) {
+                       ++compress_vlans;
+               } else if (matches(opt, "-force") == 0) {
+                       ++force;
+               } else if (matches(opt, "-json") == 0) {
+                       ++json_output;
+               } else if (matches(opt, "-batch") == 0) {
+                       argc--;
+                       argv++;
+                       if (argc <= 1)
+                               usage();
+                       batch_file = argv[1];
                } else {
-                       fprintf(stderr, "Option \"%s\" is unknown, try \"bridge help\".\n", opt);
+                       fprintf(stderr,
+                               "Option \"%s\" is unknown, try \"bridge help\".\n",
+                               opt);
                        exit(-1);
                }
                argc--; argv++;
        }
 
+       _SL_ = oneline ? "\\" : "\n";
+
+       if (batch_file)
+               return batch(batch_file);
+
        if (rtnl_open(&rth, 0) < 0)
                exit(1);