diff options
| author | Joakim Karlsson <oakimk@gmail.com> | 2016-11-17 20:10:07 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-11-18 05:42:36 +0000 |
| commit | a3d3ebf16260a1ea831b421c3d59f592d9ae54f4 (patch) | |
| tree | 1a224a7eab42052fb3db09dee041aec5790a9061 | |
| parent | 08e15a8f43200c76ee45bc20000d5b8d6679ae1f (diff) | |
gtpv2: correct order in bearer qos
Change-Id: I4acc4d0546f90fcb574a77b5f8abe1b9f9e5bdc5
Reviewed-on: https://code.wireshark.org/review/18860
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-gtpv2.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 705861a5a2..6b431cd35c 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -294,9 +294,9 @@ static int hf_gtpv2_tra_info_lenb_uu = -1; static int hf_gtpv2_ti = -1; -static int hf_gtpv2_bearer_qos_pvi= -1; -static int hf_gtpv2_bearer_qos_pl= -1; static int hf_gtpv2_bearer_qos_pci= -1; +static int hf_gtpv2_bearer_qos_pl= -1; +static int hf_gtpv2_bearer_qos_pvi= -1; static int hf_gtpv2_bearer_qos_label_qci = -1; static int hf_gtpv2_bearer_qos_mbr_up = -1; static int hf_gtpv2_bearer_qos_mbr_down = -1; @@ -2178,9 +2178,9 @@ static void dissect_gtpv2_bearer_qos(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_, session_args_t * args _U_) { int offset = 0; - proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pvi, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pl, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pci, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pl, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pvi, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_gtpv2_bearer_qos_label_qci, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -7858,16 +7858,16 @@ void proto_register_gtpv2(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, - /* Bit 1 - PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29], - * clause 5.3.47 Pre-emption-Vulnerability AVP. - * 5.3.47 Pre-emption-Vulnerability AVP + /* Bit 7 - PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP. + * clause 5.3.46 Pre-emption-Capability AVP. + * 5.3.46 Pre-emption-Capability AVP * The following values are defined: - * PRE-EMPTION_VULNERABILITY_ENABLED (0) - * PRE-EMPTION_VULNERABILITY_DISABLED (1) + * PRE-EMPTION_CAPABILITY_ENABLED (0) + * PRE-EMPTION_CAPABILITY_DISABLED (1) */ - {&hf_gtpv2_bearer_qos_pvi, - {"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi", - FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01, + {&hf_gtpv2_bearer_qos_pci, + {"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci", + FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40, NULL, HFILL} }, {&hf_gtpv2_bearer_qos_pl, @@ -7875,16 +7875,16 @@ void proto_register_gtpv2(void) FT_UINT8, BASE_DEC, NULL, 0x3c, NULL, HFILL} }, - /* Bit 7 - PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP. - * clause 5.3.46 Pre-emption-Capability AVP. - * 5.3.46 Pre-emption-Capability AVP + /* Bit 1 - PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29], + * clause 5.3.47 Pre-emption-Vulnerability AVP. + * 5.3.47 Pre-emption-Vulnerability AVP * The following values are defined: - * PRE-EMPTION_CAPABILITY_ENABLED (0) - * PRE-EMPTION_CAPABILITY_DISABLED (1) + * PRE-EMPTION_VULNERABILITY_ENABLED (0) + * PRE-EMPTION_VULNERABILITY_DISABLED (1) */ - {&hf_gtpv2_bearer_qos_pci, - {"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci", - FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40, + {&hf_gtpv2_bearer_qos_pvi, + {"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi", + FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01, NULL, HFILL} }, {&hf_gtpv2_bearer_qos_label_qci, |