Add the possibility to totally disable VLANs

diff --git a/cli/com_vlan.c b/cli/com_vlan.c
index 34968152b9fe9a6963cd9e4d59da26154ad7793f..0baa1d5d0c32699d02278abe95c0e490a52974b9 100644 (file)
--- a/cli/com_vlan.c
+++ b/cli/com_vlan.c
@@ -339,6 +339,7 @@ int do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga)
        if (argc == 0) {
                printf(
                "usage: vlan mode set <mode>\n"
+               "0 - disabled\n"
                "1 - basic port based\n"
                "2 - advanced port based\n"
                "3 - basic 802.1Q\n"
@@ -353,7 +354,7 @@ int do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga)
        }
        
        mode = strtoul(argv[0], NULL, 0);
-       if (mode < 1 || mode > 4) {
+       if (mode < VLAN_DISABLED || mode > VLAN_DOT_ADV) {
                printf("mode out of range\n");
                return 1;
        }

diff --git a/lib/src/vlan.c b/lib/src/vlan.c
index dda8ce5363757e6dbfff13d90249cb1419283a76..2e6b2f692a7a2ec6c4d6b33cf9d667f5d437361e 100644 (file)
--- a/lib/src/vlan.c
+++ b/lib/src/vlan.c
@@ -31,11 +31,12 @@ int ngadmin_getVLANType (struct ngadmin *nga, int *t)
        
        *t = VLAN_DISABLED;
        
-       if (attr->first != NULL) {
-               at = attr->first->data;
-               *t =(int)*(char*)at->data;
+       if (attr->first == NULL) {
+               ret = ERR_INVARG;
+               goto end;
        }
-       
+       at = attr->first->data;
+       *t =(int)*(char*)at->data;
        
 end:
        destroyList(attr, (void(*)(void*))freeAttr);
@@ -50,7 +51,7 @@ int ngadmin_setVLANType (struct ngadmin *nga, int t)
        List *attr;
        
        
-       if (nga == NULL || t < 1 || t > 4)
+       if (nga == NULL || t < VLAN_DISABLED || t > VLAN_DOT_ADV)
                return ERR_INVARG;
        else if (nga->current == NULL)
                return ERR_NOTLOG;

diff --git a/wireshark/nsdp.lua b/wireshark/nsdp.lua
index 52a94b2223d49a405df399354f4323a3a60d89ba..53aea70c3df3e225d40af26989dbdf89209224fa 100644 (file)
--- a/wireshark/nsdp.lua
+++ b/wireshark/nsdp.lua
@@ -61,6 +61,7 @@ local bitrates_codes = {
 
 
 local vlan_type_codes = {
+       [0] = "disabled",
        [1] = "port basic",
        [2] = "port advanced",
        [3] = "802.1Q basic",