diff options
| author | Marius Paliga <marius.paliga@gmail.com> | 2017-06-08 10:13:56 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-08 13:29:45 +0000 |
| commit | a84fa8e8829a7b48b0942ae10b94cebd160cfd80 (patch) | |
| tree | 1b049795312c288e7e21dbc3c19bdbef8f5dec64 /epan/dissectors/packet-gtpv2.c | |
| parent | 411a5342c5d9f12651ed7c8d268597bdc3db9f4a (diff) | |
GTPv2: Add CIOT flag into Node Features
Updated to be in line with 3GPP TS 29.274 V14.3.0
Change-Id: Iaa6fdc6999c470d9a826f50b5d55fa1058f58cd1
Reviewed-on: https://code.wireshark.org/review/22032
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-gtpv2.c')
| -rw-r--r-- | epan/dissectors/packet-gtpv2.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 71785cfa11..342aecb297 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -455,6 +455,7 @@ static int hf_gtpv2_ldn = -1; static int hf_gtpv2_node_features_prn = -1; static int hf_gtpv2_node_features_mabr =-1; static int hf_gtpv2_node_features_ntsr = -1; +static int hf_gtpv2_node_features_ciot = -1; static int hf_gtpv2_time_to_data_xfer = -1; static int hf_gtpv2_arp_pvi = -1; static int hf_gtpv2_arp_pl = -1; @@ -5546,9 +5547,15 @@ static void dissect_gtpv2_node_features(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_node_features_prn, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gtpv2_node_features_mabr, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_gtpv2_node_features_ntsr, tvb, offset, 1, ENC_BIG_ENDIAN); + static const int * features[] = { + &hf_gtpv2_node_features_prn, + &hf_gtpv2_node_features_mabr, + &hf_gtpv2_node_features_ntsr, + &hf_gtpv2_node_features_ciot, + NULL + }; + + proto_tree_add_bitmask_list(tree, tvb, offset, 1, features, ENC_BIG_ENDIAN); offset+=1; if (length > 1) proto_tree_add_item(tree, hf_gtpv2_spare_bytes, tvb, offset, length-1, ENC_NA); @@ -8992,6 +8999,11 @@ void proto_register_gtpv2(void) FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL} }, + { &hf_gtpv2_node_features_ciot, + {"Cellular Internet Of Things (CIOT)", "gtpv2.node_features_ciot", + FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, + NULL, HFILL} + }, { &hf_gtpv2_time_to_data_xfer, {"MBMS Time to Data Transfer", "gtpv2.time_to_data_xfer", FT_STRING, BASE_NONE, NULL, 0, |