iproute2: bridge vlan show new option to print ranges

Introduce new option -c[ompressvlans] to request
vlan ranges from kernel

(pls suggest better option names if this does not look ok)

$bridge vlan show
port	vlan ids
dummy0	 1 PVID Egress Untagged

dummy1	 1 PVID Egress Untagged
	 2
	 3
	 4
	 5
	 6
	 7
	 9
	 10
	 12

br0	 1 PVID Egress Untagged

$bridge help
Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }
where  OBJECT := { link | fdb | mdb | vlan | monitor }
       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] |
                    -o[neline] | -t[imestamp] | -n[etns] name |
                    -c[ompressvlans] }
$bridge -c vlan show
port	vlan ids
dummy0	 1 PVID Egress Untagged

dummy1	 1 PVID Egress Untagged
	 2-7
	 9-10
	 12

br0	 1 PVID Egress Untagged

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

diff --git a/bridge/br_common.h b/bridge/br_common.h
index 12fce3ef007a49362a450314beaf28e7c0afcd92..169a162d0c0100aa5be83aa48811fb1c6aa1ad37 100644 (file)
--- a/bridge/br_common.h
+++ b/bridge/br_common.h
@@ -16,4 +16,5 @@ extern int preferred_family;
 extern int show_stats;
 extern int show_details;
 extern int timestamp;
+extern int compress_vlans;
 extern struct rtnl_handle rth;

diff --git a/bridge/bridge.c b/bridge/bridge.c
index 5fcc552b1f5dee21d04909c422e294868d189072..88469ca28a25d688c0b690957a18abb1c5cc8a7b 100644 (file)
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -21,6 +21,7 @@ int resolve_hosts;
 int oneline = 0;
 int show_stats;
 int show_details;
+int compress_vlans;
 int timestamp;
 char * _SL_ = NULL;
 
@@ -32,7 +33,8 @@ static void usage(void)
 "Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\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");
+"                    -o[neline] | -t[imestamp] | -n[etns] name |\n"
+"                    -c[ompressvlans] }\n");
        exit(-1);
 }
 
@@ -117,6 +119,8 @@ main(int argc, char **argv)
                        NEXT_ARG();
                        if (netns_switch(argv[1]))
                                exit(-1);
+               } else if (matches(opt, "-compressvlans") == 0) {
+                       ++compress_vlans;
                } else {
                        fprintf(stderr, "Option \"%s\" is unknown, try \"bridge help\".\n", opt);
                        exit(-1);

diff --git a/bridge/vlan.c b/bridge/vlan.c
index 88992e6330f769134e8e15ea0c1362c4c69bf5f7..9f6c84eeb6afb778668e574724cf431651d83282 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -182,7 +182,12 @@ static int print_vlan(const struct sockaddr_nl *who,
                                continue;
 
                        vinfo = RTA_DATA(i);
-                       fprintf(fp, "\t %hu", vinfo->vid);
+                       if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END)
+                               fprintf(fp, "-%hu", vinfo->vid);
+                       else
+                               fprintf(fp, "\t %hu", vinfo->vid);
+                       if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN)
+                               continue;
                        if (vinfo->flags & BRIDGE_VLAN_INFO_PVID)
                                fprintf(fp, " PVID");
                        if (vinfo->flags & BRIDGE_VLAN_INFO_UNTAGGED)
@@ -218,7 +223,9 @@ static int vlan_show(int argc, char **argv)
        }
 
        if (rtnl_wilddump_req_filter(&rth, PF_BRIDGE, RTM_GETLINK,
-                                    RTEXT_FILTER_BRVLAN) < 0) {
+                                   (compress_vlans ?
+                                   RTEXT_FILTER_BRVLAN_COMPRESSED :
+                                   RTEXT_FILTER_BRVLAN)) < 0) {
                perror("Cannont send dump request");
                exit(1);
        }