diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-09-25 21:10:04 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-09-25 21:10:04 +0000 |
| commit | c3d02e4b57659e16beb9230257fc159c8bc5efbe (patch) | |
| tree | c8ff6a6b0896749dea740182477be35fa76595ed /epan/prefs.c | |
| parent | 0d4abaa59c6c00f7324fc4687e28267027bb9f3c (diff) | |
vlan dissector has been restored;
pref "eth.qinq_ethertype" has been moved(restored) to "vlan.qinq_ethertype".
svn path=/trunk/; revision=39136
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 7b745723db..220949fd1b 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -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) |