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

IEEE 1722 AVTP: Fix name 

AVBTP was used in drafts, but the name has officially been AVTP
in all releases, IEEE Std 1722-2011 and -2016. Change AVBTP to
AVTP and remove "Bridging" where it appears.
This commit is contained in:
John Thacker 2021-09-02 07:22:56 -04:00 committed by Wireshark GitLab Utility
parent 1f4e150ca7
commit 994bf73f46
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ const value_string etype_vals[] = {
{ ETHERTYPE_MMRP, "802.1ak Multiple Mac Registration Protocol" }, { ETHERTYPE_MMRP, "802.1ak Multiple Mac Registration Protocol" },
{ ETHERTYPE_NSH, "Network Service Header" }, { ETHERTYPE_NSH, "Network Service Header" },
{ ETHERTYPE_PA_HBBACKUP, "PA HB Backup" }, { ETHERTYPE_PA_HBBACKUP, "PA HB Backup" },
{ ETHERTYPE_AVBTP, "IEEE 1722 Audio Video Bridging Transport Protocol" }, { ETHERTYPE_AVTP, "IEEE 1722 Audio Video Transport Protocol" },
{ ETHERTYPE_ROHC, "Robust Header Compression(RoHC)" }, { ETHERTYPE_ROHC, "Robust Header Compression(RoHC)" },
{ ETHERTYPE_TRILL, "Transparent Interconnection of Lots of Links" }, { ETHERTYPE_TRILL, "Transparent Interconnection of Lots of Links" },
{ ETHERTYPE_L2ISIS, "Intermediate System to Intermediate System" }, { ETHERTYPE_L2ISIS, "Intermediate System to Intermediate System" },

18
epan/dissectors/packet-ieee1722.c
View File

@ -1,5 +1,5 @@
/* packet-ieee1722.c /* packet-ieee1722.c
* Routines for AVB-TP (Audio Video Bridging - Transport Protocol) dissection * Routines for AVTP (Audio Video Transport Protocol) dissection
* Copyright 2010, Torrey Atcitty <tatcitty@harman.com> * Copyright 2010, Torrey Atcitty <tatcitty@harman.com>
* Dave Olsen <dave.olsen@harman.com> * Dave Olsen <dave.olsen@harman.com>
* Levi Pearson <levi.pearson@harman.com> * Levi Pearson <levi.pearson@harman.com>
@ -823,7 +823,7 @@ static int dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
}; };
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE1722"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE1722");
col_set_str(pinfo->cinfo, COL_INFO, "AVB Transportation Protocol"); col_set_str(pinfo->cinfo, COL_INFO, "Audio Video Transport Protocol");
ti = proto_tree_add_item(tree, proto_1722, tvb, 0, -1, ENC_NA); ti = proto_tree_add_item(tree, proto_1722, tvb, 0, -1, ENC_NA);
ieee1722_tree = proto_item_add_subtree(ti, ett_1722); ieee1722_tree = proto_item_add_subtree(ti, ett_1722);
@ -847,7 +847,7 @@ void proto_register_1722(void)
{ {
static hf_register_info hf[] = { static hf_register_info hf[] = {
{ &hf_1722_subtype, { &hf_1722_subtype,
{ "AVBTP Subtype", "ieee1722.subtype", { "AVTP Subtype", "ieee1722.subtype",
FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(subtype_range_rvals), 0x00, NULL, HFILL } FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(subtype_range_rvals), 0x00, NULL, HFILL }
}, },
{ &hf_1722_svfield, { &hf_1722_svfield,
@ -865,7 +865,7 @@ void proto_register_1722(void)
}; };
/* Register the protocol name and description */ /* Register the protocol name and description */
proto_1722 = proto_register_protocol("IEEE 1722 Protocol", "IEEE1722", "ieee1722"); proto_1722 = proto_register_protocol("IEEE 1722 Audio Video Transport Protocol (AVTP)", "IEEE1722", "ieee1722");
/* Required function calls to register the header fields and subtrees used */ /* Required function calls to register the header fields and subtrees used */
proto_register_field_array(proto_1722, hf, array_length(hf)); proto_register_field_array(proto_1722, hf, array_length(hf));
@ -873,16 +873,16 @@ void proto_register_1722(void)
/* Sub-dissector for 1772.1, 1722 AAF, 1722 CRF, 1722 61883, 1722 CVF */ /* Sub-dissector for 1772.1, 1722 AAF, 1722 CRF, 1722 61883, 1722 CVF */
avb_dissector_table = register_dissector_table("ieee1722.subtype", avb_dissector_table = register_dissector_table("ieee1722.subtype",
"IEEE1722 AVBTP Subtype", proto_1722, FT_UINT8, BASE_HEX); "IEEE1722 AVTP Subtype", proto_1722, FT_UINT8, BASE_HEX);
} }
void proto_reg_handoff_1722(void) void proto_reg_handoff_1722(void)
{ {
dissector_handle_t avbtp_handle; dissector_handle_t avtp_handle;
avbtp_handle = create_dissector_handle(dissect_1722, proto_1722); avtp_handle = create_dissector_handle(dissect_1722, proto_1722);
dissector_add_uint("ethertype", ETHERTYPE_AVBTP, avbtp_handle); dissector_add_uint("ethertype", ETHERTYPE_AVTP, avtp_handle);
dissector_add_uint("udp.port", UDP_PORT_IEEE_1722, avbtp_handle); dissector_add_uint("udp.port", UDP_PORT_IEEE_1722, avtp_handle);
} }
/**************************************************************************************************/ /**************************************************************************************************/

4
epan/etypes.h
View File

@ -111,8 +111,8 @@ extern "C" {
#define ETHERTYPE_MSRP 0x22EA #define ETHERTYPE_MSRP 0x22EA
#endif #endif
#ifndef ETHERTYPE_AVBTP #ifndef ETHERTYPE_AVTP
#define ETHERTYPE_AVBTP 0x22F0 #define ETHERTYPE_AVTP 0x22F0
#endif #endif
#ifndef ETHERTYPE_ROHC /* ROHC (Robust Header Compression) is an IP header compression protocol specified in */ #ifndef ETHERTYPE_ROHC /* ROHC (Robust Header Compression) is an IP header compression protocol specified in */