diff options
| -rw-r--r-- | epan/dissectors/packet-bt-oui.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-cimetrics.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-cisco-oui.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-extreme.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-force10-oui.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-foundry.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-hpteam.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-iana-oui.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-llc.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-nt-oui.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-wlccp.c | 2 |
11 files changed, 11 insertions, 13 deletions
diff --git a/epan/dissectors/packet-bt-oui.c b/epan/dissectors/packet-bt-oui.c index 1cc8ca7017..c3974da0cc 100644 --- a/epan/dissectors/packet-bt-oui.c +++ b/epan/dissectors/packet-bt-oui.c @@ -84,6 +84,6 @@ void proto_register_bt_oui(void) } }; - llc_add_oui(OUI_BLUETOOTH, "llc.bluetooth_pid", "Bluetooth OUI PID", hf); + llc_add_oui(OUI_BLUETOOTH, "llc.bluetooth_pid", "LLC Bluetooth OUI PID", hf); } diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 598b4ba28a..1f43d1762c 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -124,7 +124,7 @@ proto_register_cimetrics(void) proto_cimetrics_mstp); llc_add_oui(OUI_CIMETRICS, "llc.cimetrics_pid", - "Cimetrics OUI PID", hf2); + "LLC Cimetrics OUI PID", hf2); } void diff --git a/epan/dissectors/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c index 98504f109e..6a1d7b6c02 100644 --- a/epan/dissectors/packet-cisco-oui.c +++ b/epan/dissectors/packet-cisco-oui.c @@ -72,6 +72,6 @@ proto_register_cisco_oui(void) } }; - llc_add_oui(OUI_CISCO, "llc.cisco_pid", "Cisco OUI PID", hf); + llc_add_oui(OUI_CISCO, "llc.cisco_pid", "LLC Cisco OUI PID", hf); } diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 321710f078..cd5a9e8af2 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -1509,5 +1509,5 @@ proto_register_extreme_oui(void) } }; - llc_add_oui(OUI_EXTREME, "llc.extreme_pid", "Extreme OUI PID", hf); + llc_add_oui(OUI_EXTREME, "llc.extreme_pid", "LLC Extreme OUI PID", hf); } diff --git a/epan/dissectors/packet-force10-oui.c b/epan/dissectors/packet-force10-oui.c index 62eeef0d54..89be6135d4 100644 --- a/epan/dissectors/packet-force10-oui.c +++ b/epan/dissectors/packet-force10-oui.c @@ -48,6 +48,6 @@ proto_register_force10_oui(void) } }; - llc_add_oui(OUI_FORCE10, "llc.force10_pid", "FORCE10 OUI PID", hf); + llc_add_oui(OUI_FORCE10, "llc.force10_pid", "LLC FORCE10 OUI PID", hf); } diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index d0a73fdc88..ede958c377 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -463,5 +463,5 @@ proto_register_foundry_oui(void) } }; - llc_add_oui(OUI_FOUNDRY, "llc.foundry_pid", "Foundry OUI PID", hf); + llc_add_oui(OUI_FOUNDRY, "llc.foundry_pid", "LLC Foundry OUI PID", hf); } diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 3087eef032..34e5f510ef 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -128,7 +128,7 @@ void proto_register_hpteam(void) proto_hpteam = proto_register_protocol ("HP NIC Teaming Heartbeat", "HPTEAM", "hpteam"); /*Tied into the LLC dissector so register the OUI with LLC*/ - llc_add_oui(OUI_HP_2, "llc.hpteam_pid", "Hewlett Packard OUI PID", &hf_pid); + llc_add_oui(OUI_HP_2, "llc.hpteam_pid", "LLC Hewlett Packard OUI PID", &hf_pid); proto_register_field_array(proto_hpteam, hf_data, array_length(hf_data)); proto_register_subtree_array(ett, array_length(ett)); register_dissector("hpteam", dissect_hpteam, proto_hpteam); diff --git a/epan/dissectors/packet-iana-oui.c b/epan/dissectors/packet-iana-oui.c index e1c3f7ac3c..068720c377 100644 --- a/epan/dissectors/packet-iana-oui.c +++ b/epan/dissectors/packet-iana-oui.c @@ -58,5 +58,5 @@ proto_register_iana_oui(void) } }; - llc_add_oui(OUI_IANA, "llc.iana_pid", "IANA OUI PID", hf); + llc_add_oui(OUI_IANA, "llc.iana_pid", "LLC IANA OUI PID", hf); } diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 4b19736dab..edf7994566 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -261,12 +261,10 @@ llc_add_oui(guint32 oui, const char *table_name, const char *table_ui_name, hf_register_info *hf_item) { oui_info_t *new_info; - gchar *my_table_ui_name; /* NOTE: Intentionally NOT freed */ - my_table_ui_name = g_strdup_printf("LLC %s", table_ui_name); new_info = (oui_info_t *)g_malloc(sizeof (oui_info_t)); new_info->table = register_dissector_table(table_name, - my_table_ui_name, FT_UINT16, BASE_HEX); + table_ui_name, FT_UINT16, BASE_HEX); new_info->field_info = hf_item; /* diff --git a/epan/dissectors/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c index e2b62ad58d..2766ba1e57 100644 --- a/epan/dissectors/packet-nt-oui.c +++ b/epan/dissectors/packet-nt-oui.c @@ -51,5 +51,5 @@ proto_register_nortel_oui(void) } }; - llc_add_oui(OUI_NORTEL, "llc.nortel_pid", "Nortel OUI PID", hf); + llc_add_oui(OUI_NORTEL, "llc.nortel_pid", "LLC Nortel OUI PID", hf); } diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 8f5af6844b..c111b7ce84 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -4125,6 +4125,6 @@ proto_register_wlccp_oui(void) } }; - llc_add_oui(OUI_CISCOWL, "llc.wlccp_pid", "Cisco WLCCP OUI PID", hf); + llc_add_oui(OUI_CISCOWL, "llc.wlccp_pid", "LLC Cisco WLCCP OUI PID", hf); } |