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

QUIC: not longer Timestamp Section/block with draft07 

Change-Id: I37061bfc49324a1c621c9211571c7bbc26c26474
Reviewed-on: https://code.wireshark.org/review/24432
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2017-11-15 06:57:08 +01:00 committed by Anders Broman
parent 5e202c0268
commit 7d88ca5cf9
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
epan/dissectors/packet-quic.c
View File

@ -483,10 +483,12 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *quic_
offset += 1;
}
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_num_ts, tvb, offset, 1, ENC_NA);
num_ts = tvb_get_guint8(tvb , offset);
offset += 1;
/* No longer Timestamps Block with draft07 */
if(quic_info->version == 0xFF000005 || quic_info->version == 0xFF000006) {
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_num_ts, tvb, offset, 1, ENC_NA);
num_ts = tvb_get_guint8(tvb , offset);
offset += 1;
}
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_largest_acknowledged, tvb, offset, len_largest_acknowledged, ENC_BIG_ENDIAN);
offset += len_largest_acknowledged;
@ -511,30 +513,32 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *quic_
num_blocks--;
}
/* Timestamp Section */
if(num_ts){
/* Delta Largest Acknowledged */
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_dla, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
/* First Timestamp */
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_ft, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
num_ts--;
/* Repeated "Num Timestamps - 1" */
while(num_ts){
if(quic_info->version == 0xFF000005 || quic_info->version == 0xFF000006) {
/* Timestamp Section */
if(num_ts){
/* Delta Largest Acknowledged */
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_dla, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
/* Time Since Previous Timestamp*/
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_tspt, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* First Timestamp */
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_ft, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
num_ts--;
/* Repeated "Num Timestamps - 1" */
while(num_ts){
/* Delta Largest Acknowledged */
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_dla, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
/* Time Since Previous Timestamp*/
proto_tree_add_item(ft_tree, hf_quic_frame_type_ack_tspt, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
num_ts--;
}
}
}