osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

vlan dissector has been restored; 

pref "eth.qinq_ethertype" has been moved(restored) to "vlan.qinq_ethertype".

svn path=/trunk/; revision=39136
This commit is contained in:
Bill Meier 2011-09-25 21:10:04 +00:00
parent 0d4abaa59c
commit c3d02e4b57
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/prefs.c
View File

@ -2505,8 +2505,6 @@ set_pref(gchar *pref_name, gchar *value, void *private_data _U_,
module = prefs_find_module("x25");
else if (strcmp(pref_name, "x411") == 0)
module = prefs_find_module("p1");
else if (strcmp(pref_name, "vlan") == 0)
module = prefs_find_module("eth");
else if (strcmp(pref_name, "nsip") == 0)
module = prefs_find_module("gprs-ns");
else if (strcmp(pref_name, "sonmp") == 0)
@ -2740,6 +2738,15 @@ set_pref(gchar *pref_name, gchar *value, void *private_data _U_,
else if (strcmp(value, "raw") == 0 || strcmp(value, "Raw data") == 0)
value = "guess";
}
} else if (strcmp(module->name, "eth") == 0) {
/* "eth.qinq_ethertype" has been changed(restored) to "vlan.qinq.ethertype" */
if (strcmp(dotp, "qinq_ethertype") == 0) {
module_t *new_module = prefs_find_module("vlan");
if(new_module) {
pref = prefs_find_preference(new_module, "qinq_ethertype");
module = new_module;
}
}
}
}
if (pref == NULL)