diff options
| author | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-12-07 12:19:59 +0000 |
|---|---|---|
| committer | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-12-07 12:19:59 +0000 |
| commit | c948e8e798ff8efbdef7bdad0251ce20a061c090 (patch) | |
| tree | 1fa39683f6610d42030a2eed8e1e2e945350d25a | |
| parent | fa1a51264f71b441ddc73103cda1f83cb951a135 (diff) | |
Fix for bug 6650: IP-ID is 2 bytes.
Note that I'm still aiming to change PDCP to use packet-rohc rather than its own, separate implementation...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40111 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-pdcp-lte.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 542e2bc7db..911480f909 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -670,7 +670,8 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, proto_tree *dynamic_ipv4_tree; proto_item *root_ti; int tree_start_offset = offset; - guint8 tos, ttl, id, rnd, nbo; + guint8 tos, ttl, rnd, nbo; + guint16 id; /* Create dynamic IPv4 subtree */ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_ipv4, tvb, offset, -1, ENC_NA); @@ -687,9 +688,9 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, offset++; /* IP-ID */ - id = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_id, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; + id = tvb_get_ntohs(tvb, offset); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_id, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; /* IP flags */ rnd = (tvb_get_guint8(tvb, offset) & 0x40) >> 6; @@ -2727,7 +2728,7 @@ void proto_register_pdcp(void) }, { &hf_pdcp_lte_rohc_dynamic_ipv4_id, { "IP-ID", - "pdcp-lte.rohc.ip.id", FT_UINT8, BASE_HEX, NULL, 0x0, + "pdcp-lte.rohc.ip.id", FT_UINT16, BASE_HEX, NULL, 0x0, "IP ID", HFILL } }, |