www.usr.com/support/gpl/USR9107_release.1.4.tar.gz

[bcm963xx.git] / userapps / opensource / atm2684 / pvc2684ctl / pvc2684ctl.c

diff --git a/userapps/opensource/atm2684/pvc2684ctl/pvc2684ctl.c b/userapps/opensource/atm2684/pvc2684ctl/pvc2684ctl.c
index 5b65967..46aeeb4 100755 (executable)
--- a/userapps/opensource/atm2684/pvc2684ctl/pvc2684ctl.c
+++ b/userapps/opensource/atm2684/pvc2684ctl/pvc2684ctl.c
@@ -86,11 +86,12 @@ int main (int argc, char **argv)
   struct passwd *pw;
   // brcm
   int encap=BR2684_ENCAPS_LLC, proto_filter=0, mode=0;
+  unsigned short vlan_id=-1;
   
   bzero(&vc, sizeof(vc));
 
   while(1) {
-    optchar = getopt(argc, argv, "Madli:v:c:g:erf");
+    optchar = getopt(argc, argv, "Madli:v:c:g:erft:");
     if (optchar == -1)
        break;
 
@@ -168,6 +169,10 @@ int main (int argc, char **argv)
     case 'r':
       mode=1;
       break;
+// brcm  add vlan id flag
+    case 't':
+      vlan_id = atoi(optarg);
+      break;
 
     case 'g':
       strncpy(name,optarg,MAX_GROUPNAME_LEN);
@@ -246,7 +251,8 @@ int main (int argc, char **argv)
     smsg.encap   = encap;
     smsg.proto_filter   = proto_filter;
     smsg.mode   = mode;
-    
+    smsg.vlan_id = vlan_id;
+
     bzero(&rmsg, sizeof(rmsg));
     srv_fd = unix_connect();
     
@@ -338,19 +344,20 @@ int main (int argc, char **argv)
        break;
       } else if(!header) {
 // brcm    
-       printf("\nVC          interface  mode\n");
-       printf("--          ---------  ------\n");
+       printf("\nVC          interface  mode             vlan_id\n");
+       printf("--          ---------  ------           ----------\n");
 //     printf("\nVC          interface  group                            owner\n");
 //     printf("--          ---------  ------                           -----\n");
        header = 1;
       }
 
       if(rmsg.msgtype == OK) {
-       printf("%2d/%4d     nas%-6d  %-32s\n", 
+       printf("%2d/%4d     nas%-6d  %-16s %d (X%02X)\n", 
               rmsg.pvc.sap_addr.vpi,
               rmsg.pvc.sap_addr.vci,
               rmsg.nas_idx,
-              rmsg.mode? "Routing":    "Bridging"
+              rmsg.mode? "Routing":    "Bridging",
+               rmsg.vlan_id, rmsg.vlan_id
                );
       }
     } while(rmsg.msgtype != LIST_END);