diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-14 13:24:29 +0100 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-14 15:18:02 +0000 |
| commit | 669275e7d4d40bced964b574fe03ab35c0fedb6c (patch) | |
| tree | 43ff6a42dcf68049d65052fc68eb6d21ffbbe3a4 /epan | |
| parent | 188db5473eeb97ee15a92e298db4ed0f73a8265c (diff) | |
| download | wireshark-669275e7d4d40bced964b574fe03ab35c0fedb6c.tar.gz | |
p_mul: Fixed ack framenum links.
The ack symbol is for the Address PDU beeing acked.
Also use the DUP_ACK symbol for P_Mul's Ack-Ack.
Change-Id: I3da616e95e9c2cf889b1e4e4c0570ab0c276a2d2
Reviewed-on: https://code.wireshark.org/review/11819
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 20388ef1742efde4ba2bf5cf19814ac5192a6ffc)
Reviewed-on: https://code.wireshark.org/review/11823
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-p_mul.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index f0367d9a80..1f1cd26469 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -133,6 +133,8 @@ static int hf_analysis_retrans_time = -1; static int hf_analysis_total_retrans_time = -1; static int hf_analysis_last_pdu_num = -1; static int hf_analysis_addr_pdu_num = -1; +static int hf_analysis_acks_addr_pdu_num = -1; +static int hf_analysis_acks_acked_addr_pdu_num = -1; static int hf_analysis_addr_pdu_time = -1; static int hf_analysis_prev_pdu_num = -1; static int hf_analysis_prev_pdu_time = -1; @@ -558,7 +560,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m if (dst == NULL) { /* Ack-Ack */ if (pkg_data->addr_id) { - en = proto_tree_add_uint (analysis_tree, hf_analysis_addr_pdu_num, tvb, + en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_acked_addr_pdu_num, tvb, 0, 0, pkg_data->addr_id); PROTO_ITEM_SET_GENERATED (en); @@ -615,7 +617,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m /* Add reference to Address_PDU */ if (pkg_data->msg_type != Ack_PDU) { - en = proto_tree_add_uint (analysis_tree, hf_analysis_addr_pdu_num, tvb, + en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_addr_pdu_num, tvb, 0, 0, pkg_data->pdu_id); PROTO_ITEM_SET_GENERATED (en); @@ -1512,12 +1514,18 @@ void proto_register_p_mul (void) { &hf_analysis_addr_pdu_num, { "Address PDU in", "p_mul.analysis.addr_pdu_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "The Address PDU is found in this frame", HFILL } }, + { &hf_analysis_acks_addr_pdu_num, + { "This is an Ack to the Address PDU in", "p_mul.analysis.acks_addr_pdu_in", FT_FRAMENUM, BASE_NONE, + FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, "The Address PDU is found in this frame", HFILL } }, + { &hf_analysis_acks_acked_addr_pdu_num, + { "This is an Ack-Ack to the Address PDU in", "p_mul.analysis.acks_acked_addr_pdu_in", FT_FRAMENUM, BASE_NONE, + FRAMENUM_TYPE(FT_FRAMENUM_DUP_ACK), 0x0, "The Address PDU is found in this frame", HFILL } }, { &hf_analysis_prev_pdu_num, { "Previous PDU in", "p_mul.analysis.prev_pdu_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "The previous PDU is found in this frame", HFILL } }, { &hf_analysis_ack_num, { "Ack PDU in", "p_mul.analysis.ack_in", FT_FRAMENUM, BASE_NONE, - FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, "This packet has an Ack in this frame", HFILL } }, + NULL, 0x0, "This packet has an Ack in this frame", HFILL } }, { &hf_analysis_ack_missing, { "Ack PDU missing", "p_mul.analysis.ack_missing", FT_NONE, BASE_NONE, NULL, 0x0, "The acknowledgement for this packet is missing", HFILL } }, |