osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Instead of prepending "LLC " to the UI table name, just modify the table name. 

svn path=/trunk/; revision=51952
This commit is contained in:
Chris Maynard 2013-09-11 18:06:29 +00:00
parent 6986eb4866
commit bf59c708f8
11 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-bt-oui.c
View File

@ -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);
}

2
epan/dissectors/packet-cimetrics.c
View File

@ -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

2
epan/dissectors/packet-cisco-oui.c
View File

@ -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);
}

2
epan/dissectors/packet-extreme.c
View File

@ -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);
}

2
epan/dissectors/packet-force10-oui.c
View File

@ -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);
}

2
epan/dissectors/packet-foundry.c
View File

@ -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);
}

2
epan/dissectors/packet-hpteam.c
View File

@ -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);

2
epan/dissectors/packet-iana-oui.c
View File

@ -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);
}

4
epan/dissectors/packet-llc.c
View File

@ -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;
/*

2
epan/dissectors/packet-nt-oui.c
View File

@ -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);
}

2
epan/dissectors/packet-wlccp.c
View File

@ -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);
}