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

git: Parse delim-pkt and response_end-pkt 

Git Protocol version 2[1] defines 0x0001 as a delimiter packet that
separates the sections of a message, as well as 0x0002 as a response_end
packet that indicates the end of a response for stateless connections.

Add parsing and checking of the delim-pkt and response_end-pkt lines,
adding them as items to the tree for ease of reading and filtering while
handling pre-existing "malformed" errors. For additional consistency,
the terminator 0x0000 is now referred to as Flush packet.

[1] https://www.kernel.org/pub/software/scm/git/docs/technical/protocol-v2.html

Part of #17093
This commit is contained in:
Joey Salazar 2021-02-02 19:45:35 -06:00 committed by Wireshark GitLab Utility
parent c8246c9973
commit a8e2197d99
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
epan/dissectors/packet-git.c
View File

@ -29,9 +29,9 @@ static int proto_git = -1;
static gint ett_git = -1;
static gint hf_git_protocol_version = -1;
static gint hf_git_packet_type = -1;
static gint hf_git_packet_len = -1;
static gint hf_git_packet_data = -1;
static gint hf_git_packet_terminator = -1;
static gint hf_git_sideband_control_code = -1;
#define PNAME "Git Smart Protocol"
@ -40,6 +40,13 @@ static gint hf_git_sideband_control_code = -1;
#define TCP_PORT_GIT 9418
static const value_string packet_type_vals[] = {
{ 0, "Flush" },
{ 1, "Delimiter" },
{ 2, "Response end" },
{ 0, NULL }
};
static const value_string version_vals[] = {
{ '1', "Git protocol version 1" },
{ '2', "Git protocol version 2" },
@ -77,8 +84,8 @@ get_git_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U
if (!get_packet_length(tvb, offset, &plen))
return 0; /* No idea what this is */
if (plen == 0) {
/* Terminator packet */
if (plen == 0 || plen == 1 || plen == 2) {
/* Terminator, Delimiter, or Response_end packets */
return 4;
}
@ -100,11 +107,11 @@ dissect_git_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
ti = proto_tree_add_item(tree, proto_git, tvb, offset, -1, ENC_NA);
git_tree = proto_item_add_subtree(ti, ett_git);
// what type of pkt-line is it?
if (!get_packet_length(tvb, 0, &plen))
return 0;
if (plen == 0) {
proto_tree_add_uint(git_tree, hf_git_packet_terminator, tvb, offset,
if (plen == 0 || plen == 1 || plen == 2) {
proto_tree_add_uint(git_tree, hf_git_packet_type, tvb, offset,
4, plen);
return 4;
}
@ -163,15 +170,16 @@ proto_register_git(void)
{ "Git Protocol Version", "git.version", FT_UINT8, BASE_NONE, VALS(version_vals),
0, NULL, HFILL },
},
{ &hf_git_packet_type,
{ "Git Packet Type", "git.packet_type", FT_UINT8, BASE_NONE, VALS(packet_type_vals),
0, NULL, HFILL },
},
{ &hf_git_packet_len,
{ "Packet length", "git.length", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
},
{ &hf_git_packet_data,
{ "Packet data", "git.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
},
{ &hf_git_packet_terminator,
{ "Terminator packet", "git.terminator", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
},
{ &hf_git_sideband_control_code,
{ "Sideband control code", "git.sideband_control_code", FT_UINT8,
BASE_HEX, VALS(sideband_vals), 0, NULL, HFILL },