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

DECT-NWK: Simplify data dissector call

This commit is contained in:
Bernhard Dick 2022-12-12 21:25:38 +01:00 committed by Alexis La Goutte
parent cdf134b4e5
commit 8aec74c0ba
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-dect-nwk.c
View File

@ -2715,7 +2715,6 @@ static int dissect_dect_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint8 pdisc, msg_type;
guint len;
guint offset = 0;
int available_length;
len = tvb_reported_length(tvb);
@ -2753,9 +2752,8 @@ static int dissect_dect_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
/* whatever was not dissected: Use generic data dissector */
available_length = tvb_captured_length(tvb) - offset;
if (available_length) {
tvbuff_t *payload = tvb_new_subset_length_caplen(tvb, offset, MIN(len-offset, available_length), len);
if ( offset < tvb_captured_length(tvb) ) {
tvbuff_t *payload = tvb_new_subset_remaining(tvb, offset);
call_data_dissector(payload, pinfo, tree);
}
return tvb_captured_length(tvb);