osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/dissectors/packet-gtp.c

9569 lines
395 KiB
C
Raw Normal View History

GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
/* packet-gtp.c
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
* Routines for GTP dissection
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
* Nicolas Balkota <balkota@mac.com>
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
*
Fix bug 973: While in 3GPP spec, the last two (Down/up nextPDCP-PDU seq. no.) would be 2 BYTES. So ethreal could not read the message correctly. We have to modify the log to make Ethreal analysis it. Add disection of TargetID. svn path=/trunk/; revision=18228
2006-05-27 22:09:07 +00:00
* Updates and corrections:
Inital GTPv2 dissector. svn path=/trunk/; revision=27414
2009-02-10 21:57:56 +00:00
* Copyright 2006 - 2009, Anders Broman <anders.broman@ericsson.com>
Fix bug 973: While in 3GPP spec, the last two (Down/up nextPDCP-PDU seq. no.) would be 2 BYTES. So ethreal could not read the message correctly. We have to modify the log to make Ethreal analysis it. Add disection of TargetID. svn path=/trunk/; revision=18228
2006-05-27 22:09:07 +00:00
*
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
* Added Bearer control mode dissection:
Replace some blurbs with NULL svn path=/trunk/; revision=35728
2011-01-31 21:09:28 +00:00
* Copyright 2011, Grzegorz Szczytowski <grzegorz.szczytowski@gmail.com>
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
*
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
* Updates and corrections:
Only the private extension IE value part should go in the tvb. svn path=/trunk/; revision=46996
2013-01-08 09:57:10 +00:00
* Copyright 2011-2013, Anders Broman <anders.broman@ericsson.com>
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
*
From Martin Isaksson: PDCP PDU number extension header support. svn path=/trunk/; revision=37880
2011-07-03 19:16:21 +00:00
* PDCP PDU number extension header support added by Martin Isaksson <martin.isaksson@ericsson.com>
*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* Control Plane Request-Response tracking code Largely based on similar routines in
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* packet-ldap.c by Ronnie Sahlberg
* Added by Kari Tiirikainen <kari.tiirikainen@nsn.com>
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
* Copyright 1998 Gerald Combs
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Update FSF address - part II. svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
*
* GTP v0: 3GPP TS 09.60
*
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
* http://www.3gpp.org/ftp/Specs/html-info/0960.htm
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
*
* GTP v1: 3GPP TS 29.060
*
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
* http://www.3gpp.org/ftp/Specs/html-info/29060.htm
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
*
* GTP': 3GPP TS 32.295
*
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
* http://www.3gpp.org/ftp/Specs/html-info/32295.htm
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
*/
We always HAVE_CONFIG_H so don't bother checking whether we have it or not. svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
#include "config.h"
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
#include <epan/conversation.h>
Include files from the "epan" directory and subdirectories thereof with "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
Convert a few more dissectors to wmem API svn path=/trunk/; revision=52053
2013-09-15 10:29:49 +00:00
#include <epan/wmem/wmem.h>
Move prefs.c and prefs.h into the epan subdirectory. svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
#include <epan/prefs.h>
Decode som more MBMS elements. Diameter XML fixes. svn path=/trunk/; revision=24192
2008-01-25 17:27:54 +00:00
#include <epan/expert.h>
Use VENDOR_THE3GPP, rather than a hardcoded 10415, for the vendor ID for the 3GPP. svn path=/trunk/; revision=16007
2005-09-26 08:44:31 +00:00
#include <epan/sminmpec.h>
Split out common asn1 stuff to asn1.h and include that where needed. svn path=/trunk/; revision=21635
2007-05-01 22:05:11 +00:00
#include <epan/asn1.h>
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
#include <epan/tap.h>
Add missing includes svn path=/trunk/; revision=54332
2013-12-21 17:23:17 +00:00
#include <epan/to_str.h>
Instead of tweaking a "Protocol configuration options" extension header item to look more-or-less like a PPP packet, just dissect it in place and hand off to the appropriate subdissector using the PPP dissector's handoff table (which we export, along with its value_string table for protocol IDs, which we use to report the protocol ID symbolically). This means there's no point in having a configurable option to control whether to do that tweaking; make it an obsolete option. Bring "col_get_writable()" back from the dead, and have the GTP dissector save the current "writable" flag for columns, mark the columns non-writable before calling the subdissector for the PPP configuration protocol, and restore the state of the writable flag, rather than putting the columns back after the PPP configuration protocol's dissector is done. Fix some more typos in comments. Don't register the IP dissector in the "ppp.protocol" table in the GTP dissector's handoff registration routine - it's already being done in the IP dissector's handoff routine. Fix the name for CHAP to match what RFC 1994 calls it (if the name changed, it should be changed in all places, but, at least according to this message, a while ago, from Bob Sutterfield, "since the RFC defines the protocol, the RFC defines the name": http://mail-index.netbsd.org/netbsd-help/1996/05/16/0011.html and the RFC defines the name as "PPP Challenge Handshake Authentication Protocol (CHAP)"). svn path=/trunk/; revision=6617
2002-11-11 19:23:14 +00:00
#include "packet-ppp.h"
Radius Dictionary Support Part 2: the code svn path=/trunk/; revision=14925
2005-07-15 21:12:27 +00:00
#include "packet-radius.h"
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
#include "packet-bssap.h"
First step to split the gsm_a dissector into several smaller ones ( done by Neil Piercy) rename the "old" one to gsm_a_common. svn path=/trunk/; revision=25915
2008-08-04 16:11:17 +00:00
#include "packet-gsm_a_common.h"
Expand some value strings, get map_error from gsm_map use the added IE's. svn path=/trunk/; revision=17818
2006-04-05 18:54:43 +00:00
#include "packet-gsm_map.h"
Use gprscdr to dissect CDRs. svn path=/trunk/; revision=35763
2011-02-02 17:51:00 +00:00
#include "packet-gprscdr.h"
Fix bug 973: While in 3GPP spec, the last two (Down/up nextPDCP-PDU seq. no.) would be 2 BYTES. So ethreal could not read the message correctly. We have to modify the log to make Ethreal analysis it. Add disection of TargetID. svn path=/trunk/; revision=18228
2006-05-27 22:09:07 +00:00
#include "packet-per.h"
#include "packet-ranap.h"
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
#include "packet-bssgp.h"
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
#include "packet-e212.h"
Completely revert r33367 so that we don't duplicate content in packet-gtp.h. svn path=/trunk/; revision=33379
2010-06-29 23:48:24 +00:00
#include "packet-gtp.h"
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
Fix [-Wmissing-prototypes] svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
void proto_register_gtp(void);
void proto_reg_handoff_gtp(void);
Don't export "osinl_subdissector_table" or "ppp_subdissector_table" - have other dissectors that use them fetch them with "find_dissector_table()". svn path=/trunk/; revision=7601
2003-04-29 17:56:49 +00:00
static dissector_table_t ppp_subdissector_table;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
static dissector_table_t gtp_priv_ext_dissector_table;
Add a dissector table for CDR:s svn path=/trunk/; revision=37751
2011-06-22 13:58:04 +00:00
static dissector_table_t gtp_cdr_fmt_dissector_table;
Don't export "osinl_subdissector_table" or "ppp_subdissector_table" - have other dissectors that use them fetch them with "find_dissector_table()". svn path=/trunk/; revision=7601
2003-04-29 17:56:49 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTPv0_PORT 3386
#define GTPv1C_PORT 2123 /* 3G Control PDU */
#define GTPv1U_PORT 2152 /* 3G T-PDU */
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTPv0_HDR_LENGTH 20
#define GTPv1_HDR_LENGTH 12
#define GTP_PRIME_HDR_LENGTH 6
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Michal Melerowicz: merge gtpv0 and gtpv1 dissectors into one; fix up XXX_to_str routines. svn path=/trunk/; revision=8715
2003-10-16 09:55:10 +00:00
/* to check compliance with ETSI */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_MANDATORY 1
#define GTP_OPTIONAL 2
#define GTP_CONDITIONAL 4
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
#define GTP_TPDU_AS_NONE -1
#define GTP_TPDU_AS_TPDU 0
#define GTP_TPDU_AS_SYNC 2
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static gboolean g_gtp_over_tcp = TRUE;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static guint g_gtpv0_port = GTPv0_PORT;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static guint g_gtpv1c_port = GTPv1C_PORT;
static guint g_gtpv1u_port = GTPv1U_PORT;
Updates from Michal Melerowicz: 1. simplified and shorter names 2. fixed problem with filtering (consequence of 1st point) 3. added more charging tickets svn path=/trunk/; revision=3946
2001-09-19 06:08:36 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int proto_gtp = -1;
/*KTi*/
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
static int hf_gtp_ie_id = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_response_in = -1;
static int hf_gtp_response_to = -1;
static int hf_gtp_time = -1;
static int hf_gtp_apn = -1;
static int hf_gtp_cause = -1;
static int hf_gtp_chrg_char = -1;
static int hf_gtp_chrg_char_s = -1;
static int hf_gtp_chrg_char_n = -1;
static int hf_gtp_chrg_char_p = -1;
static int hf_gtp_chrg_char_f = -1;
static int hf_gtp_chrg_char_h = -1;
static int hf_gtp_chrg_char_r = -1;
static int hf_gtp_chrg_id = -1;
static int hf_gtp_chrg_ipv4 = -1;
static int hf_gtp_chrg_ipv6 = -1;
static int hf_gtp_ext_flow_label = -1;
static int hf_gtp_ext_id = -1;
static int hf_gtp_ext_val = -1;
From Martin Isaksson: PDCP PDU number extension header support. svn path=/trunk/; revision=37880
2011-07-03 19:16:21 +00:00
static int hf_gtp_ext_hdr = -1;
static int hf_gtp_ext_hdr_next = -1;
static int hf_gtp_ext_hdr_length = -1;
static int hf_gtp_ext_hdr_pdcpsn = -1;
From Lakshmi Narayana Madala : GTP dissector enhanced to support UDP Port extension header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418 svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
static int hf_gtp_ext_hdr_udp_port = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_flags = -1;
static int hf_gtp_flags_ver = -1;
Try to fix the GTP' header dissection a bit. svn path=/trunk/; revision=33689
2010-08-01 20:55:29 +00:00
static int hf_gtp_prime_flags_ver = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_flags_pt = -1;
static int hf_gtp_flags_spare1 = -1;
Handle 20 byte GTP' V0 header. svn path=/trunk/; revision=40081
2011-12-03 12:11:01 +00:00
static int hf_gtp_flags_hdr_length = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_flags_snn = -1;
static int hf_gtp_flags_spare2 = -1;
static int hf_gtp_flags_e = -1;
static int hf_gtp_flags_s = -1;
static int hf_gtp_flags_pn = -1;
static int hf_gtp_flow_ii = -1;
static int hf_gtp_flow_label = -1;
static int hf_gtp_flow_sig = -1;
static int hf_gtp_gsn_addr_len = -1;
static int hf_gtp_gsn_addr_type = -1;
static int hf_gtp_gsn_ipv4 = -1;
static int hf_gtp_gsn_ipv6 = -1;
static int hf_gtp_length = -1;
static int hf_gtp_map_cause = -1;
static int hf_gtp_message_type = -1;
static int hf_gtp_ms_reason = -1;
static int hf_gtp_ms_valid = -1;
static int hf_gtp_npdu_number = -1;
static int hf_gtp_node_ipv4 = -1;
static int hf_gtp_node_ipv6 = -1;
static int hf_gtp_nsapi = -1;
static int hf_gtp_ptmsi = -1;
static int hf_gtp_ptmsi_sig = -1;
static int hf_gtp_qos_version = -1;
static int hf_gtp_qos_spare1 = -1;
static int hf_gtp_qos_delay = -1;
static int hf_gtp_qos_mean = -1;
static int hf_gtp_qos_peak = -1;
static int hf_gtp_qos_spare2 = -1;
static int hf_gtp_qos_precedence = -1;
static int hf_gtp_qos_spare3 = -1;
static int hf_gtp_qos_reliability = -1;
static int hf_gtp_qos_al_ret_priority = -1;
static int hf_gtp_qos_traf_class = -1;
static int hf_gtp_qos_del_order = -1;
static int hf_gtp_qos_del_err_sdu = -1;
static int hf_gtp_qos_max_sdu_size = -1;
static int hf_gtp_qos_max_ul = -1;
static int hf_gtp_qos_max_dl = -1;
static int hf_gtp_qos_res_ber = -1;
static int hf_gtp_qos_sdu_err_ratio = -1;
static int hf_gtp_qos_trans_delay = -1;
static int hf_gtp_qos_traf_handl_prio = -1;
static int hf_gtp_qos_guar_ul = -1;
static int hf_gtp_qos_guar_dl = -1;
Update the QoS IE svn path=/trunk/; revision=26526
2008-10-23 19:22:54 +00:00
static int hf_gtp_qos_src_stat_desc = -1;
static int hf_gtp_qos_sig_ind = -1;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
static int hf_gtp_qos_arp_pvi = -1;
static int hf_gtp_qos_arp_pl = -1;
static int hf_gtp_qos_arp_pci = -1;
static int hf_gtp_qos_qci = -1;
static int hf_gtp_qos_ul_mbr = -1;
static int hf_gtp_qos_dl_mbr = -1;
static int hf_gtp_qos_ul_gbr = -1;
static int hf_gtp_qos_dl_gbr = -1;
static int hf_gtp_qos_ul_apn_ambr = -1;
static int hf_gtp_qos_dl_apn_ambr = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_pkt_flow_id = -1;
static int hf_gtp_rab_gtpu_dn = -1;
static int hf_gtp_rab_gtpu_up = -1;
static int hf_gtp_rab_pdu_dn = -1;
static int hf_gtp_rab_pdu_up = -1;
static int hf_gtp_rai_rac = -1;
static int hf_gtp_rai_lac = -1;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474 : Dissect LTE RADIUS AVP 3GPP-User-Location-Info svn path=/trunk/; revision=43700
2012-07-13 21:18:35 +00:00
static int hf_gtp_tac = -1;
static int hf_gtp_eci = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_ranap_cause = -1;
static int hf_gtp_recovery = -1;
static int hf_gtp_reorder = -1;
static int hf_gtp_rnc_ipv4 = -1;
static int hf_gtp_rnc_ipv6 = -1;
static int hf_gtp_rp = -1;
static int hf_gtp_rp_nsapi = -1;
static int hf_gtp_rp_sms = -1;
static int hf_gtp_rp_spare = -1;
static int hf_gtp_sel_mode = -1;
static int hf_gtp_seq_number = -1;
static int hf_gtp_sndcp_number = -1;
static int hf_gtp_tear_ind = -1;
static int hf_gtp_teid = -1;
static int hf_gtp_teid_cp = -1;
static int hf_gtp_ulink_teid_cp = -1;
static int hf_gtp_teid_data = -1;
static int hf_gtp_ulink_teid_data = -1;
static int hf_gtp_teid_ii = -1;
static int hf_gtp_tft_code = -1;
static int hf_gtp_tft_spare = -1;
static int hf_gtp_tft_number = -1;
static int hf_gtp_tft_eval = -1;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
static int hf_gtp_tft_content_id = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_tid = -1;
static int hf_gtp_tlli = -1;
static int hf_gtp_tr_comm = -1;
static int hf_gtp_trace_ref = -1;
static int hf_gtp_trace_type = -1;
static int hf_gtp_user_addr_pdp_org = -1;
static int hf_gtp_user_addr_pdp_type = -1;
static int hf_gtp_user_ipv4 = -1;
static int hf_gtp_user_ipv6 = -1;
static int hf_gtp_security_mode = -1;
static int hf_gtp_no_of_vectors = -1;
static int hf_gtp_cipher_algorithm = -1;
static int hf_gtp_cksn_ksi = -1;
static int hf_gtp_cksn = -1;
static int hf_gtp_ksi = -1;
static int hf_gtp_ext_length = -1;
From Katrina Zhang sligtly modified. - Add dissection of Selected PLMN ID. - Put enterpice id in the tree - Filter for UTRAN Transparent Field. svn path=/trunk/; revision=47252
2013-01-24 09:59:06 +00:00
static int hf_gtp_utran_field = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_ext_apn_res = -1;
static int hf_gtp_ext_rat_type = -1;
static int hf_gtp_ext_geo_loc_type = -1;
static int hf_gtp_ext_sac = -1;
static int hf_gtp_ext_imeisv = -1;
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
static int hf_gtp_target_rnc_id = -1;
static int hf_gtp_target_ext_rnc_id = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_bssgp_cause = -1;
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
static int hf_gtp_bssgp_ra_discriminator = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_sapi = -1;
static int hf_gtp_xid_par_len = -1;
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
static int hf_gtp_earp_pvi = -1;
static int hf_gtp_earp_pl = -1;
static int hf_gtp_earp_pci = -1;
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
static int hf_gtp_cdr_app = -1;
static int hf_gtp_cdr_rel = -1;
static int hf_gtp_cdr_ver = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_cmn_flg_ppc = -1;
Decode som MBMS elements. svn path=/trunk/; revision=24184
2008-01-24 22:21:13 +00:00
static int hf_gtp_cmn_flg_mbs_srv_type = -1;
static int hf_gtp_cmn_flg_mbs_ran_pcd_rdy = -1;
static int hf_gtp_cmn_flg_mbs_cnt_inf = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_cmn_flg_nrsn = -1;
Decode som MBMS elements. svn path=/trunk/; revision=24184
2008-01-24 22:21:13 +00:00
static int hf_gtp_cmn_flg_no_qos_neg = -1;
static int hf_gtp_cmn_flg_upgrd_qos_sup = -1;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
static int hf_gtp_cmn_flg_dual_addr_bearer_flg = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_tmgi = -1;
static int hf_gtp_mbms_ses_dur_days = -1;
static int hf_gtp_mbms_ses_dur_s = -1;
Decode som more MBMS elements. Diameter XML fixes. svn path=/trunk/; revision=24192
2008-01-25 17:27:54 +00:00
static int hf_gtp_no_of_mbms_sa_codes = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int hf_gtp_mbms_sa_code = -1;
static int hf_gtp_mbs_2g_3g_ind = -1;
static int hf_gtp_time_2_dta_tr = -1;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
static int hf_gtp_ext_ei = -1;
static int hf_gtp_ext_gcsi = -1;
static int hf_gtp_ext_dti = -1;
Add dissection of Radio Priority LCS. svn path=/trunk/; revision=35276
2010-12-27 20:23:26 +00:00
static int hf_gtp_ra_prio_lcs = -1;
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
static int hf_gtp_bcm = -1;
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
static int hf_gtp_fqdn = -1;
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
static int hf_gtp_rim_routing_addr = -1;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
static int hf_gtp_mbms_flow_id = -1;
static int hf_gtp_mbms_dist_indic = -1;
static int hf_gtp_ext_apn_ambr_ul = -1;
static int hf_gtp_ext_apn_ambr_dl = -1;
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
static int hf_gtp_ext_sub_ue_ambr_ul = -1;
static int hf_gtp_ext_sub_ue_ambr_dl = -1;
static int hf_gtp_ext_auth_ue_ambr_ul = -1;
static int hf_gtp_ext_auth_ue_ambr_dl = -1;
static int hf_gtp_ext_auth_apn_ambr_ul = -1;
static int hf_gtp_ext_auth_apn_ambr_dl = -1;
static int hf_gtp_ext_ggsn_back_off_time_units = -1;
static int hf_gtp_ext_ggsn_back_off_timer = -1;
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
static int hf_gtp_higher_br_16mb_flg = -1;
static int hf_gtp_max_mbr_apn_ambr_ul = -1;
static int hf_gtp_max_mbr_apn_ambr_dl = -1;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
/* Generated from convert_proto_tree_add_text.pl */
static int hf_gtp_ggsn_2_address_ipv4 = -1;
static int hf_gtp_rfsp_index = -1;
static int hf_gtp_quintuplet_ciphering_key = -1;
static int hf_gtp_kc = -1;
static int hf_gtp_rand = -1;
static int hf_gtp_pdp_context_identifier = -1;
static int hf_gtp_receive_n_pdu_number = -1;
static int hf_gtp_container_length = -1;
static int hf_gtp_quintuplets_length = -1;
static int hf_gtp_auth = -1;
static int hf_gtp_tft_length = -1;
static int hf_gtp_ggsn_address_for_control_plane = -1;
static int hf_gtp_integrity_key_ik = -1;
static int hf_gtp_gsn_address_information_element_length = -1;
static int hf_gtp_reordering_required = -1;
static int hf_gtp_sres = -1;
static int hf_gtp_data_record_format = -1;
static int hf_gtp_timezone = -1;
static int hf_gtp_authentication_length = -1;
static int hf_gtp_send_n_pdu_number = -1;
static int hf_gtp_sequence_number_up = -1;
static int hf_gtp_pdp_address_length = -1;
static int hf_gtp_transaction_identifier = -1;
static int hf_gtp_xres_length = -1;
static int hf_gtp_ggsn_address_length = -1;
static int hf_gtp_apn_length = -1;
static int hf_gtp_sequence_number_down = -1;
static int hf_gtp_tft_packet_filter_id = -1;
static int hf_gtp_ggsn_2_address_ipv6 = -1;
static int hf_gtp_pdp_address_ipv4 = -1;
static int hf_gtp_activity_status_indicator = -1;
static int hf_gtp_pdp_type = -1;
static int hf_gtp_ggsn_address_for_user_traffic = -1;
static int hf_gtp_quintuplet_integrity_key = -1;
static int hf_gtp_pdp_address_ipv6 = -1;
static int hf_gtp_tft_content_length = -1;
static int hf_gtp_rab_setup_length = -1;
static int hf_gtp_number_of_data_records = -1;
static int hf_gtp_ciphering_key_kc = -1;
static int hf_gtp_pdp_cntxt_sapi = -1;
static int hf_gtp_xres = -1;
static int hf_gtp_pdp_organization = -1;
static int hf_gtp_node_address_length = -1;
static int hf_gtp_ggsn_2_address_length = -1;
static int hf_gtp_gsn_address_length = -1;
static int hf_gtp_vplmn_address_allowed = -1;
static int hf_gtp_uplink_flow_label_signalling = -1;
static int hf_gtp_extended_end_user_address = -1;
static int hf_gtp_ciphering_key_ck = -1;
static int hf_gtp_fqdn_length = -1;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
/* Initialize the subtree pointers */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static gint ett_gtp = -1;
static gint ett_gtp_flags = -1;
static gint ett_gtp_ext = -1;
From Martin Isaksson: PDCP PDU number extension header support. svn path=/trunk/; revision=37880
2011-07-03 19:16:21 +00:00
static gint ett_gtp_ext_hdr = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static gint ett_gtp_qos = -1;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
static gint ett_gtp_qos_arp = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static gint ett_gtp_flow_ii = -1;
static gint ett_gtp_rp = -1;
static gint ett_gtp_pkt_flow_id = -1;
static gint ett_gtp_trip = -1;
static gint ett_gtp_quint = -1;
static gint ett_gtp_proto = -1;
static gint ett_gtp_gsn_addr = -1;
static gint ett_gtp_tft = -1;
static gint ett_gtp_tft_pf = -1;
static gint ett_gtp_tft_flags = -1;
static gint ett_gtp_rab_setup = -1;
static gint ett_gtp_hdr_list = -1;
static gint ett_gtp_node_addr = -1;
static gint ett_gtp_rel_pack = -1;
static gint ett_gtp_can_pack = -1;
static gint ett_gtp_data_resp = -1;
Add a DRX subtree to GTP dissector now that the subtree (useless for NAS and EPS NAS dissectors) was removed from de_gmm_drx_param in r51537 svn path=/trunk/; revision=51541
2013-08-27 19:38:35 +00:00
static gint ett_gtp_drx = -1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static gint ett_gtp_net_cap = -1;
static gint ett_gtp_tmgi = -1;
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
static gint ett_gtp_cdr_ver = -1;
static gint ett_gtp_cdr_dr = -1;
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
static gint ett_gtp_uli_rai = -1;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
static gint ett_gtp_mm_cntxt = -1;
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static expert_field ei_gtp_ext_hdr_pdcpsn = EI_INIT;
static expert_field ei_gtp_ext_length_mal = EI_INIT;
static expert_field ei_gtp_ext_length_warn = EI_INIT;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
static expert_field ei_gtp_undecoded = EI_INIT;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
static expert_field ei_gtp_message_not_found = EI_INIT;
static expert_field ei_gtp_field_not_present = EI_INIT;
static expert_field ei_gtp_wrong_next_field = EI_INIT;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static gboolean g_gtp_etsi_order = FALSE;
Change the default preference on how to dissect dunneled data to GTP_TPDU_AS_TPDU. svn path=/trunk/; revision=51917
2013-09-10 05:47:28 +00:00
static gint dissect_tpdu_as = GTP_TPDU_AS_TPDU;
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
static const enum_val_t gtp_decode_tpdu_as[] = {
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
{"none", "None", GTP_TPDU_AS_NONE},
{"tpdu", "TPDU", GTP_TPDU_AS_TPDU},
{"sync", "SYNC", GTP_TPDU_AS_SYNC},
{NULL, NULL, 0}
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
};
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int gtp_tap = -1;
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
static int gtpv1_tap = -1;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Definition of flags masks */
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
#define GTP_VER_MASK 0xE0
Handle 20 byte GTP' V0 header. svn path=/trunk/; revision=40081
2011-12-03 12:11:01 +00:00
static const true_false_string gtp_hdr_length_vals = {
"6-Octet Header",
"20-Octet Header"
};
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static const value_string ver_types[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "GTP release 97/98 version"},
{1, "GTP release 99 version"},
Inital GTPv2 dissector. svn path=/trunk/; revision=27414
2009-02-10 21:57:56 +00:00
{2, "GTPv2-C"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{3, "None"},
{4, "None"},
{5, "None"},
{6, "None"},
{7, "None"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
static const value_string pt_types[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "GTP'"},
{1, "GTP"},
{0, NULL}
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
};
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_PT_MASK 0x10
#define GTP_SPARE1_MASK 0x0E
#define GTP_SPARE2_MASK 0x08
#define GTP_E_MASK 0x04
#define GTP_S_MASK 0x02
#define GTP_SNN_MASK 0x01
#define GTP_PN_MASK 0x01
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
#define GTP_EXT_HDR_NO_MORE_EXT_HDRS 0x00
#define GTP_EXT_HDR_MBMS_SUPPORT_IND 0x01
#define GTP_EXT_HDR_MS_INFO_CHG_REP_SUPP_IND 0x02
#define GTP_EXT_HDR_UDP_PORT 0x40
#define GTP_EXT_HDR_PDCP_SN 0xC0
#define GTP_EXT_HDR_SUSPEND_REQ 0xC1
#define GTP_EXT_HDR_SUSPEND_RESP 0xC2
From Martin Isaksson: PDCP PDU number extension header support. svn path=/trunk/; revision=37880
2011-07-03 19:16:21 +00:00
Handle extension header. svn path=/trunk/; revision=26119
2008-09-02 18:27:33 +00:00
static const value_string next_extension_header_fieldvals[] = {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
{GTP_EXT_HDR_NO_MORE_EXT_HDRS, "No more extension headers"},
{GTP_EXT_HDR_MBMS_SUPPORT_IND, "MBMS support indication"},
{GTP_EXT_HDR_MS_INFO_CHG_REP_SUPP_IND, "MS Info Change Reporting support indication"},
From Lakshmi Narayana Madala : GTP dissector enhanced to support UDP Port extension header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418 svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
{GTP_EXT_HDR_UDP_PORT, "UDP Port number"},
From Martin Isaksson: PDCP PDU number extension header support. svn path=/trunk/; revision=37880
2011-07-03 19:16:21 +00:00
{GTP_EXT_HDR_PDCP_SN, "PDCP PDU number"},
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
{GTP_EXT_HDR_SUSPEND_REQ, "Suspend Request"},
{GTP_EXT_HDR_SUSPEND_RESP, "Suspend Response"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
Handle extension header. svn path=/trunk/; revision=26119
2008-09-02 18:27:33 +00:00
};
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Definition of 3G charging characteristics masks */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_MASK_CHRG_CHAR_S 0xF000
#define GTP_MASK_CHRG_CHAR_N 0x0800
#define GTP_MASK_CHRG_CHAR_P 0x0400
#define GTP_MASK_CHRG_CHAR_F 0x0200
#define GTP_MASK_CHRG_CHAR_H 0x0100
#define GTP_MASK_CHRG_CHAR_R 0x00FF
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Michal Melerowicz: Fixed TFT decoding and processing PPP payload inside of GTP protocol conf options That change also put all GTP preferences under a "gtp" heading; put in another hack so that your old "gtpv0" and "gtpv1" settings are recognized. svn path=/trunk/; revision=5588
2002-05-29 07:35:55 +00:00
/* Traffic Flow Templates mask */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTPv1_TFT_CODE_MASK 0xE0
#define GTPv1_TFT_SPARE_MASK 0x10
#define GTPv1_TFT_NUMBER_MASK 0x0F
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Definition of GSN Address masks */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_GSN_ADDR_TYPE_MASK 0xC0
#define GTP_EXT_GSN_ADDR_LEN_MASK 0x3F
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Definition of QoS masks */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_QOS_SPARE1_MASK 0xC0
#define GTP_EXT_QOS_DELAY_MASK 0x38
#define GTP_EXT_QOS_RELIABILITY_MASK 0x07
#define GTP_EXT_QOS_PEAK_MASK 0xF0
#define GTP_EXT_QOS_SPARE2_MASK 0x08
#define GTP_EXT_QOS_PRECEDENCE_MASK 0x07
#define GTP_EXT_QOS_SPARE3_MASK 0xE0
#define GTP_EXT_QOS_MEAN_MASK 0x1F
#define GTP_EXT_QOS_TRAF_CLASS_MASK 0xE0
#define GTP_EXT_QOS_DEL_ORDER_MASK 0x18
#define GTP_EXT_QOS_DEL_ERR_SDU_MASK 0x07
#define GTP_EXT_QOS_RES_BER_MASK 0xF0
#define GTP_EXT_QOS_SDU_ERR_RATIO_MASK 0x0F
#define GTP_EXT_QOS_TRANS_DELAY_MASK 0xFC
#define GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK 0x03
#define GTP_EXT_QOS_SRC_STAT_DESC_MASK 0x0F
#define GTP_EXT_QOS_SIG_IND_MASK 0x10
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Definition of Radio Priority's masks */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTPv1_EXT_RP_NSAPI_MASK 0xF0
#define GTPv1_EXT_RP_SPARE_MASK 0x08
#define GTPv1_EXT_RP_MASK 0x07
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
static const value_string gtp_message_type[] = {
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MSG_UNKNOWN, "For future use"},
{GTP_MSG_ECHO_REQ, "Echo request"},
{GTP_MSG_ECHO_RESP, "Echo response"},
{GTP_MSG_VER_NOT_SUPP, "Version not supported"},
{GTP_MSG_NODE_ALIVE_REQ, "Node alive request"},
{GTP_MSG_NODE_ALIVE_RESP, "Node alive response"},
{GTP_MSG_REDIR_REQ, "Redirection request"},
{GTP_MSG_REDIR_RESP, "Redirection response"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/*
* 8-15 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
#if 0
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 8, "Unknown message(For future use)"},
{ 9, "Unknown message(For future use)"},
{ 10, "Unknown message(For future use)"},
{ 11, "Unknown message(For future use)"},
{ 12, "Unknown message(For future use)"},
{ 13, "Unknown message(For future use)"},
{ 14, "Unknown message(For future use)"},
{ 15, "Unknown message(For future use)"},
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
#endif
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_MSG_CREATE_PDP_REQ, "Create PDP context request"},
{GTP_MSG_CREATE_PDP_RESP, "Create PDP context response"},
{GTP_MSG_UPDATE_PDP_REQ, "Update PDP context request"},
{GTP_MSG_UPDATE_PDP_RESP, "Update PDP context response"},
{GTP_MSG_DELETE_PDP_REQ, "Delete PDP context request"},
{GTP_MSG_DELETE_PDP_RESP, "Delete PDP context response"},
{GTP_MSG_INIT_PDP_CONTEXT_ACT_REQ, "Initiate PDP Context Activation Request"},
{GTP_MSG_INIT_PDP_CONTEXT_ACT_RESP, "Initiate PDP Context Activation Response"},
Update value strings. svn path=/trunk/; revision=40035
2011-11-29 17:31:52 +00:00
/*
* 24-25 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MSG_DELETE_AA_PDP_REQ, "Delete AA PDP Context Request"},
{GTP_MSG_DELETE_AA_PDP_RESP, "Delete AA PDP Context Response"},
{GTP_MSG_ERR_IND, "Error indication"},
{GTP_MSG_PDU_NOTIFY_REQ, "PDU notification request"},
{GTP_MSG_PDU_NOTIFY_RESP, "PDU notification response"},
{GTP_MSG_PDU_NOTIFY_REJ_REQ, "PDU notification reject request"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{GTP_MSG_PDU_NOTIFY_REJ_RESP, "PDU notification reject response"},
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MSG_SUPP_EXT_HDR, "Supported extension header notification"},
{GTP_MSG_SEND_ROUT_INFO_REQ, "Send routing information for GPRS request"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{GTP_MSG_SEND_ROUT_INFO_RESP, "Send routing information for GPRS response"},
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MSG_FAIL_REP_REQ, "Failure report request"},
{GTP_MSG_FAIL_REP_RESP, "Failure report response"},
{GTP_MSG_MS_PRESENT_REQ, "Note MS GPRS present request"},
{GTP_MSG_MS_PRESENT_RESP, "Note MS GPRS present response"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* 38-47 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
#if 0
{ 38, "Unknown message(For future use)"},
{ 39, "Unknown message(For future use)"},
{ 40, "Unknown message(For future use)"},
{ 41, "Unknown message(For future use)"},
{ 42, "Unknown message(For future use)"},
{ 43, "Unknown message(For future use)"},
{ 44, "Unknown message(For future use)"},
{ 45, "Unknown message(For future use)"},
{ 46, "Unknown message(For future use)"},
{ 47, "Unknown message(For future use)"},
#endif
{GTP_MSG_IDENT_REQ, "Identification request"},
{GTP_MSG_IDENT_RESP, "Identification response"},
{GTP_MSG_SGSN_CNTXT_REQ, "SGSN context request"},
{GTP_MSG_SGSN_CNTXT_RESP, "SGSN context response"},
{GTP_MSG_SGSN_CNTXT_ACK, "SGSN context acknowledgement"},
{GTP_MSG_FORW_RELOC_REQ, "Forward relocation request"},
{GTP_MSG_FORW_RELOC_RESP, "Forward relocation response"},
{GTP_MSG_FORW_RELOC_COMP, "Forward relocation complete"},
{GTP_MSG_RELOC_CANCEL_REQ, "Relocation cancel request"},
{GTP_MSG_RELOC_CANCEL_RESP, "Relocation cancel response"},
{GTP_MSG_FORW_SRNS_CNTXT, "Forward SRNS context"},
{GTP_MSG_FORW_RELOC_ACK, "Forward relocation complete acknowledge"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{GTP_MSG_FORW_SRNS_CNTXT_ACK, "Forward SRNS context acknowledge"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* 61-69 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
#if 0
{ 61, "Unknown message(For future use)"},
{ 62, "Unknown message(For future use)"},
{ 63, "Unknown message(For future use)"},
{ 64, "Unknown message(For future use)"},
{ 65, "Unknown message(For future use)"},
{ 66, "Unknown message(For future use)"},
{ 67, "Unknown message(For future use)"},
{ 68, "Unknown message(For future use)"},
{ 69, "Unknown message(For future use)"},
#endif
{GTP_MSG_RAN_INFO_RELAY, "RAN Information Relay"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* 71-95 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
#if 0
{ 71, "Unknown message(For future use)"},
{ 72, "Unknown message(For future use)"},
{ 73, "Unknown message(For future use)"},
{ 74, "Unknown message(For future use)"},
{ 75, "Unknown message(For future use)"},
{ 76, "Unknown message(For future use)"},
{ 77, "Unknown message(For future use)"},
{ 78, "Unknown message(For future use)"},
{ 79, "Unknown message(For future use)"},
{ 80, "Unknown message(For future use)"},
{ 81, "Unknown message(For future use)"},
{ 82, "Unknown message(For future use)"},
{ 83, "Unknown message(For future use)"},
{ 84, "Unknown message(For future use)"},
{ 85, "Unknown message(For future use)"},
{ 86, "Unknown message(For future use)"},
{ 87, "Unknown message(For future use)"},
{ 88, "Unknown message(For future use)"},
{ 89, "Unknown message(For future use)"},
{ 90, "Unknown message(For future use)"},
{ 91, "Unknown message(For future use)"},
{ 92, "Unknown message(For future use)"},
{ 93, "Unknown message(For future use)"},
{ 94, "Unknown message(For future use)"},
{ 95, "Unknown message(For future use)"},
#endif
{GTP_MBMS_NOTIFY_REQ, "MBMS Notification Request"},
{GTP_MBMS_NOTIFY_RES, "MBMS Notification Response"},
{GTP_MBMS_NOTIFY_REJ_REQ, "MBMS Notification Reject Request"},
{GTP_MBMS_NOTIFY_REJ_RES, "MBMS Notification Reject Response"},
{GTP_CREATE_MBMS_CNTXT_REQ, "Create MBMS Context Request"},
{GTP_CREATE_MBMS_CNTXT_RES, "Create MBMS Context Response"},
{GTP_UPD_MBMS_CNTXT_REQ, "Update MBMS Context Request"},
{GTP_UPD_MBMS_CNTXT_RES, "Update MBMS Context Response"},
{GTP_DEL_MBMS_CNTXT_REQ, "Delete MBMS Context Request"},
{GTP_DEL_MBMS_CNTXT_RES, "Delete MBMS Context Response"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* 106 - 111 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
#if 0
{ 106, "Unknown message(For future use)"},
{ 107, "Unknown message(For future use)"},
{ 108, "Unknown message(For future use)"},
{ 109, "Unknown message(For future use)"},
{ 110, "Unknown message(For future use)"},
{ 111, "Unknown message(For future use)"},
#endif
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MBMS_REG_REQ, "MBMS Registration Request"},
{GTP_MBMS_REG_RES, "MBMS Registration Response"},
{GTP_MBMS_DE_REG_REQ, "MBMS De-Registration Request"},
{GTP_MBMS_DE_REG_RES, "MBMS De-Registration Response"},
{GTP_MBMS_SES_START_REQ, "MBMS Session Start Request"},
{GTP_MBMS_SES_START_RES, "MBMS Session Start Response"},
{GTP_MBMS_SES_STOP_REQ, "MBMS Session Stop Request"},
{GTP_MBMS_SES_STOP_RES, "MBMS Session Stop Response"},
{GTP_MBMS_SES_UPD_REQ, "MBMS Session Update Request"},
{GTP_MBMS_SES_UPD_RES, "MBMS Session Update Response"},
/* 122-127 For future use. Shall not be sent.
* If received, shall be treated as an Unknown message.
*/
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
#if 0
{ 122, "Unknown message(For future use)"},
{ 123, "Unknown message(For future use)"},
{ 124, "Unknown message(For future use)"},
{ 125, "Unknown message(For future use)"},
{ 126, "Unknown message(For future use)"},
{ 127, "Unknown message(For future use)"},
#endif
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
{GTP_MS_INFO_CNG_NOT_REQ, "MS Info Change Notification Request"},
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MS_INFO_CNG_NOT_RES, "MS Info Change Notification Response"},
/* 130-239 For future use. Shall not be sent. If received,
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
* shall be treated as an Unknown message.
*/
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
#if 0
{ 130, "Unknown message(For future use)"},
{ 131, "Unknown message(For future use)"},
{ 132, "Unknown message(For future use)"},
{ 133, "Unknown message(For future use)"},
{ 134, "Unknown message(For future use)"},
{ 135, "Unknown message(For future use)"},
{ 136, "Unknown message(For future use)"},
{ 137, "Unknown message(For future use)"},
{ 138, "Unknown message(For future use)"},
{ 139, "Unknown message(For future use)"},
{ 140, "Unknown message(For future use)"},
{ 141, "Unknown message(For future use)"},
{ 142, "Unknown message(For future use)"},
{ 143, "Unknown message(For future use)"},
{ 144, "Unknown message(For future use)"},
{ 145, "Unknown message(For future use)"},
{ 146, "Unknown message(For future use)"},
{ 147, "Unknown message(For future use)"},
{ 148, "Unknown message(For future use)"},
{ 149, "Unknown message(For future use)"},
{ 150, "Unknown message(For future use)"},
{ 151, "Unknown message(For future use)"},
{ 152, "Unknown message(For future use)"},
{ 153, "Unknown message(For future use)"},
{ 154, "Unknown message(For future use)"},
{ 155, "Unknown message(For future use)"},
{ 156, "Unknown message(For future use)"},
{ 157, "Unknown message(For future use)"},
{ 158, "Unknown message(For future use)"},
{ 159, "Unknown message(For future use)"},
#endif
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MSG_DATA_TRANSF_REQ, "Data record transfer request"},
{GTP_MSG_DATA_TRANSF_RESP, "Data record transfer response"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* 242-253 For future use. Shall not be sent. If received,
* shall be treated as an Unknown message.
*/
Update value strings. svn path=/trunk/; revision=40035
2011-11-29 17:31:52 +00:00
#if 0
{ 242, "Unknown message(For future use)"},
{ 243, "Unknown message(For future use)"},
{ 244, "Unknown message(For future use)"},
{ 245, "Unknown message(For future use)"},
{ 246, "Unknown message(For future use)"},
{ 247, "Unknown message(For future use)"},
{ 248, "Unknown message(For future use)"},
{ 249, "Unknown message(For future use)"},
{ 250, "Unknown message(For future use)"},
{ 251, "Unknown message(For future use)"},
{ 252, "Unknown message(For future use)"},
{ 253, "Unknown message(For future use)"},
#endif
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{GTP_MSG_END_MARKER, "End Marker"},
{GTP_MSG_TPDU, "T-PDU"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
static value_string_ext gtp_message_type_ext = VALUE_STRING_EXT_INIT(gtp_message_type);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
/* definitions of fields in extension header */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_CAUSE 0x01
#define GTP_EXT_IMSI 0x02
#define GTP_EXT_RAI 0x03
#define GTP_EXT_TLLI 0x04
#define GTP_EXT_PTMSI 0x05
#define GTP_EXT_QOS_GPRS 0x06
#define GTP_EXT_REORDER 0x08
#define GTP_EXT_AUTH_TRI 0x09
#define GTP_EXT_MAP_CAUSE 0x0B
#define GTP_EXT_PTMSI_SIG 0x0C
#define GTP_EXT_MS_VALID 0x0D
#define GTP_EXT_RECOVER 0x0E
#define GTP_EXT_SEL_MODE 0x0F
#define GTP_EXT_16 0x10
#define GTP_EXT_FLOW_LABEL 0x10
#define GTP_EXT_TEID 0x10 /* 0xFF10 3G */
#define GTP_EXT_17 0x11
#define GTP_EXT_FLOW_SIG 0x11
#define GTP_EXT_TEID_CP 0x11 /* 0xFF11 3G */
#define GTP_EXT_18 0x12
#define GTP_EXT_FLOW_II 0x12
#define GTP_EXT_TEID_II 0x12 /* 0xFF12 3G */
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
#define GTP_EXT_19 0x13 /* 19 TV Teardown Ind 7.7.16 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_MS_REASON 0x13 /* same as 0x1D GTPv1_EXT_MS_REASON */
#define GTP_EXT_TEAR_IND 0x13 /* 0xFF13 3G */
#define GTP_EXT_NSAPI 0x14 /* 3G */
#define GTP_EXT_RANAP_CAUSE 0x15 /* 3G */
#define GTP_EXT_RAB_CNTXT 0x16 /* 3G */
#define GTP_EXT_RP_SMS 0x17 /* 3G */
#define GTP_EXT_RP 0x18 /* 3G */
#define GTP_EXT_PKT_FLOW_ID 0x19 /* 3G */
#define GTP_EXT_CHRG_CHAR 0x1A /* 3G */
#define GTP_EXT_TRACE_REF 0x1B /* 3G */
#define GTP_EXT_TRACE_TYPE 0x1C /* 3G */
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
#define GTPv1_EXT_MS_REASON 0x1D /* 3G 29 TV MS Not Reachable Reason 7.7.25A */
/* 117-126 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_TR_COMM 0x7E /* charging */
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
#define GTP_EXT_CHRG_ID 0x7F /* 127 TV Charging ID 7.7.26 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_USER_ADDR 0x80
#define GTP_EXT_MM_CNTXT 0x81
#define GTP_EXT_PDP_CNTXT 0x82
#define GTP_EXT_APN 0x83
#define GTP_EXT_PROTO_CONF 0x84
#define GTP_EXT_GSN_ADDR 0x85
#define GTP_EXT_MSISDN 0x86
#define GTP_EXT_QOS_UMTS 0x87 /* 3G */
#define GTP_EXT_AUTH_QUI 0x88 /* 3G */
#define GTP_EXT_TFT 0x89 /* 3G */
#define GTP_EXT_TARGET_ID 0x8A /* 3G */
#define GTP_EXT_UTRAN_CONT 0x8B /* 3G */
#define GTP_EXT_RAB_SETUP 0x8C /* 3G */
#define GTP_EXT_HDR_LIST 0x8D /* 3G */
#define GTP_EXT_TRIGGER_ID 0x8E /* 3G 142 7.7.41 */
#define GTP_EXT_OMC_ID 0x8F /* 3G 143 TLV OMC Identity 7.7.42 */
#define GTP_EXT_RAN_TR_CONT 0x90 /* 3G 144 TLV RAN Transparent Container 7.7.43 */
#define GTP_EXT_PDP_CONT_PRIO 0x91 /* 3G 145 TLV PDP Context Prioritization 7.7.45 */
#define GTP_EXT_ADD_RAB_SETUP_INF 0x92 /* 3G 146 TLV Additional RAB Setup Information 7.7.45A */
#define GTP_EXT_SSGN_NO 0x93 /* 3G 147 TLV SGSN Number 7.7.47 */
#define GTP_EXT_COMMON_FLGS 0x94 /* 3G 148 TLV Common Flags 7.7.48 */
#define GTP_EXT_APN_RES 0x95 /* 3G 149 */
#define GTP_EXT_RA_PRIO_LCS 0x96 /* 3G 150 TLV Radio Priority LCS 7.7.25B */
#define GTP_EXT_RAT_TYPE 0x97 /* 3G 151 TLV RAT Type 7.7.50 */
#define GTP_EXT_USR_LOC_INF 0x98 /* 3G 152 TLV User Location Information 7.7.51 */
#define GTP_EXT_MS_TIME_ZONE 0x99 /* 3G 153 TLV MS Time Zone 7.7.52 */
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
#define GTP_EXT_IMEISV 0x9A /* 3G 154 TLV IMEI(SV) 7.7.53 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define GTP_EXT_CAMEL_CHG_INF_CON 0x9B /* 3G 155 TLV CAMEL Charging Information Container 7.7.54 */
#define GTP_EXT_MBMS_UE_CTX 0x9C /* 3G 156 TLV MBMS UE Context 7.7.55 */
#define GTP_EXT_TMGI 0x9D /* 3G 157 TLV Temporary Mobile Group Identity (TMGI) 7.7.56 */
#define GTP_EXT_RIM_RA 0x9E /* 3G 158 TLV RIM Routing Address 7.7.57 */
#define GTP_EXT_MBMS_PROT_CONF_OPT 0x9F /* 3G 159 TLV MBMS Protocol Configuration Options 7.7.58 */
#define GTP_EXT_MBMS_SA 0xA0 /* 3G 160 TLV MBMS Service Area 7.7.60 */
#define GTP_EXT_SRC_RNC_PDP_CTX_INF 0xA1 /* 3G 161 TLV Source RNC PDCP context info 7.7.61 */
#define GTP_EXT_ADD_TRS_INF 0xA2 /* 3G 162 TLV Additional Trace Info 7.7.62 */
#define GTP_EXT_HOP_COUNT 0xA3 /* 3G 163 TLV Hop Counter 7.7.63 */
#define GTP_EXT_SEL_PLMN_ID 0xA4 /* 3G 164 TLV Selected PLMN ID 7.7.64 */
#define GTP_EXT_MBMS_SES_ID 0xA5 /* 3G 165 TLV MBMS Session Identifier 7.7.65 */
#define GTP_EXT_MBMS_2G_3G_IND 0xA6 /* 3G 166 TLV MBMS 2G/3G Indicator 7.7.66 */
#define GTP_EXT_ENH_NSAPI 0xA7 /* 3G 167 TLV Enhanced NSAPI 7.7.67 */
#define GTP_EXT_MBMS_SES_DUR 0xA8 /* 3G 168 TLV MBMS Session Duration 7.7.59 */
#define GTP_EXT_ADD_MBMS_TRS_INF 0xA9 /* 3G 169 TLV Additional MBMS Trace Info 7.7.68 */
#define GTP_EXT_MBMS_SES_ID_REP_NO 0xAA /* 3G 170 TLV MBMS Session Identity Repetition Number 7.7.69 */
#define GTP_EXT_MBMS_TIME_TO_DATA_TR 0xAB /* 3G 171 TLV MBMS Time To Data Transfer 7.7.70 */
#define GTP_EXT_PS_HO_REQ_CTX 0xAC /* 3G 172 TLV PS Handover Request Context 7.7.71 */
#define GTP_EXT_BSS_CONT 0xAD /* 3G 173 TLV BSS Container 7.7.72 */
#define GTP_EXT_CELL_ID 0xAE /* 3G 174 TLV Cell Identification 7.7.73 */
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
#define GTP_EXT_PDU_NO 0xAF /* 3G 175 TLV PDU Numbers 7.7.74 */
#define GTP_EXT_BSSGP_CAUSE 0xB0 /* 3G 176 TLV BSSGP Cause 7.7.75 */
#define GTP_EXT_REQ_MBMS_BEARER_CAP 0xB1 /* 3G 177 TLV Required MBMS bearer capabilities 7.7.76 */
#define GTP_EXT_RIM_ROUTING_ADDR_DISC 0xB2 /* 3G 178 TLV RIM Routing Address Discriminator 7.7.77 */
#define GTP_EXT_LIST_OF_SETUP_PFCS 0xB3 /* 3G 179 TLV List of set-up PFCs 7.7.78 */
#define GTP_EXT_PS_HANDOVER_XIP_PAR 0xB4 /* 3G 180 TLV PS Handover XID Parameters 7.7.79 */
#define GTP_EXT_MS_INF_CHG_REP_ACT 0xB5 /* 3G 181 TLV MS Info Change Reporting Action 7.7.80 */
#define GTP_EXT_DIRECT_TUNNEL_FLGS 0xB6 /* 3G 182 TLV Direct Tunnel Flags 7.7.81 */
#define GTP_EXT_CORRELATION_ID 0xB7 /* 3G 183 TLV Correlation-ID 7.7.82 */
#define GTP_EXT_BEARER_CONTROL_MODE 0xB8 /* 3G 184 TLV Bearer Control Mode 7.7.83 */
#define GTP_EXT_MBMS_FLOW_ID 0xB9 /* 3G 185 TLV MBMS Flow Identifier 7.7.84 */
#define GTP_EXT_MBMS_IP_MCAST_DIST 0xBA /* 3G 186 TLV MBMS IP Multicast Distribution 7.7.85 */
#define GTP_EXT_MBMS_DIST_ACK 0xBB /* 3G 187 TLV MBMS Distribution Acknowledgement 7.7.86 */
#define GTP_EXT_RELIABLE_IRAT_HO_INF 0xBC /* 3G 188 TLV Reliable INTER RAT HANDOVER INFO 7.7.87 */
#define GTP_EXT_RFSP_INDEX 0xBD /* 3G 189 TLV RFSP Index 7.7.88 */
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
#define GTP_EXT_FQDN 0xBE /* 3G 190 TLV Fully Qualified Domain Name (FQDN) 7.7.90 */
Fix a few cases of proto_item_add_subtree() using the wrong tree: Coverity 916-918; Also: Fix some indentation: e.g., "4 space tabs". svn path=/trunk/; revision=36585
2011-04-12 15:39:19 +00:00
#define GTP_EXT_EVO_ALLO_RETE_P1 0xBF /* 3G 191 TLV Evolved Allocation/Retention Priority I 7.7.91 */
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
#define GTP_EXT_EVO_ALLO_RETE_P2 0xC0 /* 3G 192 TLV Evolved Allocation/Retention Priority II 7.7.92 */
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
#define GTP_EXT_EXTENDED_COMMON_FLGS 0xC1 /* 3G 193 TLV Extended Common Flags 7.7.93 */
#define GTP_EXT_UCI 0xC2 /* 3G 194 TLV User CSG Information (UCI) 7.7.94 */
#define GTP_EXT_CSG_INF_REP_ACT 0xC3 /* 3G 195 TLV CSG Information Reporting Action 7.7.95 */
#define GTP_EXT_CSG_ID 0xC4 /* 3G 196 TLV CSG ID 7.7.96 */
#define GTP_EXT_CMI 0xC5 /* 3G 197 TLV CSG Membership Indication (CMI) 7.7.97 */
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
#define GTP_EXT_AMBR 0xC6 /* 3G 198 TLV Aggregate Maximum Bit Rate (AMBR) 7.7.98 */
#define GTP_EXT_UE_NETWORK_CAP 0xC7 /* 3G 199 TLV UE Network Capability 7.7.99 */
#define GTP_EXT_UE_AMBR 0xC8 /* 3G 200 TLV UE-AMBR 7.7.100 */
#define GTP_EXT_APN_AMBR_WITH_NSAPI 0xC9 /* 3G 201 TLV APN-AMBR with NSAPI 7.7.101 */
#define GTP_EXT_GGSN_BACK_OFF_TIME 0xCA /* 3G 202 TLV GGSN Back-Off Time 7.7.102 */
#define GTP_EXT_SIG_PRI_IND 0xCB /* 3G 203 TLV Signalling Priority Indication 7.7.103 */
#define GTP_EXT_SIG_PRI_IND_W_NSAPI 0xCC /* 3G 204 TLV Signalling Priority Indication with NSAPI 7.7.104 */
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
#define GTP_EXT_HIGHER_BR_16MB_FLG 0xCD /* 3G 205 TLV Higher bitrates than 16 Mbps flag 7.7.105 */
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
#define GTP_EXT_MAX_MBR_APN_AMBR 0xCE /* 3G 206 TLV Max MBR/APN-AMBR 7.7.106 */
#define GTP_EXT_ADD_MM_CTX_SRVCC 0xCF /* 3G 207 TLV Additional MM context for SRVCC 7.7.107 */
#define GTP_EXT_ADD_FLGS_SRVCC 0xD0 /* 3G 208 TLV Additional flags for SRVCC 7.7.108 */
#define GTP_EXT_STN_SR 0xD1 /* 3G 209 TLV STN-SR 7.7.109 */
#define GTP_EXT_C_MSISDN 0xD2 /* 3G 210 TLV C-MSISDN 7.7.110 */
#define GTP_EXT_EXT_RANAP_CAUSE 0xD3 /* 3G 211 TLV Extended RANAP Cause 7.7.111 */
Update value strings. svn path=/trunk/; revision=40035
2011-11-29 17:31:52 +00:00
/* 212-238 TLV Spare. For future use. */
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* 239-250 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33])*/
#define GTP_EXT_C1 0xC1
#define GTP_EXT_C2 0xC2
#define GTP_EXT_REL_PACK 0xF9 /* charging */
#define GTP_EXT_CAN_PACK 0xFA /* charging */
#define GTP_EXT_CHRG_ADDR 0xFB /* 3G 251 TLV Charging Gateway Address 7.7.44 */
/* 252-254 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33])*/
#define GTP_EXT_DATA_REQ 0xFC /* charging */
#define GTP_EXT_DATA_RESP 0xFD /* charging */
#define GTP_EXT_NODE_ADDR 0xFE /* charging */
#define GTP_EXT_PRIV_EXT 0xFF
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Updates from Michal Melerowicz: 1. simplified and shorter names 2. fixed problem with filtering (consequence of 1st point) 3. added more charging tickets svn path=/trunk/; revision=3946
2001-09-19 06:08:36 +00:00
static const value_string gtp_val[] = {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CAUSE, "Cause of operation"},
{GTP_EXT_IMSI, "IMSI"},
{GTP_EXT_RAI, "Routing Area Identity"},
{GTP_EXT_TLLI, "Temporary Logical Link Identity"},
{GTP_EXT_PTMSI, "Packet TMSI"},
/* 6 */ {GTP_EXT_QOS_GPRS, "Quality of Service"},
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 6-7 Spare */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 8 */ {GTP_EXT_REORDER, "Reorder required"},
/* 9 */ {GTP_EXT_AUTH_TRI, "Authentication triplets"},
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 10 Spare */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 11 */ {GTP_EXT_MAP_CAUSE, "MAP cause"},
/* 12 */ {GTP_EXT_PTMSI_SIG, "P-TMSI signature"},
/* 13 */ {GTP_EXT_MS_VALID, "MS validated"},
/* 14 */ {GTP_EXT_RECOVER, "Recovery"},
/* 15 */ {GTP_EXT_SEL_MODE, "Selection mode"},
/* 16 */ {GTP_EXT_16, "Flow label data I"},
Comment out all but first value_string array entries with dup values: kept: first dup since that's the one which would be found with a linear search. svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
/* 16 */ /* ??? {GTP_EXT_FLOW_LABEL, "Flow label data I"}, */
/* 16 */ /* ??? {GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I"}, */ /* 3G */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_17, "Flow label signalling"},
Comment out all but first value_string array entries with dup values: kept: first dup since that's the one which would be found with a linear search. svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
/* ??? {GTP_EXT_FLOW_SIG, "Flow label signalling"}, */
/* ??? {GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane"}, */ /* 3G */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_18, "Flow label data II"},
Comment out all but first value_string array entries with dup values: kept: first dup since that's the one which would be found with a linear search. svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
/* ??? {GTP_EXT_FLOW_II, "Flow label data II"}, */
/* ??? {GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II"}, */ /* 3G */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_19, "MS not reachable reason"},
Comment out all but first value_string array entries with dup values: kept: first dup since that's the one which would be found with a linear search. svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
/* ??? {GTP_EXT_MS_REASON, "MS not reachable reason"}, */
/* ??? {GTP_EXT_TEAR_IND, "Teardown ID"}, */ /* 3G */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_NSAPI, "NSAPI"}, /* 3G */
{GTP_EXT_RANAP_CAUSE, "RANAP cause"}, /* 3G */
{GTP_EXT_RAB_CNTXT, "RAB context"}, /* 3G */
{GTP_EXT_RP_SMS, "Radio Priority for MO SMS"}, /* 3G */
{GTP_EXT_RP, "Radio Priority"}, /* 3G */
{GTP_EXT_PKT_FLOW_ID, "Packet Flow ID"}, /* 3G */
{GTP_EXT_CHRG_CHAR, "Charging characteristics"}, /* 3G */
{GTP_EXT_TRACE_REF, "Trace references"}, /* 3G */
{GTP_EXT_TRACE_TYPE, "Trace type"}, /* 3G */
/* 29 */ {GTPv1_EXT_MS_REASON, "MS not reachable reason"}, /* 3G */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 117-126 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 126 */ {GTP_EXT_TR_COMM, "Packet transfer command"}, /* charging */
/* 127 */ {GTP_EXT_CHRG_ID, "Charging ID"},
{GTP_EXT_USER_ADDR, "End user address"},
{GTP_EXT_MM_CNTXT, "MM context"},
{GTP_EXT_PDP_CNTXT, "PDP context"},
{GTP_EXT_APN, "Access Point Name"},
{GTP_EXT_PROTO_CONF, "Protocol configuration options"},
{GTP_EXT_GSN_ADDR, "GSN address"},
{GTP_EXT_MSISDN, "MS international PSTN/ISDN number"},
{GTP_EXT_QOS_UMTS, "Quality of service (UMTS)"}, /* 3G */
{GTP_EXT_AUTH_QUI, "Authentication quintuplets"}, /* 3G */
{GTP_EXT_TFT, "Traffic Flow Template (TFT)"}, /* 3G */
{GTP_EXT_TARGET_ID, "Target (RNC) identification"}, /* 3G */
{GTP_EXT_UTRAN_CONT, "UTRAN transparent field"}, /* 3G */
{GTP_EXT_RAB_SETUP, "RAB setup information"}, /* 3G */
{GTP_EXT_HDR_LIST, "Extension Header Types List"}, /* 3G */
{GTP_EXT_TRIGGER_ID, "Trigger Id"}, /* 3G */
{GTP_EXT_OMC_ID, "OMC Identity"}, /* 3G */
{GTP_EXT_RAN_TR_CONT, "RAN Transparent Container"}, /* 7.7.43 */
{GTP_EXT_PDP_CONT_PRIO, "PDP Context Prioritization"}, /* 7.7.45 */
{GTP_EXT_ADD_RAB_SETUP_INF, "Additional RAB Setup Information"}, /* 7.7.45A */
{GTP_EXT_SSGN_NO, "SGSN Number"}, /* 7.7.47 */
{GTP_EXT_COMMON_FLGS, "Common Flags"}, /* 7.7.48 */
{GTP_EXT_APN_RES, "APN Restriction"}, /* 3G */
{GTP_EXT_RA_PRIO_LCS, "Radio Priority LCS"}, /* 7.7.25B */
{GTP_EXT_RAT_TYPE, "RAT Type"}, /* 3G */
{GTP_EXT_USR_LOC_INF, "User Location Information"}, /* 7.7.51 */
{GTP_EXT_MS_TIME_ZONE, "MS Time Zone"}, /* 7.7.52 */
{GTP_EXT_IMEISV, "IMEI(SV)"}, /* 3G */
{GTP_EXT_CAMEL_CHG_INF_CON, "CAMEL Charging Information Container"}, /* 7.7.54 */
{GTP_EXT_MBMS_UE_CTX, "MBMS UE Context"}, /* 7.7.55 */
{GTP_EXT_TMGI, "Temporary Mobile Group Identity (TMGI)"}, /* 7.7.56 */
{GTP_EXT_RIM_RA, "RIM Routing Address"}, /* 7.7.57 */
{GTP_EXT_MBMS_PROT_CONF_OPT, "MBMS Protocol Configuration Options"}, /* 7.7.58 */
{GTP_EXT_MBMS_SA, "MBMS Service Area"}, /* 7.7.60 */
{GTP_EXT_SRC_RNC_PDP_CTX_INF, "Source RNC PDCP context info"}, /* 7.7.61 */
{GTP_EXT_ADD_TRS_INF, "Additional Trace Info"}, /* 7.7.62 */
{GTP_EXT_HOP_COUNT, "Hop Counter"}, /* 7.7.63 */
{GTP_EXT_SEL_PLMN_ID, "Selected PLMN ID"}, /* 7.7.64 */
{GTP_EXT_MBMS_SES_ID, "MBMS Session Identifier"}, /* 7.7.65 */
{GTP_EXT_MBMS_2G_3G_IND, "MBMS 2G/3G Indicator"}, /* 7.7.66 */
{GTP_EXT_ENH_NSAPI, "Enhanced NSAPI"}, /* 7.7.67 */
{GTP_EXT_MBMS_SES_DUR, "MBMS Session Duration"}, /* 7.7.59 */
{GTP_EXT_ADD_MBMS_TRS_INF, "Additional MBMS Trace Info"}, /* 7.7.68 */
{GTP_EXT_MBMS_SES_ID_REP_NO, "MBMS Session Identity Repetition Number"}, /* 7.7.69 */
{GTP_EXT_MBMS_TIME_TO_DATA_TR, "MBMS Time To Data Transfer"}, /* 7.7.70 */
{GTP_EXT_PS_HO_REQ_CTX, "PS Handover Request Context"}, /* 7.7.71 */
{GTP_EXT_BSS_CONT, "BSS Container"}, /* 7.7.72 */
{GTP_EXT_CELL_ID, "Cell Identification"}, /* 7.7.73 */
{GTP_EXT_PDU_NO, "PDU Numbers"}, /* 7.7.74 */
{GTP_EXT_BSSGP_CAUSE, "BSSGP Cause"}, /* 7.7.75 */
{GTP_EXT_REQ_MBMS_BEARER_CAP, "Required MBMS bearer capabilities"}, /* 7.7.76 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_RIM_ROUTING_ADDR_DISC, "RIM Routing Address Discriminator"}, /* 7.7.77 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_LIST_OF_SETUP_PFCS, "List of set-up PFCs"}, /* 7.7.78 */
Get rid of a few more of the explicitly defined ett:s svn path=/trunk/; revision=42234
2012-04-25 15:33:06 +00:00
/* 180 */ {GTP_EXT_PS_HANDOVER_XIP_PAR, " PS Handover XID Parameters"}, /* 7.7.79 */
/* 181 */ {GTP_EXT_MS_INF_CHG_REP_ACT, "MS Info Change Reporting Action"}, /* 7.7.80 */
/* 182 */ {GTP_EXT_DIRECT_TUNNEL_FLGS, "Direct Tunnel Flags"}, /* 7.7.81 */
/* 183 */ {GTP_EXT_CORRELATION_ID, "Correlation-ID"}, /* 7.7.82 */
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
/* 184 */ {GTP_EXT_BEARER_CONTROL_MODE, "Bearer Control Mode"}, /* 7.7.83 */
/* 185 */ {GTP_EXT_MBMS_FLOW_ID, "MBMS Flow Identifier"}, /* 7.7.84 */
/* 186 */ {GTP_EXT_MBMS_IP_MCAST_DIST, "MBMS IP Multicast Distribution"}, /* 7.7.85 */
/* 187 */ {GTP_EXT_MBMS_DIST_ACK, "MBMS Distribution Acknowledgement"}, /* 7.7.86 */
/* 188 */ {GTP_EXT_RELIABLE_IRAT_HO_INF, "Reliable INTER RAT HANDOVER INFO"}, /* 7.7.87 */
/* 189 */ {GTP_EXT_RFSP_INDEX, "RFSP Index"}, /* 7.7.88 */
/* 190 */ {GTP_EXT_FQDN, "Fully Qualified Domain Name (FQDN)"}, /* 7.7.90 */
/* 191 */ {GTP_EXT_EVO_ALLO_RETE_P1, "Evolved Allocation/Retention Priority I"}, /* 7.7.91 */
/* 192 */ {GTP_EXT_EVO_ALLO_RETE_P2, "Evolved Allocation/Retention Priority II"}, /* 7.7.92 */
/* 193 */ {GTP_EXT_EXTENDED_COMMON_FLGS, "Extended Common Flags"}, /* 7.7.93 */
/* 194 */ {GTP_EXT_UCI, "User CSG Information (UCI)"}, /* 7.7.94 */
/* 195 */ {GTP_EXT_CSG_INF_REP_ACT, "CSG Information Reporting Action"}, /* 7.7.95 */
/* 196 */ {GTP_EXT_CSG_ID, "CSG ID"}, /* 7.7.96 */
/* 197 */ {GTP_EXT_CMI, "CSG Membership Indication (CMI)"}, /* 7.7.97 */
/* 198 */ {GTP_EXT_AMBR, "Aggregate Maximum Bit Rate (AMBR)"}, /* 7.7.98 */
/* 199 */ {GTP_EXT_UE_NETWORK_CAP, "UE Network Capability"}, /* 7.7.99 */
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
/* 200 */ {GTP_EXT_UE_AMBR, "UE-AMBR"}, /* 7.7.100 */
/* 201 */ {GTP_EXT_APN_AMBR_WITH_NSAPI, "APN-AMBR with NSAPI"}, /* 7.7.101 */
/* 202 */ {GTP_EXT_GGSN_BACK_OFF_TIME, "GGSN Back-Off Time"}, /* 7.7.102 */
/* 203 */ {GTP_EXT_SIG_PRI_IND, "Signalling Priority Indication"}, /* 7.7.103 */
/* 204 */ {GTP_EXT_SIG_PRI_IND_W_NSAPI, "Signalling Priority Indication with NSAPI"}, /* 7.7.104 */
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
/* 205 */ {GTP_EXT_HIGHER_BR_16MB_FLG, "Higher bitrates than 16 Mbps flag"}, /* 7.7.105 */
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
/* 206 */ {GTP_EXT_MAX_MBR_APN_AMBR, "Max MBR/APN-AMBR"}, /* 7.7.106 */
/* 207 */ {GTP_EXT_ADD_MM_CTX_SRVCC, "Additional MM context for SRVCC"}, /* 7.7.107 */
/* 208 */ {GTP_EXT_ADD_FLGS_SRVCC, "Additional flags for SRVCC"}, /* 7.7.108 */
/* 209 */ {GTP_EXT_STN_SR, "STN-SR"}, /* 7.7.109 */
/* 210 */ {GTP_EXT_C_MSISDN, "C-MSISDN"}, /* 7.7.110 */
/* 211 */ {GTP_EXT_EXT_RANAP_CAUSE, "Extended RANAP Cause"}, /* 7.7.111 */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 212-238 TLV Spare. For future use. */
/* 239-250 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 249 */ {GTP_EXT_REL_PACK, "Sequence numbers of released packets IE"}, /* charging */
/* 250 */ {GTP_EXT_CAN_PACK, "Sequence numbers of canceled packets IE"}, /* charging */
/* 251 */ {GTP_EXT_CHRG_ADDR, "Charging Gateway address"}, /* 7.7.44 */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 252-254 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 252 */ {GTP_EXT_DATA_REQ, "Data record packet"}, /* charging */
/* 253 */ {GTP_EXT_DATA_RESP, "Requests responded"}, /* charging */
/* 254 */ {GTP_EXT_NODE_ADDR, "Address of recommended node"}, /* charging */
/* 255 */ {GTP_EXT_PRIV_EXT, "Private Extension"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
static value_string_ext gtp_val_ext = VALUE_STRING_EXT_INIT(gtp_val);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* It seems like some IE's are renamed in gtpv1 at least reading
Put the correct IE names in GTPv1 messages. svn path=/trunk/; revision=18538
2006-06-21 20:51:55 +00:00
* 3GPP TS 29.060 version 6.11.0 Release 6
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
*/
Put the correct IE names in GTPv1 messages. svn path=/trunk/; revision=18538
2006-06-21 20:51:55 +00:00
static const value_string gtpv1_val[] = {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 1 */ {GTP_EXT_CAUSE, "Cause of operation"},
/* 2 */ {GTP_EXT_IMSI, "IMSI"},
/* 3 */ {GTP_EXT_RAI, "Routing Area Identity"},
/* 4 */ {GTP_EXT_TLLI, "Temporary Logical Link Identity"},
/* 5 */ {GTP_EXT_PTMSI, "Packet TMSI"},
/* 6 */ {GTP_EXT_QOS_GPRS, "Quality of Service"},
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 6-7 Spare */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 7 */ {7, "Spare"},
/* 8 */ {GTP_EXT_REORDER, "Reorder required"},
/* 9 */ {GTP_EXT_AUTH_TRI, "Authentication triplets"},
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 10 Spare */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 10 */ {10, "Spare"},
/* 11 */ {GTP_EXT_MAP_CAUSE, "MAP cause"},
/* 12 */ {GTP_EXT_PTMSI_SIG, "P-TMSI signature"},
/* 13 */ {GTP_EXT_MS_VALID, "MS validated"},
/* 14 */ {GTP_EXT_RECOVER, "Recovery"},
/* 15 */ {GTP_EXT_SEL_MODE, "Selection mode"},
/* 16 */ {GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I"}, /* 3G */
/* 17 */ {GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane"}, /* 3G */
/* 18 */ {GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II"}, /* 3G */
/* 19 */ {GTP_EXT_TEAR_IND, "Teardown ID"}, /* 3G */
/* 20 */ {GTP_EXT_NSAPI, "NSAPI"}, /* 3G */
/* 21 */ {GTP_EXT_RANAP_CAUSE, "RANAP cause"}, /* 3G */
/* 22 */ {GTP_EXT_RAB_CNTXT, "RAB context"}, /* 3G */
/* 23 */ {GTP_EXT_RP_SMS, "Radio Priority for MO SMS"}, /* 3G */
/* 24 */ {GTP_EXT_RP, "Radio Priority"}, /* 3G */
/* 25 */ {GTP_EXT_PKT_FLOW_ID, "Packet Flow ID"}, /* 3G */
/* 26 */ {GTP_EXT_CHRG_CHAR, "Charging characteristics"}, /* 3G */
/* 27 */ {GTP_EXT_TRACE_REF, "Trace references"}, /* 3G */
/* 28 */ {GTP_EXT_TRACE_TYPE, "Trace type"}, /* 3G */
/* 29 */ {GTPv1_EXT_MS_REASON, "MS not reachable reason"}, /* 3G */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 117-126 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 126 */ {GTP_EXT_TR_COMM, "Packet transfer command"}, /* charging */
/* 127 */ {GTP_EXT_CHRG_ID, "Charging ID"},
/* 128 */ {GTP_EXT_USER_ADDR, "End user address"},
/* 129 */ {GTP_EXT_MM_CNTXT, "MM context"},
/* 130 */ {GTP_EXT_PDP_CNTXT, "PDP context"},
/* 131 */ {GTP_EXT_APN, "Access Point Name"},
/* 132 */ {GTP_EXT_PROTO_CONF, "Protocol configuration options"},
/* 133 */ {GTP_EXT_GSN_ADDR, "GSN address"},
/* 134 */ {GTP_EXT_MSISDN, "MS international PSTN/ISDN number"},
/* 135 */ {GTP_EXT_QOS_UMTS, "Quality of service (UMTS)"}, /* 3G */
/* 136 */ {GTP_EXT_AUTH_QUI, "Authentication quintuplets"}, /* 3G */
/* 137 */ {GTP_EXT_TFT, "Traffic Flow Template (TFT)"}, /* 3G */
/* 138 */ {GTP_EXT_TARGET_ID, "Target (RNC) identification"}, /* 3G */
/* 139 */ {GTP_EXT_UTRAN_CONT, "UTRAN transparent field"}, /* 3G */
/* 140 */ {GTP_EXT_RAB_SETUP, "RAB setup information"}, /* 3G */
/* 141 */ {GTP_EXT_HDR_LIST, "Extension Header Types List"}, /* 3G */
/* 142 */ {GTP_EXT_TRIGGER_ID, "Trigger Id"}, /* 3G */
/* 143 */ {GTP_EXT_OMC_ID, "OMC Identity"}, /* 3G */
/* 144 */ {GTP_EXT_RAN_TR_CONT, "RAN Transparent Container"}, /* 7.7.43 */
/* 145 */ {GTP_EXT_PDP_CONT_PRIO, "PDP Context Prioritization"}, /* 7.7.45 */
/* 146 */ {GTP_EXT_ADD_RAB_SETUP_INF, "Additional RAB Setup Information"}, /* 7.7.45A */
/* 147 */ {GTP_EXT_SSGN_NO, "SGSN Number"}, /* 7.7.47 */
/* 148 */ {GTP_EXT_COMMON_FLGS, "Common Flags"}, /* 7.7.48 */
/* 149 */ {GTP_EXT_APN_RES, "APN Restriction"}, /* 3G */
/* 150 */ {GTP_EXT_RA_PRIO_LCS, "Radio Priority LCS"}, /* 7.7.25B */
/* 151 */ {GTP_EXT_RAT_TYPE, "RAT Type"}, /* 3G */
/* 152 */ {GTP_EXT_USR_LOC_INF, "User Location Information"}, /* 7.7.51 */
/* 153 */ {GTP_EXT_MS_TIME_ZONE, "MS Time Zone"}, /* 7.7.52 */
/* 154 */ {GTP_EXT_IMEISV, "IMEI(SV)"}, /* 3G */
/* 155 */ {GTP_EXT_CAMEL_CHG_INF_CON, "CAMEL Charging Information Container"}, /* 7.7.54 */
/* 156 */ {GTP_EXT_MBMS_UE_CTX, "MBMS UE Context"}, /* 7.7.55 */
/* 157 */ {GTP_EXT_TMGI, "Temporary Mobile Group Identity (TMGI)"}, /* 7.7.56 */
/* 158 */ {GTP_EXT_RIM_RA, "RIM Routing Address"}, /* 7.7.57 */
/* 159 */ {GTP_EXT_MBMS_PROT_CONF_OPT, "MBMS Protocol Configuration Options"}, /* 7.7.58 */
/* 160 */ {GTP_EXT_MBMS_SA, "MBMS Service Area"}, /* 7.7.60 */
/* 161 */ {GTP_EXT_SRC_RNC_PDP_CTX_INF, "Source RNC PDCP context info"}, /* 7.7.61 */
/* 162 */ {GTP_EXT_ADD_TRS_INF, "Additional Trace Info"}, /* 7.7.62 */
/* 163 */ {GTP_EXT_HOP_COUNT, "Hop Counter"}, /* 7.7.63 */
/* 164 */ {GTP_EXT_SEL_PLMN_ID, "Selected PLMN ID"}, /* 7.7.64 */
/* 165 */ {GTP_EXT_MBMS_SES_ID, "MBMS Session Identifier"}, /* 7.7.65 */
/* 166 */ {GTP_EXT_MBMS_2G_3G_IND, "MBMS 2G/3G Indicator"}, /* 7.7.66 */
/* 167 */ {GTP_EXT_ENH_NSAPI, "Enhanced NSAPI"}, /* 7.7.67 */
/* 168 */ {GTP_EXT_MBMS_SES_DUR, "MBMS Session Duration"}, /* 7.7.59 */
/* 169 */ {GTP_EXT_ADD_MBMS_TRS_INF, "Additional MBMS Trace Info"}, /* 7.7.68 */
/* 170 */ {GTP_EXT_MBMS_SES_ID_REP_NO, "MBMS Session Identity Repetition Number"}, /* 7.7.69 */
/* 171 */ {GTP_EXT_MBMS_TIME_TO_DATA_TR, "MBMS Time To Data Transfer"}, /* 7.7.70 */
/* 172 */ {GTP_EXT_PS_HO_REQ_CTX, "PS Handover Request Context"}, /* 7.7.71 */
/* 173 */ {GTP_EXT_BSS_CONT, "BSS Container"}, /* 7.7.72 */
/* 174 */ {GTP_EXT_CELL_ID, "Cell Identification"}, /* 7.7.73 */
/* 175 */ {GTP_EXT_PDU_NO, "PDU Numbers"}, /* 7.7.74 */
/* 176 */ {GTP_EXT_BSSGP_CAUSE, "BSSGP Cause"}, /* 7.7.75 */
/* 177 */ {GTP_EXT_REQ_MBMS_BEARER_CAP, "Required MBMS bearer capabilities"}, /* 7.7.76 */
/* 178 */ {GTP_EXT_RIM_ROUTING_ADDR_DISC, "RIM Routing Address Discriminator"}, /* 7.7.77 */
/* 179 */ {GTP_EXT_LIST_OF_SETUP_PFCS, "List of set-up PFCs"}, /* 7.7.78 */
/* 180 */ {GTP_EXT_PS_HANDOVER_XIP_PAR, "PS Handover XID Parameters"}, /* 7.7.79 */
/* 181 */ {GTP_EXT_MS_INF_CHG_REP_ACT, "MS Info Change Reporting Action"}, /* 7.7.80 */
/* 182 */ {GTP_EXT_DIRECT_TUNNEL_FLGS, "Direct Tunnel Flags"}, /* 7.7.81 */
/* 183 */ {GTP_EXT_CORRELATION_ID, "Correlation-ID"}, /* 7.7.82 */
/* 184 */ {GTP_EXT_BEARER_CONTROL_MODE, "Bearer Control Mode"}, /* 7.7.83 */
/* 185 */ {GTP_EXT_MBMS_FLOW_ID, "MBMS Flow Identifier"}, /* 7.7.84 */
/* 186 */ {GTP_EXT_MBMS_IP_MCAST_DIST, "MBMS IP Multicast Distribution"}, /* 7.7.85 */
/* 187 */ {GTP_EXT_MBMS_DIST_ACK, "MBMS Distribution Acknowledgement"}, /* 7.7.86 */
/* 188 */ {GTP_EXT_RELIABLE_IRAT_HO_INF, "Reliable INTER RAT HANDOVER INFO"}, /* 7.7.87 */
/* 190 */ {GTP_EXT_RFSP_INDEX, "RFSP Index"}, /* 7.7.88 */
/* 190 */ {GTP_EXT_FQDN, "Fully Qualified Domain Name (FQDN)"}, /* 7.7.90 */
/* 191 */ {GTP_EXT_EVO_ALLO_RETE_P1, "Evolved Allocation/Retention Priority I"}, /* 7.7.91 */
/* 192 */ {GTP_EXT_EVO_ALLO_RETE_P2, "Evolved Allocation/Retention Priority II"}, /* 7.7.92 */
/* 193 */ {GTP_EXT_EXTENDED_COMMON_FLGS, "Extended Common Flags"}, /* 7.7.93 */
/* 194 */ {GTP_EXT_UCI, "User CSG Information (UCI)"}, /* 7.7.94 */
/* 195 */ {GTP_EXT_CSG_INF_REP_ACT, "CSG Information Reporting Action"}, /* 7.7.95 */
/* 196 */ {GTP_EXT_CSG_ID, "CSG ID"}, /* 7.7.96 */
/* 197 */ {GTP_EXT_CMI, "CSG Membership Indication (CMI)"}, /* 7.7.97 */
/* 198 */ {198, "Aggregate Maximum Bit Rate (AMBR)"}, /* 7.7.98 */
/* 199 */ {199, "UE Network Capability"}, /* 7.7.99 */
/* 200 */ {200, "UE-AMBR"}, /* 7.7.100 */
/* 201 */ {201, "APN-AMBR with NSAPI"}, /* 7.7.101 */
/* 202 */ {202, "GGSN Back-Off Time"}, /* 7.7.102 */
/* 203 */ {203, "Signalling Priority Indication"}, /* 7.7.103 */
/* 204 */ {204, "Signalling Priority Indication with NSAPI"}, /* 7.7.104 */
/* 205 */ {205, "Higher bitrates than 16 Mbps flag"}, /* 7.7.105 */
/* 206 */ {206, "Max MBR/APN-AMBR"}, /* 7.7.106 */
/* 207 */ {207, "Additional MM context for SRVCC"}, /* 7.7.107 */
/* 208 */ {208, "Additional flags for SRVCC"}, /* 7.7.108 */
/* 209 */ {209, "STN-SR"}, /* 7.7.109 */
/* 210 */ {210, "C-MSISDN"}, /* 7.7.110 */
/* 211 */ {211, "Extended RANAP Cause"}, /* 7.7.111 */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 212-238 TLV Spare. For future use. */
/* 239-250 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 249 */ {GTP_EXT_REL_PACK, "Sequence numbers of released packets IE"}, /* charging */
/* 250 */ {GTP_EXT_CAN_PACK, "Sequence numbers of canceled packets IE"}, /* charging */
/* 251 */ {GTP_EXT_CHRG_ADDR, "Charging Gateway address"}, /* 7.7.44 */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* 252-254 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 252 */ {GTP_EXT_DATA_REQ, "Data record packet"}, /* charging */
/* 253 */ {GTP_EXT_DATA_RESP, "Requests responded"}, /* charging */
/* 254 */ {GTP_EXT_NODE_ADDR, "Address of recommended node"}, /* charging */
/* 255 */ {GTP_EXT_PRIV_EXT, "Private Extension"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
Put the correct IE names in GTPv1 messages. svn path=/trunk/; revision=18538
2006-06-21 20:51:55 +00:00
};
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
static value_string_ext gtpv1_val_ext = VALUE_STRING_EXT_INIT(gtpv1_val);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, page 37
* UMTS: 29.060 v4.0, page 45
Use gprscdr to dissect CDRs. svn path=/trunk/; revision=35763
2011-02-02 17:51:00 +00:00
* ETSI TS 129 060 V9.4.0 (2010-10) Ch 7.7.1
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static const value_string cause_type[] = {
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
{ 0, "Request IMSI"},
{ 1, "Request IMEI"},
{ 2, "Request IMSI and IMEI"},
{ 3, "No identity needed"},
{ 4, "MS refuses"},
{ 5, "MS is not GPRS responding"},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ 6, "Reactivation Requested"},
{ 7, "PDP address inactivity timer expires"},
Update cause values and export the extended value string. svn path=/trunk/; revision=41672
2012-03-19 12:57:21 +00:00
/* For future use 8-48 */
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* Cause values reserved for GPRS charging
* protocol use (see GTP' in 3GPP TS 32.295 [33])
* 49-63
*/
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
{ 59, "System failure"}, /* charging */
{ 60, "The transmit buffers are becoming full"}, /* charging */
{ 61, "The receive buffers are becoming full"}, /* charging */
{ 62, "Another node is about to go down"}, /* charging */
{ 63, "This node is about to go down"}, /* charging */
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* For future use 64-127 */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{128, "Request accepted"},
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{129, "New PDP type due to network preference"},
{130, "New PDP type due to single address bearer only"},
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* For future use 131-176 */
/* Cause values reserved for GPRS charging
* protocol use (see GTP' in 3GPP TS 32.295 [33])
* 177-191
*/
Use gprscdr to dissect CDRs. svn path=/trunk/; revision=35763
2011-02-02 17:51:00 +00:00
{177, "CDR decoding error"},
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
{192, "Non-existent"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{193, "Invalid message format"},
{194, "IMSI not known"},
{195, "MS is GPRS detached"},
{196, "MS is not GPRS responding"},
{197, "MS refuses"},
{198, "Version not supported"},
{199, "No resource available"},
{200, "Service not supported"},
{201, "Mandatory IE incorrect"},
{202, "Mandatory IE missing"},
{203, "Optional IE incorrect"},
{204, "System failure"},
{205, "Roaming restriction"},
{206, "P-TMSI signature mismatch"},
{207, "GPRS connection suspended"},
{208, "Authentication failure"},
{209, "User authentication failed"},
{210, "Context not found"},
{211, "All PDP dynamic addresses are occupied"},
{212, "No memory is available"},
{213, "Relocation failure"},
{214, "Unknown mandatory extension header"},
{215, "Semantic error in the TFT operation"},
{216, "Syntactic error in the TFT operation"},
{217, "Semantic errors in packet filter(s)"},
{218, "Syntactic errors in packet filter(s)"},
{219, "Missing or unknown APN"},
{220, "Unknown PDP address or PDP type"},
{221, "PDP context without TFT already activated"},
{222, "APN access denied - no subscription"},
{223, "APN Restriction type incompatibility with currently active PDP Contexts"},
{224, "MS MBMS Capabilities Insufficient"},
{225, "Invalid Correlation-ID"},
{226, "MBMS Bearer Context Superseded"},
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
{227, "Bearer Control Mode violation"},
{228, "Collision with network initiated request"},
Update cause values and export the extended value string. svn path=/trunk/; revision=41672
2012-03-19 12:57:21 +00:00
{229, "APN Congestion"},
{230, "Bearer handling not supported"},
/* For future use 231-240 */
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* Cause values reserved for GPRS charging
* protocol use (see GTP' in 3GPP TS 32.295 [33])
* 241-255
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{252, "Request related to possibly duplicated packets already fulfilled"}, /* charging */
{253, "Request already fulfilled"}, /* charging */
{254, "Sequence numbers of released/cancelled packets IE incorrect"}, /* charging */
{255, "Request not fulfilled"}, /* charging */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
Update cause values and export the extended value string. svn path=/trunk/; revision=41672
2012-03-19 12:57:21 +00:00
value_string_ext cause_type_ext = VALUE_STRING_EXT_INIT(cause_type);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.02 v7.7.0
* UMTS: 29.002 v4.2.1, chapter 17.5, page 268
Updated GSM MAP to use the latest asn1 original files. MAP-dalouge and gsm_ss is included in this dissector. svn path=/trunk/; revision=22069
2007-06-10 19:04:12 +00:00
* Imported gsm_old_GSMMAPLocalErrorcode_vals from gsm_map from gsm_map
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string gsn_addr_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "IPv4"},
{0x01, "IPv6"},
Remove a couple trailing commas svn path=/trunk/; revision=41538
2012-03-13 16:49:43 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static const value_string pdp_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "X.25"},
{0x01, "PPP"},
{0x02, "OSP:IHOSS"},
{0x21, "IPv4"},
{0x57, "IPv6"},
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8196 : Add dissection of IPv4v6 type to End User Address IE svn path=/trunk/; revision=47047
2013-01-13 11:04:46 +00:00
{0x8d, "IPv4v6"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string pdp_org_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "ETSI"},
{1, "IETF"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static const value_string qos_delay_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed delay class (in MS to network direction)"},
{0x01, "Delay class 1"},
{0x02, "Delay class 2"},
{0x03, "Delay class 3"},
{0x04, "Delay class 4 (best effort)"},
{0x07, "Reserved"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
static const value_string qos_reliability_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed reliability class (in MS to network direction)"},
{0x01, "Acknowledged GTP, LLC, and RLC; Protected data"},
{0x02, "Unacknowledged GTP, Ack LLC/RLC, Protected data"},
{0x03, "Unacknowledged GTP/LLC, Ack RLC, Protected data"},
{0x04, "Unacknowledged GTP/LLC/RLC, Protected data"},
{0x05, "Unacknowledged GTP/LLC/RLC, Unprotected data"},
{0x07, "Reserved"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
static const value_string qos_peak_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed peak throughput (in MS to network direction)"},
{0x01, "Up to 1 000 oct/s"},
{0x02, "Up to 2 000 oct/s"},
{0x03, "Up to 4 000 oct/s"},
{0x04, "Up to 8 000 oct/s"},
{0x05, "Up to 16 000 oct/s"},
{0x06, "Up to 32 000 oct/s"},
{0x07, "Up to 64 000 oct/s"},
{0x08, "Up to 128 000 oct/s"},
{0x09, "Up to 256 000 oct/s"},
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
/* QoS Peak throughput classes from 0x0A to 0x0F (from 10 to 15) are subscribed */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x0A, "Reserved"},
{0x0B, "Reserved"},
{0x0C, "Reserved"},
{0x0D, "Reserved"},
{0x0E, "Reserved"},
{0x0F, "Reserved"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
static const value_string qos_precedence_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed precedence (in MS to network direction)"},
{0x01, "High priority"},
{0x02, "Normal priority"},
{0x03, "Low priority"},
{0x07, "Reserved"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
static const value_string qos_mean_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed mean throughput (in MS to network direction)"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x01, "100 oct/h"}, /* Class 2 */
{0x02, "200 oct/h"}, /* Class 3 */
{0x03, "500 oct/h"}, /* Class 4 */
{0x04, "1 000 oct/h"}, /* Class 5 */
{0x05, "2 000 oct/h"}, /* Class 6 */
{0x06, "5 000 oct/h"}, /* Class 7 */
{0x07, "10 000 oct/h"}, /* Class 8 */
{0x08, "20 000 oct/h"}, /* Class 9 */
{0x09, "50 000 oct/h"}, /* Class 10 */
{0x0A, "100 000 oct/h"}, /* Class 11 */
{0x0B, "200 000 oct/h"}, /* Class 12 */
{0x0C, "500 000 oct/h"}, /* Class 13 */
{0x0D, "1 000 000 oct/h"}, /* Class 14 */
{0x0E, "2 000 000 oct/h"}, /* Class 15 */
{0x0F, "5 000 000 oct/h"}, /* Class 16 */
{0x10, "10 000 000 oct/h"}, /* Class 17 */
{0x11, "20 000 000 oct/h"}, /* Class 18 */
{0x12, "50 000 000 oct/h"}, /* Class 19 */
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* QoS Mean throughput classes from 0x13 to 0x1E (from 19 to 30) are subscribed */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x13, "Reserved"},
{0x14, "Reserved"},
{0x15, "Reserved"},
{0x16, "Reserved"},
{0x17, "Reserved"},
{0x18, "Reserved"},
{0x19, "Reserved"},
{0x1A, "Reserved"},
{0x1B, "Reserved"},
{0x1C, "Reserved"},
{0x1D, "Reserved"},
{0x1E, "Reserved"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x1F, "Best effort"}, /* Class 1 */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
static value_string_ext qos_mean_type_ext = VALUE_STRING_EXT_INIT(qos_mean_type);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string qos_del_err_sdu[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed delivery of erroneous SDUs (in MS to network direction)"},
{0x01, "No detect ('-')"},
{0x02, "Erroneous SDUs are delivered ('yes')"},
{0x03, "Erroneous SDUs are not delivered ('no')"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x07, "Reserved"}, /* All other values are reserved */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_del_order[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed delivery order (in MS to network direction)"},
{0x01, "With delivery order ('yes')"},
{0x02, "Without delivery order ('no')"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x03, "Reserved"}, /* All other values are reserved */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_traf_class[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed traffic class (in MS to network direction)"},
{0x01, "Conversational class"},
{0x02, "Streaming class"},
{0x03, "Interactive class"},
{0x04, "Background class"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x07, "Reserved"}, /* All other values are reserved */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_max_sdu_size[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed maximum SDU size (in MS to network direction"},
/* For values from 0x01 to 0x96 (from 1 to 150), use a granularity of 10 octets */
{0x97, "1502 octets"},
{0x98, "1510 octets"},
{0x99, "1520 octets"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, NULL} /* All other values are reserved */
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_max_ul[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed maximum bit rate for uplink (in MS to network direction)"},
/* For values from 0x01 to 0x3F (from 1 to 63), use a granularity of 1 kbps */
/* For values from 0x40 to 0x7F, value = 64 kbps + (value - 0x40) * 8 kbps */
/* For values from 0x80 to 0xFE, value = 576 kbps + (value - 0x80) * 64 kbps */
{0xFF, "0 kbps"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_max_dl[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed maximum bit rate for downlink (in MS to network direction)"},
/* For values from 0x01 to 0x3F (from 1 to 63), use a granularity of 1 kbps */
/* For values from 0x40 to 0x7F, value = 64 kbps + (value - 0x40) * 8 kbps */
/* For values from 0x80 to 0xFE, value = 576 kbps + (value - 0x80) * 64 kbps */
{0xFF, "0 kbps"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_res_ber[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed residual BER (in MS to network direction)"},
{0x01, "1/20 = 5x10^-2"},
{0x02, "1/100 = 1x10^-2"},
{0x03, "1/200 = 5x10^-3"},
{0x04, "1/250 = 4x10^-3"},
{0x05, "1/1 000 = 1x10^-3"},
{0x06, "1/10 000 = 1x10^-4"},
{0x07, "1/100 000 = 1x10^-5"},
{0x08, "1/1 000 000 = 1x10^-6"},
{0x09, "3/50 000 000 = 6x10^-8"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x0F, "Reserved"}, /* All other values are reserved */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_sdu_err_ratio[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed SDU error ratio (in MS to network direction)"},
{0x01, "1/100 = 1x10^-2"},
{0x02, "7/1000 = 7x10^-3"},
{0x03, "1/1 000 = 1x10^-3"},
{0x04, "1/10 000 = 1x10^-4"},
{0x05, "1/100 000 = 1x10^-5"},
{0x06, "1/1 000 000 = 1x10^-6"},
{0x07, "1/10 = 1x10^-1"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x0F, "Reserved"}, /* All other values are reserved */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
};
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Updates from Michal Melerowicz: 1. simplified and shorter names 2. fixed problem with filtering (consequence of 1st point) 3. added more charging tickets svn path=/trunk/; revision=3946
2001-09-19 06:08:36 +00:00
static const value_string qos_traf_handl_prio[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed traffic handling priority (in MS to network direction)"},
{0x01, "Priority level 1"},
{0x02, "Priority level 2"},
{0x03, "Priority level 3"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
static const value_string qos_trans_delay[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed Transfer Delay (in MS to network direction)"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x01, "10 ms"}, /* Using a granularity of 10 ms */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x02, "20 ms"},
{0x03, "30 ms"},
{0x04, "40 ms"},
{0x05, "50 ms"},
{0x06, "60 ms"},
{0x07, "70 ms"},
{0x08, "80 ms"},
{0x09, "90 ms"},
{0x0A, "100 ms"},
{0x0B, "110 ms"},
{0x0C, "120 ms"},
{0x0D, "130 ms"},
{0x0E, "140 ms"},
{0x0F, "150 ms"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x10, "200 ms"}, /* (For values from 0x10 to 0x1F, value = 200 ms + (value - 0x10) * 50 ms */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x11, "250 ms"},
{0x12, "300 ms"},
{0x13, "350 ms"},
{0x14, "400 ms"},
{0x15, "450 ms"},
{0x16, "500 ms"},
{0x17, "550 ms"},
{0x18, "600 ms"},
{0x19, "650 ms"},
{0x1A, "700 ms"},
{0x1B, "750 ms"},
{0x1C, "800 ms"},
{0x1D, "850 ms"},
{0x1E, "900 ms"},
{0x1F, "950 ms"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0x20, "1000 ms"}, /* For values from 0x20 to 0x3E, value = 1000 ms + (value - 0x20) * 100 ms */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x21, "1100 ms"},
{0x22, "1200 ms"},
{0x23, "1300 ms"},
{0x24, "1400 ms"},
{0x25, "1500 ms"},
{0x26, "1600 ms"},
{0x27, "1700 ms"},
{0x28, "1800 ms"},
{0x29, "1900 ms"},
{0x2A, "2000 ms"},
{0x2B, "2100 ms"},
{0x2C, "2200 ms"},
{0x2D, "2300 ms"},
{0x2E, "2400 ms"},
{0x2F, "2500 ms"},
{0x30, "2600 ms"},
{0x31, "2700 ms"},
{0x32, "2800 ms"},
{0x33, "2900 ms"},
{0x34, "3000 ms"},
{0x35, "3100 ms"},
{0x36, "3200 ms"},
{0x37, "3300 ms"},
{0x38, "3400 ms"},
{0x39, "3500 ms"},
{0x3A, "3600 ms"},
{0x3B, "3700 ms"},
{0x3C, "3800 ms"},
{0x3D, "3900 ms"},
{0x3E, "4000 ms"},
{0x3F, "Reserved"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
static value_string_ext qos_trans_delay_ext = VALUE_STRING_EXT_INIT(qos_trans_delay);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string qos_guar_ul[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed guaranteed bit rate for uplink (in MS to network direction)"},
/* For values from 0x01 to 0x3F (from 1 to 63), use a granularity of 1 kbps */
/* For values from 0x40 to 0x7F, value = 64 kbps + (value - 0x40) * 8 kbps */
/* For values from 0x80 to 0xFE, value = 576 kbps + (value - 0x80) * 64 kbps */
{0xFF, "0 kbps"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
Update the QoS IE svn path=/trunk/; revision=26526
2008-10-23 19:22:54 +00:00
static const value_string src_stat_desc_vals[] = {
{0x00, "unknown"},
{0x01, "speech"},
{0, NULL}
};
static const true_false_string gtp_sig_ind = {
"Optimised for signalling traffic",
"Not optimised for signalling traffic"
};
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string qos_guar_dl[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0x00, "Subscribed guaranteed bit rate for downlink (in MS to network direction)"},
/* For values from 0x01 to 0x3F (from 1 to 63), use a granularity of 1 kbps */
/* For values from 0x40 to 0x7F, value = 64 kbps + (value - 0x40) * 8 kbps */
/* For values from 0x80 to 0xFE, value = 576 kbps + (value - 0x80) * 64 kbps */
{0xFF, "0 kbps"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
static const value_string sel_mode_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "MS or network provided APN, subscribed verified"},
{1, "MS provided APN, subscription not verified"},
{2, "Network provided APN, subscription not verified"},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{3, "For future use (Network provided APN, subscription not verified"}, /* Shall not be sent. If received, shall be sent as value 2 */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static const value_string tr_comm_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{1, "Send data record packet"},
{2, "Send possibly duplicated data record packet"},
{3, "Cancel data record packet"},
{4, "Release data record packet"},
{0, NULL}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* TODO: CHeck if all ms_reasons are included */
static const value_string ms_not_reachable_type[] = {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 0, "No paging response via the MSC"},
{ 1, "IMSI detached"},
{ 2, "Roaming restriction"},
{ 3, "Deregistered in the HLR for non GPRS"},
{ 4, "MS purge for non GPRS"},
{ 5, "No paging response via the SGSN"},
{ 6, "GPRS detached"},
{ 7, "Deregistered in the HLR for non GPRS"},
{ 8, "MS purged for GPRS"},
{ 9, "Unidentified subscriber via the MSC"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{10, "Unidentified subscriber via the SGSN"},
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
{11, "Deregistered in the HSS/HLR for IMS"},
{12, "No response via the IP-SM-GW"},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* UMTS: 25.413 v3.4.0, chapter 9.2.1.4, page 80
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
static const value_string ranap_cause_type[] = {
/* Radio Network Layer Cause (1-->64) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 1, "RAB preempted"},
{ 2, "Trelocoverall Expiry"},
{ 3, "Trelocprep Expiry"},
{ 4, "Treloccomplete Expiry"},
{ 5, "Tqueuing Expiry"},
{ 6, "Relocation Triggered"},
{ 7, "TRELOCalloc Expiry"},
{ 8, "Unable to Establish During Relocation"},
{ 9, "Unknown Target RNC"},
{ 10, "Relocation Cancelled"},
{ 11, "Successful Relocation"},
{ 12, "Requested Ciphering and/or Integrity Protection Algorithms not Supported"},
{ 13, "Change of Ciphering and/or Integrity Protection is not supported"},
{ 14, "Failure in the Radio Interface Procedure"},
{ 15, "Release due to UTRAN Generated Reason"},
{ 16, "User Inactivity"},
{ 17, "Time Critical Relocation"},
{ 18, "Requested Traffic Class not Available"},
{ 19, "Invalid RAB Parameters Value"},
{ 20, "Requested Maximum Bit Rate not Available"},
{ 21, "Requested Guaranteed Bit Rate not Available"},
{ 22, "Requested Transfer Delay not Achievable"},
{ 23, "Invalid RAB Parameters Combination"},
{ 24, "Condition Violation for SDU Parameters"},
{ 25, "Condition Violation for Traffic Handling Priority"},
{ 26, "Condition Violation for Guaranteed Bit Rate"},
{ 27, "User Plane Versions not Supported"},
{ 28, "Iu UP Failure"},
{ 29, "Relocation Failure in Target CN/RNC or Target System"},
{ 30, "Invalid RAB ID"},
{ 31, "No Remaining RAB"},
{ 32, "Interaction with other procedure"},
{ 33, "Requested Maximum Bit Rate for DL not Available"},
{ 34, "Requested Maximum Bit Rate for UL not Available"},
{ 35, "Requested Guaranteed Bit Rate for DL not Available"},
{ 36, "Requested Guaranteed Bit Rate for UL not Available"},
{ 37, "Repeated Integrity Checking Failure"},
{ 38, "Requested Report Type not supported"},
{ 39, "Request superseded"},
{ 40, "Release due to UE generated signalling connection release"},
{ 41, "Resource Optimisation Relocation"},
{ 42, "Requested Information Not Available"},
{ 43, "Relocation desirable for radio reasons"},
{ 44, "Relocation not supported in Target RNC or Target System"},
{ 45, "Directed Retry"},
{ 46, "Radio Connection With UE Lost"},
{ 47, "rNC-unable-to-establish-all-RFCs"},
{ 48, "deciphering-keys-not-available"},
{ 49, "dedicated-assistance-data-not-available"},
{ 50, "relocation-target-not-allowed"},
{ 51, "location-reporting-congestion"},
{ 52, "reduce-load-in-serving-cell"},
{ 53, "no-radio-resources-available-in-target-cell"},
{ 54, "gERAN-Iumode-failure"},
{ 55, "access-restricted-due-to-shared-networks"},
{ 56, "incoming-relocation-not-supported-due-to-PUESBINE-feature"},
{ 57, "traffic-load-in-the-target-cell-higher-than-in-the-source-cell"},
{ 58, "mBMS-no-multicast-service-for-this-UE"},
{ 59, "mBMS-unknown-UE-ID"},
{ 60, "successful-MBMS-session-start-no-data-bearer-necessary"},
{ 61, "mBMS-superseded-due-to-NNSF"},
{ 62, "mBMS-UE-linking-already-done"},
{ 63, "mBMS-UE-de-linking-failure-no-existing-UE-linking"},
{ 64, "tMGI-unknown"},
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Transport Layer Cause (65-->80) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 65, "Signalling Transport Resource Failure"},
{ 66, "Iu Transport Connection Failed to Establish"},
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* NAS Cause (81-->96) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 81, "User Restriction Start Indication"},
{ 82, "User Restriction End Indication"},
{ 83, "Normal Release"},
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Protocol Cause (97-->112) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 97, "Transfer Syntax Error"},
{ 98, "Semantic Error"},
{ 99, "Message not compatible with receiver state"},
{ 100, "Abstract Syntax Error (Reject)"},
{ 101, "Abstract Syntax Error (Ignore and Notify)"},
{ 102, "Abstract Syntax Error (Falsely Constructed Message"},
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Miscellaneous Cause (113-->128) */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{ 113, "O & M Intervention"},
{ 114, "No Resource Available"},
{ 115, "Unspecified Failure"},
{ 116, "Network Optimisation"},
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
/* Non-standard Cause (129-->255) */
Expand some value strings, get map_error from gsm_map use the added IE's. svn path=/trunk/; revision=17818
2006-04-05 18:54:43 +00:00
/* ranap_CauseRadioNetworkExtension ??
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
{ 257, "iP-multicast-address-and-APN-not-valid" },
{ 258, "mBMS-de-registration-rejected-due-to-implicit-registration" },
{ 259, "mBMS-request-superseded" },
{ 260, "mBMS-de-registration-during-session-not-allowed" },
{ 261, "mBMS-no-data-bearer-necessary" },
Expand some value strings, get map_error from gsm_map use the added IE's. svn path=/trunk/; revision=17818
2006-04-05 18:54:43 +00:00
*/
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
static value_string_ext ranap_cause_type_ext = VALUE_STRING_EXT_INIT(ranap_cause_type);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string mm_sec_modep[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "Used cipher value, UMTS keys and Quintuplets"},
{1, "GSM key and triplets"},
{2, "UMTS key and quintuplets"},
{3, "GSM key and quintuplets"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
static const value_string gtp_cipher_algorithm[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "No ciphering"},
{1, "GEA/1"},
{2, "GEA/2"},
{3, "GEA/3"},
{4, "GEA/4"},
{5, "GEA/5"},
{6, "GEA/6"},
{7, "GEA/7"},
{0, NULL}
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
};
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static const value_string gtp_ext_rat_type_vals[] = {
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{0, "Reserved"},
{1, "UTRAN"},
{2, "GERAN"},
{3, "WLAN"},
{4, "GAN"},
{5, "HSPA Evolution"},
{0, NULL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
};
#define MM_PROTO_GROUP_CALL_CONTROL 0x00
#define MM_PROTO_BROADCAST_CALL_CONTROL 0x01
#define MM_PROTO_PDSS1 0x02
#define MM_PROTO_CALL_CONTROL 0x03
#define MM_PROTO_PDSS2 0x04
#define MM_PROTO_MM_NON_GPRS 0x05
#define MM_PROTO_RR_MGMT 0x06
#define MM_PROTO_MM_GPRS 0x08
#define MM_PROTO_SMS 0x09
#define MM_PROTO_SESSION_MGMT 0x0A
#define MM_PROTO_NON_CALL_RELATED 0x0B
Decode a bit more of the mobility management context message, and use "mm_sec_modep[]" to decode the security type. svn path=/trunk/; revision=8005
2003-07-09 07:12:23 +00:00
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
static const value_string tft_code_type[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "Spare"},
{1, "Create new TFT"},
{2, "Delete existing TFT"},
{3, "Add packet filters to existing TFT"},
{4, "Replace packet filters in existing TFT"},
{5, "Delete packet filters from existing TFT"},
{6, "Reserved"},
{7, "Reserved"},
{0, NULL}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
From Michal Melerowicz: merge gtpv0 and gtpv1 dissectors into one; fix up XXX_to_str routines. svn path=/trunk/; revision=8715
2003-10-16 09:55:10 +00:00
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static dissector_handle_t ip_handle;
From Andreas Trauer: Replace the handling of PPP packets over GTPv1 and also establish the handling of PPP packet over GTPv0. Additionally IPv6 packets are handled in GTPv0 and GTPv1. Explanation: - old solution: examining the known PPP protocols is a tough task, because there might be more in the future -> the list must be extended more and more (the octet 0x00 has already been added for PPP network layer protocols, but for protocol field compression a lot of protocols must be inserted for IPv4(0x21), IPv6(0x57), maybe IPX (0x2b) or AppleTalk (0x29), ...) - new solution: It is easier the other way: the most significant nibble of the first octet must be 4 for IPv4 and 6 for IPv6. All other values are assumed to be PPP packets, including packets beginning with values 0x40-0x44 (header too short for IPv4 packet) and value 0x4f (PPP protocol type (IPv6 header compression protocol) taking precedence over IPv4 packets with header length of 60 octets). svn path=/trunk/; revision=6568
2002-11-06 22:59:23 +00:00
static dissector_handle_t ipv6_handle;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
static dissector_handle_t ppp_handle;
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
static dissector_handle_t sync_handle;
From Michal Melerowicz: merge gtpv0 and gtpv1 dissectors into one; fix up XXX_to_str routines. svn path=/trunk/; revision=8715
2003-10-16 09:55:10 +00:00
static dissector_handle_t gtpcdr_handle;
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
static dissector_handle_t sndcpxid_handle;
Inital GTPv2 dissector. svn path=/trunk/; revision=27414
2009-02-10 21:57:56 +00:00
static dissector_handle_t gtpv2_handle;
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
static dissector_handle_t bssgp_handle;
Minor cleanup related to proto_reg_handoff .... svn path=/trunk/; revision=26176
2008-09-11 14:07:02 +00:00
static dissector_table_t bssap_pdu_type_table;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int decode_gtp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_imsi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rai(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_tlli(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ptmsi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_qos_gprs(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_reorder(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_map_cause(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ptmsi_sig(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ms_valid(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_recovery(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_sel_mode(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_16(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_17(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_18(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_19(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ranap_cause(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rab_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rp_sms(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rp(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_pkt_flow_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_chrg_char(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_trace_ref(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_trace_type(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ms_reason(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_tr_comm(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_chrg_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_gsn_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_proto_conf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_msisdn(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_qos_umts(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_utran_cont(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rab_setup(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_hdr_list(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_trigger_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_omc_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ran_tr_cont(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_pdp_cont_prio(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_add_rab_setup_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ssgn_no(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_common_flgs(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_apn_res(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ra_prio_lcs(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rat_type(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_usr_loc_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ms_time_zone(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_imeisv(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_camel_chg_inf_con(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_ue_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_tmgi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rim_ra(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_prot_conf_opt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_sa(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_src_rnc_pdp_ctx_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_add_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_hop_count(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_sel_plmn_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_ses_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_2g_3g_ind(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_enh_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_ses_dur(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_add_mbms_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_ses_id_rep_no(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_mbms_time_to_data_tr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ps_ho_req_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_bss_cont(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_cell_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_pdu_no(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_bssgp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
static int decode_gtp_mbms_bearer_cap(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_rim_ra_disc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_lst_set_up_pfc(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int decode_gtp_ps_handover_xid(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
static int decode_gtp_direct_tnl_flg(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_ms_inf_chg_rep_act(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_corrl_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
static int decode_gtp_fqdn(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
static int decode_gtp_evolved_allc_rtn_p1(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
static int decode_gtp_evolved_allc_rtn_p2(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
static int decode_gtp_extended_common_flgs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_uci(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_csg_inf_rep_act(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_csg_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_cmi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_apn_ambr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
static int decode_gtp_ue_network_cap(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
static int decode_gtp_ue_ambr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_apn_ambr_with_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_ggsn_back_off_time(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_sig_pri_ind(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_sig_pri_ind_w_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
static int decode_gtp_higher_br_16mb_flg(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
static int decode_gtp_max_mbr_apn_ambr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_add_mm_ctx_srvcc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_add_flgs_srvcc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_stn_sr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_c_msisdn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_ext_ranap_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
static int decode_gtp_bearer_cntrl_mod(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
static int decode_gtp_mbms_flow_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_mbms_ip_mcast_dist(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_mbms_dist_ack(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_reliable_irat_ho_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
static int decode_gtp_rfsp_index(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static int decode_gtp_chrg_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_rel_pack(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_can_pack(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_data_req(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_data_resp(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
static int decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
typedef struct _gtp_opt {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
int optcode;
int (*decode) (tvbuff_t *, int, packet_info *, proto_tree *);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
} gtp_opt_t;
static const gtp_opt_t gtpopt[] = {
Cosmetic changes svn path=/trunk/; revision=42066
2012-04-14 12:17:06 +00:00
/* 0x01 */ {GTP_EXT_CAUSE, decode_gtp_cause},
/* 0x02 */ {GTP_EXT_IMSI, decode_gtp_imsi},
/* 0x03 */ {GTP_EXT_RAI, decode_gtp_rai},
/* 0x04 */ {GTP_EXT_TLLI, decode_gtp_tlli},
/* 0x05 */ {GTP_EXT_PTMSI, decode_gtp_ptmsi},
/* 0x06 */ {GTP_EXT_QOS_GPRS, decode_gtp_qos_gprs},
/* 0x07 */
/* 0x08 */ {GTP_EXT_REORDER, decode_gtp_reorder},
/* 0x09 */ {GTP_EXT_AUTH_TRI, decode_gtp_auth_tri},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* 0x0a */
Cosmetic changes svn path=/trunk/; revision=42066
2012-04-14 12:17:06 +00:00
/* 0x0b */ {GTP_EXT_MAP_CAUSE, decode_gtp_map_cause},
/* 0x0c */ {GTP_EXT_PTMSI_SIG, decode_gtp_ptmsi_sig},
/* 0x0d */ {GTP_EXT_MS_VALID, decode_gtp_ms_valid},
/* 0x0e */ {GTP_EXT_RECOVER, decode_gtp_recovery},
/* 0x0f */ {GTP_EXT_SEL_MODE, decode_gtp_sel_mode},
/* 0x10 */ {GTP_EXT_16, decode_gtp_16},
/* 0x11 */ {GTP_EXT_17, decode_gtp_17},
/* 0x12 */ {GTP_EXT_18, decode_gtp_18},
/* 0x13 */ {GTP_EXT_19, decode_gtp_19},
/* 0x14 */ {GTP_EXT_NSAPI, decode_gtp_nsapi},
/* 0x15 */ {GTP_EXT_RANAP_CAUSE, decode_gtp_ranap_cause},
/* 0x16 */ {GTP_EXT_RAB_CNTXT, decode_gtp_rab_cntxt},
/* 0x17 */ {GTP_EXT_RP_SMS, decode_gtp_rp_sms},
/* 0x18 */ {GTP_EXT_RP, decode_gtp_rp},
/* 0x19 */ {GTP_EXT_PKT_FLOW_ID, decode_gtp_pkt_flow_id},
/* 0x1a */ {GTP_EXT_CHRG_CHAR, decode_gtp_chrg_char},
/* 0x1b */ {GTP_EXT_TRACE_REF, decode_gtp_trace_ref},
/* 0x1c */ {GTP_EXT_TRACE_TYPE, decode_gtp_trace_type},
/* 0x1d */ {GTPv1_EXT_MS_REASON, decode_gtp_ms_reason},
/* 0x7e */ {GTP_EXT_TR_COMM, decode_gtp_tr_comm},
/* 0x7f */ {GTP_EXT_CHRG_ID, decode_gtp_chrg_id},
/* 0x80 */ {GTP_EXT_USER_ADDR, decode_gtp_user_addr},
/* 0x81 */ {GTP_EXT_MM_CNTXT, decode_gtp_mm_cntxt},
/* 0x82 */ {GTP_EXT_PDP_CNTXT, decode_gtp_pdp_cntxt},
/* 0x83 */ {GTP_EXT_APN, decode_gtp_apn},
/* 0x84 */ {GTP_EXT_PROTO_CONF, decode_gtp_proto_conf},
/* 0x85 */ {GTP_EXT_GSN_ADDR, decode_gtp_gsn_addr},
/* 0x86 */ {GTP_EXT_MSISDN, decode_gtp_msisdn},
/* 0x87 */ {GTP_EXT_QOS_UMTS, decode_gtp_qos_umts}, /* 3G */
/* 0x88 */ {GTP_EXT_AUTH_QUI, decode_gtp_auth_qui}, /* 3G */
/* 0x89 */ {GTP_EXT_TFT, decode_gtp_tft}, /* 3G */
/* 0x8a */ {GTP_EXT_TARGET_ID, decode_gtp_target_id}, /* 3G */
/* 0x8b */ {GTP_EXT_UTRAN_CONT, decode_gtp_utran_cont}, /* 3G */
/* 0x8c */ {GTP_EXT_RAB_SETUP, decode_gtp_rab_setup}, /* 3G */
/* 0x8d */ {GTP_EXT_HDR_LIST, decode_gtp_hdr_list}, /* 3G */
/* 0x8e */ {GTP_EXT_TRIGGER_ID, decode_gtp_trigger_id}, /* 3G */
/* 0x8f */ {GTP_EXT_OMC_ID, decode_gtp_omc_id}, /* 3G */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* TS 29 060 V6.11.0 */
Cosmetic changes svn path=/trunk/; revision=42066
2012-04-14 12:17:06 +00:00
/* 0x90 */ {GTP_EXT_RAN_TR_CONT, decode_gtp_ran_tr_cont}, /* 7.7.43 */
/* 0x91 */ {GTP_EXT_PDP_CONT_PRIO, decode_gtp_pdp_cont_prio}, /* 7.7.45 */
/* 0x92 */ {GTP_EXT_ADD_RAB_SETUP_INF, decode_gtp_add_rab_setup_inf}, /* 7.7.45A */
/* 0x93 */ {GTP_EXT_SSGN_NO, decode_gtp_ssgn_no}, /* 7.7.47 */
/* 0x94 */ {GTP_EXT_COMMON_FLGS, decode_gtp_common_flgs}, /* 7.7.48 */
/* 0x95 */ {GTP_EXT_APN_RES, decode_gtp_apn_res}, /* 3G */
/* 0x96 */ {GTP_EXT_RA_PRIO_LCS, decode_gtp_ra_prio_lcs}, /* 7.7.25B */
/* 0x97 */ {GTP_EXT_RAT_TYPE, decode_gtp_rat_type}, /* 3G */
/* 0x98 */ {GTP_EXT_USR_LOC_INF, decode_gtp_usr_loc_inf}, /* 7.7.51 */
/* 0x99 */ {GTP_EXT_MS_TIME_ZONE, decode_gtp_ms_time_zone}, /* 7.7.52 */
/* 0x9a */ {GTP_EXT_IMEISV, decode_gtp_imeisv}, /* 3G 7.7.53 */
/* 0x9b */ {GTP_EXT_CAMEL_CHG_INF_CON, decode_gtp_camel_chg_inf_con}, /* 7.7.54 */
/* 0x9c */ {GTP_EXT_MBMS_UE_CTX, decode_gtp_mbms_ue_ctx}, /* 7.7.55 */
/* 0x9d */ {GTP_EXT_TMGI, decode_gtp_tmgi}, /* 7.7.56 */
/* 0x9e */ {GTP_EXT_RIM_RA, decode_gtp_rim_ra}, /* 7.7.57 */
/* 0x9f */ {GTP_EXT_MBMS_PROT_CONF_OPT, decode_gtp_mbms_prot_conf_opt}, /* 7.7.58 */
/* 0xa0 */ {GTP_EXT_MBMS_SA, decode_gtp_mbms_sa}, /* 7.7.60 */
/* 0xa1 */ {GTP_EXT_SRC_RNC_PDP_CTX_INF, decode_gtp_src_rnc_pdp_ctx_inf}, /* 7.7.61 */
/* 0xa2 */ {GTP_EXT_ADD_TRS_INF, decode_gtp_add_trs_inf}, /* 7.7.62 */
/* 0xa3 */ {GTP_EXT_HOP_COUNT, decode_gtp_hop_count}, /* 7.7.63 */
/* 0xa4 */ {GTP_EXT_SEL_PLMN_ID, decode_gtp_sel_plmn_id}, /* 7.7.64 */
/* 0xa5 */ {GTP_EXT_MBMS_SES_ID, decode_gtp_mbms_ses_id}, /* 7.7.65 */
/* 0xa6 */ {GTP_EXT_MBMS_2G_3G_IND, decode_gtp_mbms_2g_3g_ind}, /* 7.7.66 */
/* 0xa7 */ {GTP_EXT_ENH_NSAPI, decode_gtp_enh_nsapi}, /* 7.7.67 */
/* 0xa8 */ {GTP_EXT_MBMS_SES_DUR, decode_gtp_mbms_ses_dur}, /* 7.7.59 */
/* 0xa9 */ {GTP_EXT_ADD_MBMS_TRS_INF, decode_gtp_add_mbms_trs_inf}, /* 7.7.68 */
/* 0xaa */ {GTP_EXT_MBMS_SES_ID_REP_NO, decode_gtp_mbms_ses_id_rep_no}, /* 7.7.69 */
/* 0xab */ {GTP_EXT_MBMS_TIME_TO_DATA_TR, decode_gtp_mbms_time_to_data_tr}, /* 7.7.70 */
/* 0xac */ {GTP_EXT_PS_HO_REQ_CTX, decode_gtp_ps_ho_req_ctx}, /* 7.7.71 */
/* 0xad */ {GTP_EXT_BSS_CONT, decode_gtp_bss_cont}, /* 7.7.72 */
/* 0xae */ {GTP_EXT_CELL_ID, decode_gtp_cell_id}, /* 7.7.73 */
/* 0xaf */ {GTP_EXT_PDU_NO, decode_gtp_pdu_no}, /* 7.7.74 */
/* 0xb0 */ {GTP_EXT_BSSGP_CAUSE, decode_gtp_bssgp_cause}, /* 7.7.75 */
/* 0xb1 */ {GTP_EXT_REQ_MBMS_BEARER_CAP, decode_gtp_mbms_bearer_cap}, /* 7.7.76 */
/* 0xb2 */ {GTP_EXT_RIM_ROUTING_ADDR_DISC, decode_gtp_rim_ra_disc}, /* 7.7.77 */
/* 0xb3 */ {GTP_EXT_LIST_OF_SETUP_PFCS, decode_gtp_lst_set_up_pfc}, /* 7.7.78 */
/* 0xb4 */ {GTP_EXT_PS_HANDOVER_XIP_PAR, decode_gtp_ps_handover_xid}, /* 7.7.79 */
/* 0xb5 */ {GTP_EXT_MS_INF_CHG_REP_ACT, decode_gtp_ms_inf_chg_rep_act}, /* 7.7.80 */
/* 0xb6 */ {GTP_EXT_DIRECT_TUNNEL_FLGS, decode_gtp_direct_tnl_flg}, /* 7.7.81 */
/* 0xb7 */ {GTP_EXT_CORRELATION_ID, decode_gtp_corrl_id}, /* 7.7.82 */
/* 0xb8 */ {GTP_EXT_BEARER_CONTROL_MODE, decode_gtp_bearer_cntrl_mod}, /* 7.7.83 */
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
/* 0xb9 */ {GTP_EXT_MBMS_FLOW_ID, decode_gtp_mbms_flow_id}, /* 7.7.84 */
/* 0xba */ {GTP_EXT_MBMS_IP_MCAST_DIST, decode_gtp_mbms_ip_mcast_dist}, /* 7.7.85 */
/* 0xba */ {GTP_EXT_MBMS_DIST_ACK, decode_gtp_mbms_dist_ack}, /* 7.7.86 */
/* 0xbc */ {GTP_EXT_RELIABLE_IRAT_HO_INF, decode_gtp_reliable_irat_ho_inf}, /* 7.7.87 */
/* 0xbd */ {GTP_EXT_RFSP_INDEX, decode_gtp_rfsp_index}, /* 7.7.87 */
Cosmetic changes svn path=/trunk/; revision=42066
2012-04-14 12:17:06 +00:00
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
/* 0xbe */ {GTP_EXT_FQDN, decode_gtp_fqdn}, /* 7.7.90 */
Cosmetic changes svn path=/trunk/; revision=42066
2012-04-14 12:17:06 +00:00
/* 0xbf */ {GTP_EXT_EVO_ALLO_RETE_P1, decode_gtp_evolved_allc_rtn_p1}, /* 7.7.91 */
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
/* 0xc0 */ {GTP_EXT_EVO_ALLO_RETE_P2, decode_gtp_evolved_allc_rtn_p2}, /* 7.7.92 */
/* 0xc1 */ {GTP_EXT_EXTENDED_COMMON_FLGS, decode_gtp_extended_common_flgs}, /* 7.7.93 */
/* 0xc2 */ {GTP_EXT_UCI, decode_gtp_uci}, /* 7.7.94 */
/* 0xc3 */ {GTP_EXT_CSG_INF_REP_ACT, decode_gtp_csg_inf_rep_act}, /* 7.7.95 */
/* 0xc4 */ {GTP_EXT_CSG_ID, decode_gtp_csg_id}, /* 7.7.96 */
/* 0xc5 */ {GTP_EXT_CMI, decode_gtp_cmi}, /* 7.7.97 */
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
/* 0xc6 */ {GTP_EXT_AMBR, decode_gtp_apn_ambr}, /* 7.7.98 */
/* 0xc7 */ {GTP_EXT_UE_NETWORK_CAP, decode_gtp_ue_network_cap}, /* 7.7.99 */
/* 0xc8 */ {GTP_EXT_UE_AMBR, decode_gtp_ue_ambr}, /* 7.7.100 */
/* 0xc9 */ {GTP_EXT_APN_AMBR_WITH_NSAPI, decode_gtp_apn_ambr_with_nsapi}, /* 7.7.101 */
/* 0xCA */ {GTP_EXT_GGSN_BACK_OFF_TIME, decode_gtp_ggsn_back_off_time}, /* 7.7.102 */
/* 0xCB */ {GTP_EXT_SIG_PRI_IND, decode_gtp_sig_pri_ind}, /* 7.7.103 */
/* 0xCC */ {GTP_EXT_SIG_PRI_IND_W_NSAPI, decode_gtp_sig_pri_ind_w_nsapi}, /* 7.7.104 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/* 0xCD */ {GTP_EXT_HIGHER_BR_16MB_FLG, decode_gtp_higher_br_16mb_flg}, /* 7.7.105 */
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
/* 0xCE */ {GTP_EXT_MAX_MBR_APN_AMBR, decode_gtp_max_mbr_apn_ambr}, /* 7.7.106 */
/* 0xCF */ {GTP_EXT_ADD_MM_CTX_SRVCC, decode_gtp_add_mm_ctx_srvcc}, /* 7.7.107 */
/* 0xD0 */ {GTP_EXT_ADD_FLGS_SRVCC, decode_gtp_add_flgs_srvcc}, /* 7.7.108 */
/* 0xD1 */ {GTP_EXT_STN_SR, decode_gtp_stn_sr}, /* 7.7.109 */
/* 0xD2 */ {GTP_EXT_C_MSISDN, decode_gtp_c_msisdn}, /* 7.7.110 */
/* 0xD3 */ {GTP_EXT_EXT_RANAP_CAUSE, decode_gtp_ext_ranap_cause}, /* 7.7.111 */
Cosmetic changes svn path=/trunk/; revision=42066
2012-04-14 12:17:06 +00:00
/* 0xf9 */ {GTP_EXT_REL_PACK, decode_gtp_rel_pack}, /* charging */
/* 0xfa */ {GTP_EXT_CAN_PACK, decode_gtp_can_pack}, /* charging */
/* 0xfb */ {GTP_EXT_CHRG_ADDR, decode_gtp_chrg_addr},
/* 0xfc */ {GTP_EXT_DATA_REQ, decode_gtp_data_req}, /* charging */
/* 0xfd */ {GTP_EXT_DATA_RESP, decode_gtp_data_resp}, /* charging */
/* 0xfe */ {GTP_EXT_NODE_ADDR, decode_gtp_node_addr},
/* 0xff */ {GTP_EXT_PRIV_EXT, decode_gtp_priv_ext},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, decode_gtp_unknown}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
};
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
#define NUM_GTP_IES 255
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
static gint ett_gtp_ies[NUM_GTP_IES];
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
/*struct _gtp_hdr {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 flags;
guint8 message;
guint16 length;
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
};*/
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static guint8 gtp_version = 0;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Use [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be displayed as blanks. Since imsi_to_str() and ip_to_str() do the same thing, just have imsi_to_str() call ip_to_str() rather than having two different implementations of the same thing. Use a BCD2CHAR macro instead of doing a table lookup. svn path=/trunk/; revision=36740
2011-04-20 20:12:40 +00:00
#define BCD2CHAR(d) ((d) | 0x30)
Use {'0', ...} type initializer for fixed length character arrays. svn path=/trunk/; revision=35741
2011-02-01 14:30:24 +00:00
Make the _to_str() functions in here take a pointer to a TVB and an offset rather than (generally) a pointer into the TVB. Replace some tabs with spaces (for consistency). Remove a couple unnecessary includes. svn path=/trunk/; revision=36123
2011-03-03 02:18:57 +00:00
static gchar *
id_to_str(tvbuff_t *tvb, gint offset)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
static gchar str[17] = " ";
guint8 bits8to5, bits4to1;
Use [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be displayed as blanks. Since imsi_to_str() and ip_to_str() do the same thing, just have imsi_to_str() call ip_to_str() rather than having two different implementations of the same thing. Use a BCD2CHAR macro instead of doing a table lookup. svn path=/trunk/; revision=36740
2011-04-20 20:12:40 +00:00
int i, j;
Make the _to_str() functions in here take a pointer to a TVB and an offset rather than (generally) a pointer into the TVB. Replace some tabs with spaces (for consistency). Remove a couple unnecessary includes. svn path=/trunk/; revision=36123
2011-03-03 02:18:57 +00:00
guint8 ad;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Use [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be displayed as blanks. Since imsi_to_str() and ip_to_str() do the same thing, just have imsi_to_str() call ip_to_str() rather than having two different implementations of the same thing. Use a BCD2CHAR macro instead of doing a table lookup. svn path=/trunk/; revision=36740
2011-04-20 20:12:40 +00:00
for (i = j = 0; i < 8; i++) {
Make the _to_str() functions in here take a pointer to a TVB and an offset rather than (generally) a pointer into the TVB. Replace some tabs with spaces (for consistency). Remove a couple unnecessary includes. svn path=/trunk/; revision=36123
2011-03-03 02:18:57 +00:00
ad = tvb_get_guint8(tvb, offset + i);
Use [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be displayed as blanks. Since imsi_to_str() and ip_to_str() do the same thing, just have imsi_to_str() call ip_to_str() rather than having two different implementations of the same thing. Use a BCD2CHAR macro instead of doing a table lookup. svn path=/trunk/; revision=36740
2011-04-20 20:12:40 +00:00
bits8to5 = hi_nibble(ad);
bits4to1 = lo_nibble(ad);
if (bits4to1 <= 9)
str[j++] = BCD2CHAR(bits4to1);
else
As suggested by Jakub, always update the digit value when the nibble is outside [0;9] range svn path=/trunk/; revision=41984
2012-04-08 16:03:21 +00:00
str[j++] = ' ';
Use [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be displayed as blanks. Since imsi_to_str() and ip_to_str() do the same thing, just have imsi_to_str() call ip_to_str() rather than having two different implementations of the same thing. Use a BCD2CHAR macro instead of doing a table lookup. svn path=/trunk/; revision=36740
2011-04-20 20:12:40 +00:00
if (bits8to5 <= 9)
str[j++] = BCD2CHAR(bits8to5);
else
As suggested by Jakub, always update the digit value when the nibble is outside [0;9] range svn path=/trunk/; revision=41984
2012-04-08 16:03:21 +00:00
str[j++] = ' ';
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
str[j] = '\0';
return str;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
/* Next definitions and function check_field_presence checks if given field
* in GTP packet is compliant with ETSI
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Updates from Michal Melerowicz: 1. simplified and shorter names 2. fixed problem with filtering (consequence of 1st point) 3. added more charging tickets svn path=/trunk/; revision=3946
2001-09-19 06:08:36 +00:00
typedef struct _header {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 code;
guint8 presence;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
} ext_header;
typedef struct _message {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 code;
ext_header fields[32];
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
} _gtp_mess_items;
/* ---------------------
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
* GPRS messages
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
* ---------------------*/
More static-ization. svn path=/trunk/; revision=5131
2002-04-08 20:30:56 +00:00
static _gtp_mess_items gprs_mess_items[] = {
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_ECHO_REQ, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_ECHO_RESP, {
{GTP_EXT_RECOVER, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_VER_NOT_SUPP, {
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_NODE_ALIVE_REQ, {
{GTP_EXT_NODE_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_NODE_ALIVE_RESP, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_REDIR_REQ, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_NODE_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_REDIR_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_CREATE_PDP_REQ, {
{GTP_EXT_QOS_GPRS, GTP_MANDATORY},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_SEL_MODE, GTP_MANDATORY},
{GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
{GTP_EXT_FLOW_SIG, GTP_MANDATORY},
{GTP_EXT_MSISDN, GTP_MANDATORY},
{GTP_EXT_USER_ADDR, GTP_MANDATORY},
{GTP_EXT_APN, GTP_MANDATORY},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_CREATE_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
{GTP_EXT_REORDER, GTP_CONDITIONAL},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
{GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
{GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_UPDATE_PDP_REQ, {
{GTP_EXT_QOS_GPRS, GTP_MANDATORY},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
{GTP_EXT_FLOW_SIG, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0},
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_UPDATE_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
{GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DELETE_PDP_REQ, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DELETE_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0},
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Update value strings. svn path=/trunk/; revision=40035
2011-11-29 17:31:52 +00:00
GTP_MSG_INIT_PDP_CONTEXT_ACT_REQ, {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_QOS_GPRS, GTP_MANDATORY},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_SEL_MODE, GTP_MANDATORY},
{GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
{GTP_EXT_FLOW_SIG, GTP_MANDATORY},
{GTP_EXT_USER_ADDR, GTP_MANDATORY},
{GTP_EXT_APN, GTP_MANDATORY},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Update value strings. svn path=/trunk/; revision=40035
2011-11-29 17:31:52 +00:00
GTP_MSG_INIT_PDP_CONTEXT_ACT_RESP, {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
{GTP_EXT_REORDER, GTP_CONDITIONAL},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
{GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
{GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DELETE_AA_PDP_REQ, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DELETE_AA_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_ERR_IND, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_REQ, {
{GTP_EXT_USER_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_REJ_REQ, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_USER_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_REJ_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SEND_ROUT_INFO_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SEND_ROUT_INFO_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
{GTP_EXT_MS_REASON, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FAIL_REP_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FAIL_REP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_MS_PRESENT_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_MS_PRESENT_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_IDENT_REQ, {
{GTP_EXT_RAI, GTP_MANDATORY},
{GTP_EXT_PTMSI, GTP_MANDATORY},
{GTP_EXT_PTMSI_SIG, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_IDENT_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_IMSI, GTP_CONDITIONAL},
{GTP_EXT_AUTH_TRI, GTP_OPTIONAL},
{GTP_EXT_AUTH_QUI, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SGSN_CNTXT_REQ, {
{GTP_EXT_IMSI, GTP_CONDITIONAL},
{GTP_EXT_RAI, GTP_MANDATORY},
{GTP_EXT_TLLI, GTP_MANDATORY},
{GTP_EXT_PTMSI_SIG, GTP_OPTIONAL},
{GTP_EXT_MS_VALID, GTP_OPTIONAL},
{GTP_EXT_FLOW_SIG, GTP_MANDATORY},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SGSN_CNTXT_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_IMSI, GTP_CONDITIONAL},
{GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
{GTP_EXT_MM_CNTXT, GTP_CONDITIONAL},
{GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SGSN_CNTXT_ACK, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_FLOW_II, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DATA_TRANSF_REQ, {
{GTP_EXT_TR_COMM, GTP_MANDATORY},
{GTP_EXT_DATA_REQ, GTP_CONDITIONAL},
{GTP_EXT_REL_PACK, GTP_CONDITIONAL},
{GTP_EXT_CAN_PACK, GTP_CONDITIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DATA_TRANSF_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_DATA_RESP, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
0, {
{0, 0}
}
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
};
/* -----------------------------
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
* UMTS messages
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
* -----------------------------*/
More static-ization. svn path=/trunk/; revision=5131
2002-04-08 20:30:56 +00:00
static _gtp_mess_items umts_mess_items[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* 7.2 Path Management Messages */
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_ECHO_REQ, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_ECHO_RESP, {
{GTP_EXT_RECOVER, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_VER_NOT_SUPP, {
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SUPP_EXT_HDR, {
{GTP_EXT_HDR_LIST, GTP_MANDATORY},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* ??? */
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_NODE_ALIVE_REQ, {
{GTP_EXT_NODE_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_NODE_ALIVE_RESP, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_REDIR_REQ, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_NODE_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_REDIR_REQ, {
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* 7.3 Tunnel Management Messages */
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_CREATE_PDP_REQ, {
{GTP_EXT_IMSI, GTP_CONDITIONAL},
/* RAI is in TS 29.060 V6.11.0 */
{GTP_EXT_RAI, GTP_OPTIONAL}, /* Routeing Area Identity (RAI) Optional 7.7.3 */
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_SEL_MODE, GTP_CONDITIONAL},
{GTP_EXT_TEID, GTP_MANDATORY},
{GTP_EXT_TEID_CP, GTP_CONDITIONAL},
{GTP_EXT_NSAPI, GTP_MANDATORY},
{GTP_EXT_NSAPI, GTP_CONDITIONAL},
{GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},
{GTP_EXT_TRACE_REF, GTP_OPTIONAL},
{GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},
{GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
{GTP_EXT_APN, GTP_CONDITIONAL},
{GTP_EXT_PROTO_CONF, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_MSISDN, GTP_CONDITIONAL},
{GTP_EXT_QOS_UMTS, GTP_MANDATORY},
{GTP_EXT_TFT, GTP_CONDITIONAL},
{GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},
{GTP_EXT_OMC_ID, GTP_OPTIONAL},
/* TS 29.060 V6.11.0 */
{GTP_EXT_APN_RES, GTP_OPTIONAL},
{GTP_EXT_RAT_TYPE, GTP_OPTIONAL},
{GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},
{GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},
{GTP_EXT_IMEISV, GTP_OPTIONAL},
{GTP_EXT_CAMEL_CHG_INF_CON, GTP_OPTIONAL},
{GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_CREATE_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_REORDER, GTP_CONDITIONAL},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_TEID, GTP_CONDITIONAL},
{GTP_EXT_TEID_CP, GTP_CONDITIONAL},
{GTP_EXT_NSAPI, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
{GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_QOS_UMTS, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
/* TS 29.060 V6.11.0 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL}, /* Alternative Charging Gateway Address Optional 7.7.44 */
{GTP_EXT_COMMON_FLGS, GTP_OPTIONAL}, /* Common Flags Optional 7.7.48 */
{GTP_EXT_APN_RES, GTP_OPTIONAL}, /* APN Restriction Optional 7.7.49 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
{ /* checked, SGSN -> GGSN */
GTP_MSG_UPDATE_PDP_REQ, {
{GTP_EXT_IMSI, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_RAI, GTP_OPTIONAL}, /* Routeing Area Identity (RAI) Optional 7.7.3 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_TEID, GTP_MANDATORY},
{GTP_EXT_TEID_CP, GTP_CONDITIONAL},
{GTP_EXT_NSAPI, GTP_MANDATORY},
{GTP_EXT_TRACE_REF, GTP_OPTIONAL},
{GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
{GTP_EXT_GSN_ADDR, GTP_MANDATORY}, /* SGSN Address for Control Plane Mandatory GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_MANDATORY}, /* SGSN Address for User Traffic Mandatory GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for User Traffic Conditional GSN Address 7.7.32 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_QOS_UMTS, GTP_MANDATORY},
{GTP_EXT_TFT, GTP_OPTIONAL},
{GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},
{GTP_EXT_OMC_ID, GTP_OPTIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_COMMON_FLGS, GTP_OPTIONAL}, /* Common Flags Optional 7.7.48 */
{GTP_EXT_RAT_TYPE, GTP_OPTIONAL}, /* RAT Type Optional 7.7.50 */
{GTP_EXT_USR_LOC_INF, GTP_OPTIONAL}, /* User Location Information Optional 7.7.51 */
{GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL}, /* MS Time Zone Optional 7.7.52 */
{GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL}, /* Additonal Trace Info Optional 7.7.62 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_DIRECT_TUNNEL_FLGS, GTP_OPTIONAL}, /* Direct Tunnel Flags 7.7.81 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
{ /* checked, GGSN -> SGSN */
GTP_MSG_UPDATE_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_RECOVER, GTP_OPTIONAL},
{GTP_EXT_TEID, GTP_CONDITIONAL},
{GTP_EXT_TEID_CP, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for User Traffic Conditional GSN Address 7.7.32 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_QOS_UMTS, GTP_CONDITIONAL},
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL}, /* Alternative Charging Gateway Address Optional 7.7.44 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_COMMON_FLGS, GTP_OPTIONAL}, /* Common Flags Optional 7.7.48 */
{GTP_EXT_APN_RES, GTP_OPTIONAL}, /* APN Restriction Optional 7.7.49 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DELETE_PDP_REQ, {
{GTP_EXT_TEAR_IND, GTP_CONDITIONAL},
{GTP_EXT_NSAPI, GTP_MANDATORY},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_DELETE_PDP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_ERR_IND, {
{GTP_EXT_TEID, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY}, /* GSN Address Mandatory 7.7.32 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_TEID_CP, GTP_MANDATORY},
{GTP_EXT_USER_ADDR, GTP_MANDATORY},
{GTP_EXT_APN, GTP_MANDATORY},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_REJ_REQ, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_TEID_CP, GTP_MANDATORY},
{GTP_EXT_USER_ADDR, GTP_MANDATORY},
{GTP_EXT_APN, GTP_MANDATORY},
{GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_PDU_NOTIFY_REJ_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* 7.4 Location Management Messages */
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SEND_ROUT_INFO_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SEND_ROUT_INFO_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
{GTPv1_EXT_MS_REASON, GTP_OPTIONAL},
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FAIL_REP_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FAIL_REP_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_MS_PRESENT_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_MS_PRESENT_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* 7.5 Mobility Management Messages */
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_IDENT_REQ, {
{GTP_EXT_RAI, GTP_MANDATORY},
{GTP_EXT_PTMSI, GTP_MANDATORY},
{GTP_EXT_PTMSI_SIG, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* SGSN Address for Control Plane Optional 7.7.32 */
{GTP_EXT_HOP_COUNT, GTP_OPTIONAL}, /* Hop Counter Optional 7.7.63 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_IDENT_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_IMSI, GTP_CONDITIONAL},
{GTP_EXT_AUTH_TRI, GTP_CONDITIONAL},
{GTP_EXT_AUTH_QUI, GTP_CONDITIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SGSN_CNTXT_REQ, {
{GTP_EXT_IMSI, GTP_CONDITIONAL},
{GTP_EXT_RAI, GTP_MANDATORY},
{GTP_EXT_TLLI, GTP_CONDITIONAL},
{GTP_EXT_PTMSI, GTP_CONDITIONAL},
{GTP_EXT_PTMSI_SIG, GTP_CONDITIONAL},
{GTP_EXT_MS_VALID, GTP_OPTIONAL},
{GTP_EXT_TEID_CP, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for Control Plane Optional 7.7.32 */
{GTP_EXT_SSGN_NO, GTP_OPTIONAL}, /* SGSN Number Optional 7.7.47 */
{GTP_EXT_HOP_COUNT, GTP_OPTIONAL}, /* Hop Counter Optional 7.7.63 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SGSN_CNTXT_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_IMSI, GTP_CONDITIONAL},
{GTP_EXT_TEID_CP, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_RAB_CNTXT, GTP_CONDITIONAL}, /* RAB Context Conditional 7.7.19 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_RP_SMS, GTP_OPTIONAL},
{GTP_EXT_RP, GTP_OPTIONAL},
{GTP_EXT_PKT_FLOW_ID, GTP_OPTIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CHRG_CHAR, GTP_OPTIONAL}, /* CharingCharacteristics Optional 7.7.23 */
{GTP_EXT_RA_PRIO_LCS, GTP_OPTIONAL}, /* Radio Priority LCS Optional 7.7.25B */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MM_CNTXT, GTP_CONDITIONAL},
{GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_PDP_CONT_PRIO, GTP_OPTIONAL}, /* PDP Context Prioritization Optional 7.7.45 */
{GTP_EXT_MBMS_UE_CTX, GTP_OPTIONAL}, /* MBMS UE Context Optional 7.7.55 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_SGSN_CNTXT_ACK, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_TEID_II, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FORW_RELOC_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_TEID_CP, GTP_MANDATORY},
{GTP_EXT_RANAP_CAUSE, GTP_MANDATORY},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CHRG_CHAR, GTP_OPTIONAL}, /* CharingCharacteristics Optional 7.7.23 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MM_CNTXT, GTP_MANDATORY},
{GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_MANDATORY},
{GTP_EXT_TARGET_ID, GTP_MANDATORY},
{GTP_EXT_UTRAN_CONT, GTP_MANDATORY},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_PDP_CONT_PRIO, GTP_OPTIONAL}, /* PDP Context Prioritization Optional 7.7.45 */
{GTP_EXT_MBMS_UE_CTX, GTP_OPTIONAL}, /* MBMS UE Context Optional 7.7.55 */
{GTP_EXT_SEL_PLMN_ID, GTP_OPTIONAL}, /* Selected PLMN ID Optional 7.7.64 */
{GTP_EXT_PS_HO_REQ_CTX, GTP_OPTIONAL}, /* PS Handover Request Context Optional 7.7.71 */
{GTP_EXT_BSS_CONT, GTP_OPTIONAL}, /* BSS Container Optional 7.7.72 */
{GTP_EXT_CELL_ID, GTP_OPTIONAL}, /* Cell Identification Optional 7.7.73 */
{GTP_EXT_BSSGP_CAUSE, GTP_OPTIONAL}, /* BSSGP Cause Optional 7.7.75 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{GTP_EXT_SSGN_NO, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FORW_RELOC_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_TEID_CP, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_TEID_II, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Data II Optional 7.7.15 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_RANAP_CAUSE, GTP_CONDITIONAL},
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
{GTP_EXT_UTRAN_CONT, GTP_OPTIONAL},
{GTP_EXT_RAB_SETUP, GTP_CONDITIONAL},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_ADD_RAB_SETUP_INF, GTP_CONDITIONAL}, /* Additional RAB Setup Information Conditional 7.7.45A */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FORW_RELOC_COMP, {
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_RELOC_CANCEL_REQ, {
{GTP_EXT_IMSI, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_RELOC_CANCEL_RESP, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FORW_RELOC_ACK, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FORW_SRNS_CNTXT_ACK, {
{GTP_EXT_CAUSE, GTP_MANDATORY},
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_FORW_SRNS_CNTXT, {
{GTP_EXT_RAB_CNTXT, GTP_MANDATORY},
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_SRC_RNC_PDP_CTX_INF, GTP_OPTIONAL}, /* Source RNC PDCP context info Optional 7.7.61 */
{GTP_EXT_PDU_NO, GTP_OPTIONAL}, /* PDU Numbers Optional 7.7.74 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
/* 7.5.14 RAN Information Management Messages */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MSG_RAN_INFO_RELAY, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_RAN_TR_CONT, GTP_MANDATORY}, /* RAN Transparent Container Mandatory 7.7.43 */
{GTP_EXT_RIM_RA, GTP_OPTIONAL}, /* RIM Routing Address Optional 7.7.57 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
/* 7.5A MBMS Messages
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
* 7.5A.1 UE Specific MBMS Messages
*/
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_NOTIFY_REQ, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_IMSI, GTP_MANDATORY}, /* IMSI Mandatory 7.7.2 */
{GTP_EXT_TEID_CP, GTP_MANDATORY}, /* Tunnel Endpoint Identifier Control Plane Mandatory 7.7.14 */
{GTP_EXT_NSAPI, GTP_MANDATORY}, /* NSAPI Mandatory 7.7.17 */
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_GSN_ADDR, GTP_MANDATORY}, /* GGSN Address for Control Plane Mandatory 7.7.32 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_NOTIFY_RES, {
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_NOTIFY_REJ_REQ, {
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_TEID_CP, GTP_MANDATORY}, /* Tunnel Endpoint Identifier Control Plane Mandatory 7.7.14 */
{GTP_EXT_NSAPI, GTP_MANDATORY}, /* NSAPI Mandatory 7.7.17 */
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_NOTIFY_REJ_RES, {
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_CREATE_MBMS_CNTXT_REQ, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_IMSI, GTP_CONDITIONAL}, /* IMSI Conditional 7.7.2 */
{GTP_EXT_RAI, GTP_MANDATORY}, /* Routeing Area Identity (RAI) Mandatory 7.7.3 */
{GTP_EXT_RECOVER, GTP_OPTIONAL}, /* Recovery Optional 7.7.11 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_SEL_MODE, GTP_CONDITIONAL}, /* Selection mode Conditional 7.7.12 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
{GTP_EXT_TRACE_REF, GTP_OPTIONAL}, /* Trace Reference Optional 7.7.24 */
{GTP_EXT_TRACE_TYPE, GTP_OPTIONAL}, /* Trace Type Optional 7.7.25 */
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_GSN_ADDR, GTP_MANDATORY}, /* SGSN Address for signalling Mandatory GSN Address 7.7.32 */
{GTP_EXT_MSISDN, GTP_CONDITIONAL}, /* MSISDN Conditional 7.7.33 */
{GTP_EXT_TRIGGER_ID, GTP_OPTIONAL}, /* Trigger Id Optional 7.7.41 */
{GTP_EXT_OMC_ID, GTP_OPTIONAL}, /* OMC Identity Optional 7.7.42 */
{GTP_EXT_RAT_TYPE, GTP_OPTIONAL}, /* RAT Type Optional 7.7.50 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_USR_LOC_INF, GTP_OPTIONAL}, /* User Location Information Optional 7.7.51 */
{GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL}, /* MS Time Zone Optional 7.7.52 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_IMEISV, GTP_OPTIONAL}, /* IMEI(SV) Optional 7.7.53 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
{GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL}, /* Additonal Trace Info Optional 7.7.62 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_ENH_NSAPI, GTP_MANDATORY}, /* Enhanced NSAPI Mandatory 7.7.67 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_ADD_MBMS_TRS_INF, GTP_OPTIONAL}, /* Additional MBMS Trace Info Optional 7.7.68 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_CREATE_MBMS_CNTXT_RES, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_RECOVER, GTP_OPTIONAL}, /* Recovery Optional 7.7.11 */
{GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL}, /* Charging ID Conditional 7.7.26 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* Alternative GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL}, /* Charging Gateway Address Optional 7.7.44 */
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL}, /* Alternative Charging Gateway Address Optional 7.7.44 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_UPD_MBMS_CNTXT_REQ, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_IMSI, GTP_CONDITIONAL}, /* IMSI Conditional 7.7.2 */
{GTP_EXT_RAI, GTP_MANDATORY}, /* Routeing Area Identity (RAI) Mandatory 7.7.3 */
{GTP_EXT_RECOVER, GTP_OPTIONAL}, /* Recovery Optional 7.7.11 */
{GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
{GTP_EXT_TRACE_REF, GTP_OPTIONAL}, /* Trace Reference Optional 7.7.24 */
{GTP_EXT_TRACE_TYPE, GTP_OPTIONAL}, /* Trace Type Optional 7.7.25 */
{GTP_EXT_GSN_ADDR, GTP_MANDATORY}, /* SGSN Address for Control Plane Mandatory GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_TRIGGER_ID, GTP_OPTIONAL}, /* Trigger Id Optional 7.7.41 */
{GTP_EXT_OMC_ID, GTP_OPTIONAL}, /* OMC Identity Optional 7.7.42 */
{GTP_EXT_RAT_TYPE, GTP_OPTIONAL}, /* RAT Type Optional 7.7.50 */
{GTP_EXT_USR_LOC_INF, GTP_OPTIONAL}, /* User Location Information Optional 7.7.51 */
{GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL}, /* MS Time Zone Optional 7.7.52 */
{GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL}, /* Additional Trace Info Optional 7.7.62 */
{GTP_EXT_ENH_NSAPI, GTP_MANDATORY}, /* Enhanced NSAPI Mandatory 7.7.67 */
{GTP_EXT_ADD_MBMS_TRS_INF, GTP_OPTIONAL}, /* Additional MBMS Trace Info Optional 7.7.68 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_UPD_MBMS_CNTXT_RES, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_RECOVER, GTP_OPTIONAL}, /* Recovery Optional 7.7.11 */
{GTP_EXT_TEID_CP, GTP_MANDATORY}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
{GTP_EXT_CHRG_ID, GTP_CONDITIONAL}, /* Charging ID Conditional 7.7.26 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* Alternative GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL}, /* Charging Gateway Address Optional 7.7.44 */
{GTP_EXT_CHRG_ADDR, GTP_OPTIONAL}, /* Alternative Charging Gateway Address Optional 7.7.44 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_DEL_MBMS_CNTXT_REQ, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_IMSI, GTP_CONDITIONAL}, /* IMSI Conditional 7.7.2 */
{GTP_EXT_TEID_CP, GTP_MANDATORY}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_USER_ADDR, GTP_CONDITIONAL}, /* End User Address Conditional 7.7.27 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_APN, GTP_CONDITIONAL}, /* Access Point Name Conditional 7.7.30 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_ENH_NSAPI, GTP_MANDATORY}, /* Enhanced NSAPI Conditional 7.7.67 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_DEL_MBMS_CNTXT_RES, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_REG_REQ, {
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_REG_RES, {
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_TMGI, GTP_MANDATORY}, /* Temporary Mobile Group Identity (TMGI) Conditional 7.7.56 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_DE_REG_REQ, {
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_DE_REG_RES, {
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_SES_START_REQ, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_RECOVER, GTP_OPTIONAL}, /* Recovery Optional 7.7.11 */
{GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_QOS_UMTS, GTP_MANDATORY}, /* Quality of Service Profile Mandatory 7.7.34 */
{GTP_EXT_COMMON_FLGS, GTP_OPTIONAL}, /* Common Flags Mandatory 7.7.48 */
{GTP_EXT_TMGI, GTP_MANDATORY}, /* Temporary Mobile Group Identity (TMGI) Mandatory 7.7.56 */
{GTP_EXT_MBMS_SES_DUR, GTP_MANDATORY}, /* MBMS Session Duration Mandatory 7.7.59 */
{GTP_EXT_MBMS_SA, GTP_MANDATORY}, /* MBMS Service Area Mandatory 7.7.60 */
{GTP_EXT_MBMS_SES_ID, GTP_OPTIONAL}, /* MBMS Session Identifier Optional 7.7.65 */
{GTP_EXT_MBMS_2G_3G_IND, GTP_MANDATORY}, /* MBMS 2G/3G Indicator Mandatory 7.7.66 */
{GTP_EXT_MBMS_SES_ID_REP_NO, GTP_OPTIONAL}, /* MBMS Session Identity Repetition Number Optional 7.7.69 */
{GTP_EXT_MBMS_TIME_TO_DATA_TR, GTP_MANDATORY}, /* MBMS Time To Data Transfer Mandatory 7.7.70 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_SES_START_RES, {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_RECOVER, GTP_OPTIONAL}, /* Recovery Optional 7.7.11 */
{GTP_EXT_TEID, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Data I Conditional 7.7.13 */
{GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
{GTP_EXT_GSN_ADDR, GTP_CONDITIONAL}, /* SGSN Address for user traffic Conditional GSN Address 7.7.32 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_SES_STOP_REQ, {
{GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
{GTP_EXT_APN, GTP_MANDATORY}, /* Access Point Name Mandatory 7.7.30 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
GTP_MBMS_SES_STOP_RES, {
{GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
{GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
{0, 0}
}
},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
0, {
{0, 0}
}
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
};
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* Data structure attached to a conversation,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
to keep track of request/response-pairs
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
*/
typedef struct gtp_conv_info_t {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
struct gtp_conv_info_t *next;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
GHashTable *unmatched;
GHashTable *matched;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
} gtp_conv_info_t;
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
static gtp_conv_info_t *gtp_info_items = NULL;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static guint
gtp_sn_hash(gconstpointer k)
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
{
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
const gtp_msg_hash_t *key = (const gtp_msg_hash_t *)k;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return key->seq_nr;
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static gint
gtp_sn_equal_matched(gconstpointer k1, gconstpointer k2)
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
{
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
const gtp_msg_hash_t *key1 = (const gtp_msg_hash_t *)k1;
const gtp_msg_hash_t *key2 = (const gtp_msg_hash_t *)k2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ( key1->req_frame && key2->req_frame && (key1->req_frame != key2->req_frame) ) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
return 0;
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ( key1->rep_frame && key2->rep_frame && (key1->rep_frame != key2->rep_frame) ) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
return 0;
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return key1->seq_nr == key2->seq_nr;
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static gint
gtp_sn_equal_unmatched(gconstpointer k1, gconstpointer k2)
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
{
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
const gtp_msg_hash_t *key1 = (const gtp_msg_hash_t *)k1;
const gtp_msg_hash_t *key2 = (const gtp_msg_hash_t *)k2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return key1->seq_nr == key2->seq_nr;
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static gtp_msg_hash_t *
Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used. svn path=/trunk/; revision=52930
2013-10-28 20:00:04 +00:00
gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint seq_nr, guint msgtype, gtp_conv_info_t *gtp_info)
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
gtp_msg_hash_t gcr, *gcrp = NULL;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gcr.seq_nr=seq_nr;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (msgtype) {
case GTP_MSG_ECHO_REQ:
case GTP_MSG_CREATE_PDP_REQ:
case GTP_MSG_UPDATE_PDP_REQ:
case GTP_MSG_DELETE_PDP_REQ:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
gcr.is_request=TRUE;
gcr.req_frame=pinfo->fd->num;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gcr.rep_frame=0;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case GTP_MSG_ECHO_RESP:
case GTP_MSG_CREATE_PDP_RESP:
case GTP_MSG_UPDATE_PDP_RESP:
case GTP_MSG_DELETE_PDP_RESP:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
gcr.is_request=FALSE;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gcr.req_frame=0;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
gcr.rep_frame=pinfo->fd->num;
break;
Fix some clang warnings (dead assignment/increment, assigned value is garbage or undefined) svn path=/trunk/; revision=42344
2012-04-30 09:00:05 +00:00
default:
gcr.is_request=FALSE;
gcr.req_frame=0;
gcr.rep_frame=0;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
gcrp = (gtp_msg_hash_t *)g_hash_table_lookup(gtp_info->matched, &gcr);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
if (gcrp) {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
gcrp->is_request=gcr.is_request;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
} else {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/*no match, let's try to make one*/
switch (msgtype) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
case GTP_MSG_ECHO_REQ:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
case GTP_MSG_CREATE_PDP_REQ:
case GTP_MSG_UPDATE_PDP_REQ:
case GTP_MSG_DELETE_PDP_REQ:
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gcr.seq_nr=seq_nr;
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
gcrp=(gtp_msg_hash_t *)g_hash_table_lookup(gtp_info->unmatched, &gcr);
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
if (gcrp) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
g_hash_table_remove(gtp_info->unmatched, gcrp);
}
Fix spelling: cant-->can't, wont-->won't, etc Change-Id: I4497f1b8b6eab0e576d9dd31b732965f9a6679c6 Reviewed-on: https://code.wireshark.org/review/4124 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 13:43:06 +00:00
/* if we can't reuse the old one, grab a new chunk */
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
if (!gcrp) {
Convert a few more dissectors to wmem API svn path=/trunk/; revision=52053
2013-09-15 10:29:49 +00:00
gcrp = wmem_new(wmem_file_scope(), gtp_msg_hash_t);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
gcrp->seq_nr=seq_nr;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
gcrp->req_frame = pinfo->fd->num;
gcrp->req_time = pinfo->fd->abs_ts;
gcrp->rep_frame = 0;
gcrp->msgtype = msgtype;
gcrp->is_request = TRUE;
g_hash_table_insert(gtp_info->unmatched, gcrp, gcrp);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
return NULL;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
case GTP_MSG_ECHO_RESP:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
case GTP_MSG_CREATE_PDP_RESP:
case GTP_MSG_UPDATE_PDP_RESP:
case GTP_MSG_DELETE_PDP_RESP:
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gcr.seq_nr=seq_nr;
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
gcrp=(gtp_msg_hash_t *)g_hash_table_lookup(gtp_info->unmatched, &gcr);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
if (gcrp) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
if (!gcrp->rep_frame) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
g_hash_table_remove(gtp_info->unmatched, gcrp);
gcrp->rep_frame=pinfo->fd->num;
gcrp->is_request=FALSE;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
g_hash_table_insert(gtp_info->matched, gcrp, gcrp);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
}
break;
Fix some clang warnings (dead assignment/increment, assigned value is garbage or undefined) svn path=/trunk/; revision=42344
2012-04-30 09:00:05 +00:00
default:
break;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* we have found a match */
if (gcrp) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_item *it;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
if (gcrp->is_request) {
it = proto_tree_add_uint(tree, hf_gtp_response_in, tvb, 0, 0, gcrp->rep_frame);
PROTO_ITEM_SET_GENERATED(it);
} else {
nstime_t ns;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
it = proto_tree_add_uint(tree, hf_gtp_response_to, tvb, 0, 0, gcrp->req_frame);
PROTO_ITEM_SET_GENERATED(it);
nstime_delta(&ns, &pinfo->fd->abs_ts, &gcrp->req_time);
it = proto_tree_add_time(tree, hf_gtp_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return gcrp;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
check_field_presence(guint8 message, guint8 field, int *position)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint i = 0;
_gtp_mess_items *mess_items;
switch (gtp_version) {
case 0:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
mess_items = gprs_mess_items;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
mess_items = umts_mess_items;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return -2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
while (mess_items[i].code) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
if (mess_items[i].code == message) {
while (mess_items[i].fields[*position].code) {
if (mess_items[i].fields[*position].code == field) {
(*position)++;
return 0;
} else {
if (mess_items[i].fields[*position].presence == GTP_MANDATORY) {
return mess_items[i].fields[(*position)++].code;
} else {
(*position)++;
}
}
}
return -1;
}
i++;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return -2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
/* Decoders of fields in extension headers, each function returns no of bytes from field */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter
* UMTS: 29.060 v4.0, chapter
Fill value_strings. svn path=/trunk/; revision=34875
2010-11-15 16:46:07 +00:00
* 7.7.1 Cause
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 cause;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
cause = tvb_get_guint8(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(tree, hf_gtp_cause, tvb, offset, 2, cause);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.2
* UMTS: 29.060 v4.0, chapter 7.7.2
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
decode_gtp_imsi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
fix packet-gtp.c: In function 'decode_gtp_imsi': packet-gtp.c:3210:18: error: variable 'imsi_str' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors make[5]: *** [libdissectors_la-packet-gtp.lo] Error 1 by commenting out the unused variable Change-Id: I498595f93423c599f902a1a0cc42b63cef2c4d7c Reviewed-on: https://code.wireshark.org/review/3725 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 19:04:38 +00:00
/* const gchar *imsi_str; */
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Get rid of non-ASCII characters in comments. Convert "4-space tabs" to spaces. svn path=/trunk/; revision=39735
2011-11-04 18:43:23 +00:00
/* Octets 2 - 9 IMSI */
fix packet-gtp.c: In function 'decode_gtp_imsi': packet-gtp.c:3210:18: error: variable 'imsi_str' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors make[5]: *** [libdissectors_la-packet-gtp.lo] Error 1 by commenting out the unused variable Change-Id: I498595f93423c599f902a1a0cc42b63cef2c4d7c Reviewed-on: https://code.wireshark.org/review/3725 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-19 19:04:38 +00:00
/* imsi_str = */ dissect_e212_imsi(tvb, pinfo, tree, offset+1, 8, FALSE);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 9;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.3
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.3 Routeing Area Identity (RAI)
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rai(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
proto_tree *ext_tree_rai;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_rai = proto_tree_add_subtree(tree, tvb, offset, 1, ett_gtp_ies[GTP_EXT_RAI], NULL,
val_to_str_ext_const(GTP_EXT_RAI, &gtp_val_ext, "Unknown message"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
dissect_e212_mcc_mnc(tvb, pinfo, ext_tree_rai, offset+1, TRUE);
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
proto_tree_add_item(ext_tree_rai, hf_gtp_rai_lac, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_rai, hf_gtp_rai_rac, tvb, offset + 6, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 7;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.4, page 39
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.4 Temporary Logical Link Identity (TLLI)
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_tlli(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint32 tlli;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
tlli = tvb_get_ntohl(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_tlli, tvb, offset, 5, tlli);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 5;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.5, page 39
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.5 Packet TMSI (P-TMSI)
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ptmsi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint32 ptmsi;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
ptmsi = tvb_get_ntohl(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_ptmsi, tvb, offset, 5, ptmsi);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 5;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Fix some duplicate display filter names. svn path=/trunk/; revision=40591
2012-01-19 21:01:52 +00:00
/*
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
* adjust - how many bytes before offset should be highlighted
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_qos_gprs(tvbuff_t * tvb, int offset, proto_tree * tree, const gchar * qos_str, guint8 adjust)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 spare1, delay, reliability, peak, spare2, precedence, spare3, mean;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_qos;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
spare1 = tvb_get_guint8(tvb, offset) & GTP_EXT_QOS_SPARE1_MASK;
delay = tvb_get_guint8(tvb, offset) & GTP_EXT_QOS_DELAY_MASK;
reliability = tvb_get_guint8(tvb, offset) & GTP_EXT_QOS_RELIABILITY_MASK;
peak = tvb_get_guint8(tvb, offset + 1) & GTP_EXT_QOS_PEAK_MASK;
spare2 = tvb_get_guint8(tvb, offset + 1) & GTP_EXT_QOS_SPARE2_MASK;
precedence = tvb_get_guint8(tvb, offset + 1) & GTP_EXT_QOS_PRECEDENCE_MASK;
spare3 = tvb_get_guint8(tvb, offset + 2) & GTP_EXT_QOS_SPARE3_MASK;
mean = tvb_get_guint8(tvb, offset + 2) & GTP_EXT_QOS_MEAN_MASK;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_qos = proto_tree_add_subtree_format(tree, tvb, offset - adjust, 3 + adjust, ett_gtp_qos, NULL,
"%s: delay: %u, reliability: %u, peak: %u, precedence: %u, mean: %u",
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
qos_str, (delay >> 3) & 0x07, reliability, (peak >> 4) & 0x0F, precedence, mean);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (adjust != 0) {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare1, tvb, offset, 1, spare1);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_delay, tvb, offset, 1, delay);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_reliability, tvb, offset, 1, reliability);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_peak, tvb, offset + 1, 1, peak);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare2, tvb, offset + 1, 1, spare2);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_precedence, tvb, offset + 1, 1, precedence);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare3, tvb, offset + 2, 1, spare3);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_mean, tvb, offset + 2, 1, mean);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return 3;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.6, page 39
* 4.08
* 3.60
* UMTS: not present
* TODO: check if length is included: ETSI 4.08 vs 9.60
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_qos_gprs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return (1 + decode_qos_gprs(tvb, offset + 1, tree, "Quality of Service", 1));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.7, page 39
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.6 Reordering Required
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_reorder(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 reorder;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
reorder = tvb_get_guint8(tvb, offset + 1) & 0x01;
proto_tree_add_boolean(tree, hf_gtp_reorder, tvb, offset, 2, reorder);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.8, page 40
* 4.08 v7.1.2, chapter 10.5.3.1+
* UMTS: 29.060 v4.0, chapter 7.7.7
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
* TODO: Add blurb support by registering items in the protocol registration
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_auth_tri;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_auth_tri = proto_tree_add_subtree(tree, tvb, offset, 29, ett_gtp_ies[GTP_EXT_AUTH_TRI], NULL,
val_to_str_ext_const(GTP_EXT_AUTH_TRI, &gtp_val_ext, "Unknown message"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_auth_tri, hf_gtp_rand, tvb, offset + 1, 16, ENC_NA);
proto_tree_add_item(ext_tree_auth_tri, hf_gtp_sres, tvb, offset + 17, 4, ENC_NA);
proto_tree_add_item(ext_tree_auth_tri, hf_gtp_kc, tvb, offset + 21, 8, ENC_NA);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 1 + 16 + 4 + 8;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.9, page 40
* 9.02 v7.7.0, page 1090
* UMTS: 29.060 v4.0, chapter 7.7.8, page 48
* 29.002 v4.2.1, chapter 17.5, page 268
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_map_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 map_cause;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
map_cause = tvb_get_guint8(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_map_cause, tvb, offset, 2, map_cause);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.10, page 41
* UMTS: 29.060 v4.0, chapter 7.7.9, page 48
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ptmsi_sig(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint32 ptmsi_sig;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
ptmsi_sig = tvb_get_ntoh24(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_ptmsi_sig, tvb, offset, 4, ptmsi_sig);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 4;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.11, page 41
* UMTS: 29.060 v4.0, chapter 7.7.10, page 49
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ms_valid(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 ms_valid;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
ms_valid = tvb_get_guint8(tvb, offset + 1) & 0x01;
proto_tree_add_boolean(tree, hf_gtp_ms_valid, tvb, offset, 2, ms_valid);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.12, page 41
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.11 Recovery
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_recovery(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 recovery;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
recovery = tvb_get_guint8(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_recovery, tvb, offset, 2, recovery);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.13, page 42
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.12 Selection Mode
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static const gchar *
dissect_radius_selection_mode(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo _U_)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
guint8 sel_mode;
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Value in ASCII(UTF-8) */
sel_mode = tvb_get_guint8(tvb, 0) - 0x30;
proto_tree_add_uint(tree, hf_gtp_sel_mode, tvb, 0, 1, sel_mode);
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
return val_to_str_const(sel_mode, sel_mode_type, "Unknown");
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_sel_mode(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(tree, hf_gtp_sel_mode, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.14, page 42
* UMTS: 29.060 v4.0, chapter 7.7.13, page 50
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_16(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint16 ext_flow_label;
guint32 teid_data;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (gtp_version) {
case 0:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ext_flow_label = tvb_get_ntohs(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_ext_flow_label, tvb, offset, 3, ext_flow_label);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
teid_data = tvb_get_ntohl(tvb, offset + 1);
Start teid_data field from the correct offset svn path=/trunk/; revision=53688
2013-12-01 08:52:06 +00:00
proto_tree_add_uint(tree, hf_gtp_teid_data, tvb, offset+1, 4, teid_data);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 5;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(tree, tvb, offset, 1, "Flow label/TEID Data I : GTP version not supported");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.15, page 42
* UMTS: 29.060 v4.0, chapter 7.7.14, page 42
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_17(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint16 flow_sig;
guint32 teid_cp;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (gtp_version) {
case 0:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
flow_sig = tvb_get_ntohs(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_flow_sig, tvb, offset, 3, flow_sig);
return 3;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
teid_cp = tvb_get_ntohl(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_teid_cp, tvb, offset, 5, teid_cp);
return 5;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(tree, tvb, offset, 1, "Flow label signalling/TEID control plane : GTP version not supported");
return 3;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.16, page 42
* UMTS: 29.060 v4.0, chapter 7.7.15, page 51
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_18(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 flow_ii;
guint32 teid_ii;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_flow_ii;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (gtp_version) {
case 0:
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_flow_ii = proto_tree_add_subtree(tree, tvb, offset, 4, ett_gtp_ies[GTP_EXT_FLOW_II], NULL,
val_to_str_ext_const(GTP_EXT_FLOW_II, &gtp_val_ext, "Unknown message"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
flow_ii = tvb_get_ntohs(tvb, offset + 2);
proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_flow_ii, tvb, offset + 2, 2, flow_ii);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 4;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_flow_ii = proto_tree_add_subtree(tree, tvb, offset, 6, ett_gtp_flow_ii, NULL,
val_to_str_ext_const(GTP_EXT_TEID_II, &gtpv1_val_ext, "Unknown message"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
proto_tree_add_item(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
teid_ii = tvb_get_ntohl(tvb, offset + 2);
proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_teid_ii, tvb, offset + 2, 4, teid_ii);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 6;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(tree, tvb, offset, 1, "Flow data II/TEID Data II : GTP Version not supported");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 4;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.16A, page 43
* UMTS: 29.060 v4.0, chapter 7.7.16, page 51
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
* Check if all ms_reason types are included
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_19(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 field19;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
field19 = tvb_get_guint8(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (gtp_version) {
case 0:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint(tree, hf_gtp_ms_reason, tvb, offset, 2, field19);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_boolean(tree, hf_gtp_tear_ind, tvb, offset, 2, field19 & 0x01);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(tree, tvb, offset, 1, "Information Element Type = 19 : GTP Version not supported");
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.17, page 51
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 nsapi;
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
proto_tree *ext_tree;
proto_item *te;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 10, ett_gtp_ies[GTP_EXT_NSAPI], &te,
val_to_str_ext_const(GTP_EXT_NSAPI, &gtp_val_ext, "Unknown message"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
nsapi = tvb_get_guint8(tvb, offset + 1) & 0x0F;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_nsapi, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
proto_item_append_text(te, ": %u",nsapi);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.18, page 52
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ranap_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
guint8 ranap;
ranap = tvb_get_guint8(tvb, offset + 1);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((ranap > 0) && (ranap <= 64))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
ranap, "%s (Radio Network Layer Cause) : %s (%u)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((ranap > 64) && (ranap <= 80))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
ranap, "%s (Transport Layer Cause) : %s (%u)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((ranap > 80) && (ranap <= 96))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
ranap, "%s (NAS Cause) : %s (%u)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((ranap > 96) && (ranap <= 112))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
"%s (Protocol Cause) : %s (%u)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((ranap > 112) && (ranap <= 128))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
"%s (Miscellaneous Cause) : %s (%u)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((ranap > 128) /* && (ranap <= 255) */ )
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
"%s (Non-standard Cause) : %s (%u)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.19, page 52
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rab_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
proto_tree *ext_tree_rab_cntxt;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_rab_cntxt = proto_tree_add_subtree(tree, tvb, offset, 10, ett_gtp_ies[GTP_EXT_RAB_CNTXT], NULL,
val_to_str_ext_const(GTP_EXT_RAB_CNTXT, &gtp_val_ext, "Unknown message"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_nsapi, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_gtpu_dn, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_gtpu_up, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_pdu_dn, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_pdu_up, tvb, offset + 8, 2, ENC_BIG_ENDIAN);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 10;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.20, page 53
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rp_sms(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 rp_sms;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
rp_sms = tvb_get_guint8(tvb, offset + 1) & 0x07;
proto_tree_add_uint(tree, hf_gtp_rp_sms, tvb, offset, 2, rp_sms);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.21, page 53
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rp(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_rp;
proto_item *te;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 nsapi, rp, spare;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
nsapi = tvb_get_guint8(tvb, offset + 1) & 0xF0;
spare = tvb_get_guint8(tvb, offset + 1) & 0x08;
rp = tvb_get_guint8(tvb, offset + 1) & 0x07;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
te = proto_tree_add_uint_format(tree, hf_gtp_rp, tvb, offset, 2, rp, "Radio Priority for NSAPI(%u) : %u", nsapi, rp);
Fix a few cases of proto_item_add_subtree() using the wrong tree: Coverity 916-918; Also: Fix some indentation: e.g., "4 space tabs". svn path=/trunk/; revision=36585
2011-04-12 15:39:19 +00:00
ext_tree_rp = proto_item_add_subtree(te, ett_gtp_rp);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(ext_tree_rp, hf_gtp_rp_nsapi, tvb, offset + 1, 1, nsapi);
proto_tree_add_uint(ext_tree_rp, hf_gtp_rp_spare, tvb, offset + 1, 1, spare);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_rp, hf_gtp_rp, tvb, offset + 1, 1, rp);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.22, page 53
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_pkt_flow_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_pkt_flow_id;
proto_item *te;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 nsapi, pkt_flow_id;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
nsapi = tvb_get_guint8(tvb, offset + 1) & 0x0F;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
pkt_flow_id = tvb_get_guint8(tvb, offset + 2);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
te = proto_tree_add_uint_format(tree, hf_gtp_pkt_flow_id, tvb, offset, 3, pkt_flow_id, "Packet Flow ID for NSAPI(%u) : %u", nsapi, pkt_flow_id);
Fix a few cases of proto_item_add_subtree() using the wrong tree: Coverity 916-918; Also: Fix some indentation: e.g., "4 space tabs". svn path=/trunk/; revision=36585
2011-04-12 15:39:19 +00:00
ext_tree_pkt_flow_id = proto_item_add_subtree(te, ett_gtp_pkt_flow_id);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
proto_tree_add_item(ext_tree_pkt_flow_id, hf_gtp_nsapi, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint_format(ext_tree_pkt_flow_id, hf_gtp_pkt_flow_id, tvb,
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
offset + 2, 1, pkt_flow_id, "%s : %u", val_to_str_ext_const(GTP_EXT_PKT_FLOW_ID, &gtp_val_ext, "Unknown message"), pkt_flow_id);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.23, page 53
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
* TODO: Differenciate these uints?
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_chrg_char(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 chrg_char;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_item *te;
proto_tree *ext_tree_chrg_char;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
chrg_char = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
te = proto_tree_add_uint(tree, hf_gtp_chrg_char, tvb, offset, 3, chrg_char);
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
/*"%s: %x", val_to_str_ext_const (GTP_EXT_CHRG_CHAR, &gtp_val_ext, "Unknown message"), chrg_char); */
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
ext_tree_chrg_char = proto_item_add_subtree(te, ett_gtp_ies[GTP_EXT_CHRG_CHAR]);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_s, tvb, offset + 1, 2, chrg_char);
proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_n, tvb, offset + 1, 2, chrg_char);
proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_p, tvb, offset + 1, 2, chrg_char);
proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_f, tvb, offset + 1, 2, chrg_char);
proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_h, tvb, offset + 1, 2, chrg_char);
proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_r, tvb, offset + 1, 2, chrg_char);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.24, page
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_trace_ref(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint16 trace_ref;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
trace_ref = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(tree, hf_gtp_trace_ref, tvb, offset, 3, trace_ref);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.25, page
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_trace_type(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint16 trace_type;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
trace_type = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(tree, hf_gtp_trace_type, tvb, offset, 3, trace_type);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.16A
* UMTS: 29.060 v4.0, chapter 7.7.25A, page
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ms_reason(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 reason;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
reason = tvb_get_guint8(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
/* Reason for Absence is defined in 3GPP TS 23.040 */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(tree, hf_gtp_ms_reason, tvb, offset, 2, reason);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.25B
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Radio Priority LCS
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ra_prio_lcs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RA_PRIO_LCS], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_RA_PRIO_LCS, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Add dissection of Radio Priority LCS. svn path=/trunk/; revision=35276
2010-12-27 20:23:26 +00:00
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ra_prio_lcs, tvb, offset, 1, ENC_BIG_ENDIAN);
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 12.15 v7.6.0, chapter 7.3.3, page 45
* UMTS: 33.015
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_tr_comm(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 tr_command;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
tr_command = tvb_get_guint8(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(tree, hf_gtp_tr_comm, tvb, offset, 2, tr_command);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.17, page 43
* UMTS: 29.060 v4.0, chapter 7.7.26, page 55
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_chrg_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint32 chrg_id;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
chrg_id = tvb_get_ntohl(tvb, offset + 1);
proto_tree_add_uint(tree, hf_gtp_chrg_id, tvb, offset, 5, chrg_id);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 5;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.18, page 43
* UMTS: 29.060 v4.0, chapter 7.7.27, page 55
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
guint8 pdp_typ, pdp_org;
guint32 addr_ipv4;
struct e_in6_addr addr_ipv6;
proto_tree *ext_tree_user;
proto_item *te;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
pdp_org = tvb_get_guint8(tvb, offset + 3) & 0x0F;
pdp_typ = tvb_get_guint8(tvb, offset + 4);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_user = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length,
ett_gtp_ies[GTP_EXT_USER_ADDR], &te, "%s (%s/%s)",
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
val_to_str_ext_const(GTP_EXT_USER_ADDR, &gtp_val_ext, "Unknown message"),
val_to_str_const(pdp_org, pdp_org_type, "Unknown PDP Organization"),
val_to_str_const(pdp_typ, pdp_type, "Unknown PDP Type"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_user, hf_gtp_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_user, hf_gtp_user_addr_pdp_org, tvb, offset + 3, 1, pdp_org);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(ext_tree_user, hf_gtp_user_addr_pdp_type, tvb, offset + 4, 1, pdp_typ);
if (length == 2) {
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((pdp_org == 0) && (pdp_typ == 1))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_item_append_text(te, " (Point to Point Protocol)");
else if (pdp_typ == 2)
proto_item_append_text(te, " (Octet Stream Protocol)");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
} else if (length > 2) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
switch (pdp_typ) {
case 0x21:
addr_ipv4 = tvb_get_ipv4(tvb, offset + 5);
proto_tree_add_ipv4(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, addr_ipv4);
proto_item_append_text(te, " : %s", ip_to_str((guint8 *) & addr_ipv4));
break;
case 0x57:
tvb_get_ipv6(tvb, offset + 5, &addr_ipv6);
proto_tree_add_ipv6(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 5, 16, (guint8 *) & addr_ipv6);
proto_item_append_text(te, " : %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
break;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8196 : Add dissection of IPv4v6 type to End User Address IE svn path=/trunk/; revision=47047
2013-01-13 11:04:46 +00:00
case 0x8d:
addr_ipv4 = tvb_get_ipv4(tvb, offset + 5);
proto_tree_add_ipv4(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, addr_ipv4);
tvb_get_ipv6(tvb, offset + 9, &addr_ipv6);
proto_tree_add_ipv6(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 9, 16, (guint8 *) & addr_ipv6);
proto_item_append_text(te, " : %s / %s", ip_to_str((guint8 *) & addr_ipv4),
ip6_to_str((struct e_in6_addr *) &addr_ipv6));
break;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
} else
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_item_append_text(te, " : empty PDP Address");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_triplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 count)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_trip;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 i;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
for (i = 0; i < count; i++) {
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_trip = proto_tree_add_subtree_format(tree, tvb, offset + i * 28, 28, ett_gtp_trip, NULL, "Triplet no%x", i);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_trip, hf_gtp_rand, tvb, offset + i * 28, 16, ENC_NA);
proto_tree_add_item(ext_tree_trip, hf_gtp_sres, tvb, offset + i * 28 + 16, 4, ENC_NA);
proto_tree_add_item(ext_tree_trip, hf_gtp_kc, tvb, offset + i * 28 + 20, 8, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return count * 28;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
/* adjust - how many bytes before quintuplet should be highlighted
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_quintuplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 count)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_quint;
proto_item *te_quint;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 q_offset, i;
guint8 xres_len, auth_len;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
q_offset = 0;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
for (i = 0; i < count; i++) {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_quint = proto_tree_add_subtree_format(tree, tvb, offset, -1,
ett_gtp_quint, &te_quint, "Quintuplet #%x", i + 1);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_rand, tvb, offset + q_offset, 16, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset = q_offset + 16;
xres_len = tvb_get_guint8(tvb, offset + q_offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_xres_length, tvb, offset + q_offset, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset++;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_xres, tvb, offset + q_offset, xres_len, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset = q_offset + xres_len;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_quintuplet_ciphering_key, tvb, offset + q_offset, 16, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset = q_offset + 16;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_quintuplet_integrity_key, tvb, offset + q_offset, 16, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset = q_offset + 16;
auth_len = tvb_get_guint8(tvb, offset + q_offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_authentication_length, tvb, offset + q_offset, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset++;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_quint, hf_gtp_auth, tvb, offset + q_offset, auth_len, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
q_offset = q_offset + auth_len;
proto_item_set_end(te_quint, tvb, offset + q_offset);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return q_offset;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.19 page
* UMTS: 29.060 v4.0, chapter 7.7.28 page 57
* TODO: - check if for quintuplets first 2 bytes are length, according to AuthQuint
* - finish displaying last 3 parameters
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
guint16 length, con_len;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 count, sec_mode, len, iei;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_mm;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree *tf_tree = NULL, *con_tree;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_mm = proto_tree_add_subtree(tree, tvb, offset, 1, ett_gtp_ies[GTP_EXT_MM_CNTXT], NULL,
val_to_str_ext_const(GTP_EXT_MM_CNTXT, &gtp_val_ext, "Unknown message"));
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Octet 2 - 3 */
length = tvb_get_ntohs(tvb, offset + 1);
if (length < 1)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=36703
2011-04-18 17:48:23 +00:00
/* Octet 4 (cksn)*/
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Octet 5 */
sec_mode = (tvb_get_guint8(tvb, offset + 4) >> 6) & 0x03;
count = (tvb_get_guint8(tvb, offset + 4) >> 3) & 0x07;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (gtp_version == 0)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
sec_mode = 1;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (sec_mode) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
case 0: /* Used cipher value, UMTS keys and Quintuplets */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_cksn_ksi, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_ciphering_key_ck, tvb, offset + 5, 16, ENC_NA);
proto_tree_add_item(ext_tree_mm, hf_gtp_integrity_key_ik, tvb, offset + 21, 16, ENC_NA);
proto_tree_add_item(ext_tree_mm, hf_gtp_quintuplets_length, tvb, offset + 37, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + decode_quintuplet(tvb, offset + 39, ext_tree_mm, count) + 39;
break;
case 1: /* GSM key and triplets */
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_cksn, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
if (gtp_version != 0)
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_ciphering_key_kc, tvb, offset + 5, 8, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + decode_triplet(tvb, offset + 13, ext_tree_mm, count) + 13;
break;
case 2: /* UMTS key and quintuplets */
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_ksi, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_ciphering_key_ck, tvb, offset + 5, 16, ENC_NA);
proto_tree_add_item(ext_tree_mm, hf_gtp_integrity_key_ik, tvb, offset + 21, 16, ENC_NA);
proto_tree_add_item(ext_tree_mm, hf_gtp_quintuplets_length, tvb, offset + 37, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + decode_quintuplet(tvb, offset + 39, ext_tree_mm, count) + 39;
break;
case 3: /* GSM key and quintuplets */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_cksn, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_ciphering_key_kc, tvb, offset + 5, 8, ENC_NA);
proto_tree_add_item(ext_tree_mm, hf_gtp_quintuplets_length, tvb, offset + 13, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + decode_quintuplet(tvb, offset + 15, ext_tree_mm, count) + 15;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
/*
* 3GPP TS 24.008 10.5.5.6 ( see packet-gsm_a.c )
*/
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
tf_tree = proto_tree_add_subtree(ext_tree_mm, tvb, offset, 2, ett_gtp_drx, NULL, "DRX Parameter");
Fix copy/paste error introduced in r51541 and spotted by Joerg svn path=/trunk/; revision=51564
2013-08-28 17:31:12 +00:00
de_gmm_drx_param(tvb, tf_tree, pinfo, offset, 2, NULL, 0);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
len = tvb_get_guint8(tvb, offset);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
tf_tree = proto_tree_add_subtree(ext_tree_mm, tvb, offset, len + 1, ett_gtp_net_cap, NULL, "MS Network Capability");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_text(tf_tree, tvb, offset, 1, "Length of MS network capability contents: %u", len);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
/*
* GPP TS 24.008 10.5.5.12 ( see packet-gsm_a.c )
*/
Change the signature of elem_fcn():ns to include pinfo. svn path=/trunk/; revision=36443
2011-04-04 14:37:25 +00:00
de_gmm_ms_net_cap(tvb, tf_tree, pinfo, offset, len, NULL, 0);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + len;
Decode a bit more of the mobility management context message, and use "mm_sec_modep[]" to decode the security type. svn path=/trunk/; revision=8005
2003-07-09 07:12:23 +00:00
In MM context the container contains IE:s not a complete DTAP message. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598 svn path=/trunk/; revision=35595
2011-01-20 13:05:17 +00:00
/* 3GPP TS 29.060 version 9.4.0 Release 9
* The two octets Container Length holds the length of the Container, excluding the Container Length octets.
* Container contains one or several optional information elements as described in the clause "Overview", from the clause
* "General message format and information elements coding" in 3GPP TS 24.008 [5]. For the definition of the IEI see
* table 47a, "IEIs for information elements used in the container". The IMEISV shall, if available, be included in the
* Container. The IMEISV is included in the Mobile identity IE. If Container is not included, its Length field value shall
* be set to 0. If the MS is emergency attached and the MS is UICCless or the IMSI is unauthenticated, the International
* Mobile Equipment Identity (IMEI) shall be used as the MS identity.
Replace some blurbs with NULL svn path=/trunk/; revision=35728
2011-01-31 21:09:28 +00:00
*
In MM context the container contains IE:s not a complete DTAP message. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598 svn path=/trunk/; revision=35595
2011-01-20 13:05:17 +00:00
* Table 47A: IEIs for information elements used in the container
* IEI Information element
* 0x23 Mobile identity
*
* NOTE: In 3GPP TS 24.008 [5] the IEI definition is
* message dependent. The table is added to
* have a unique definition in the present
* document for the used IEI in the MMcontext.
Packet-gtp.c - Fix up decoding of the rest of the IE:s use routines from packet-gsm_a.c Packet-uma.c Let packet-gsm_a handle som IE dissection. Packet-gsm.a add some IE dissection and export some routines. svn path=/trunk/; revision=14918
2005-07-14 21:05:38 +00:00
*/
Decode a bit more of the mobility management context message, and use "mm_sec_modep[]" to decode the security type. svn path=/trunk/; revision=8005
2003-07-09 07:12:23 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
con_len = tvb_get_ntohs(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_mm, hf_gtp_container_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Decode a bit more of the mobility management context message, and use "mm_sec_modep[]" to decode the security type. svn path=/trunk/; revision=8005
2003-07-09 07:12:23 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (con_len > 0) {
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
con_tree = proto_tree_add_subtree(ext_tree_mm, tvb, offset, con_len, ett_gtp_mm_cntxt, NULL, "Container");
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
iei = tvb_get_guint8(tvb,offset);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if (iei == 0x23) {
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_text(con_tree, tvb, offset, 1, "Mobile identity IEI %u",iei);
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
offset++;
len = tvb_get_guint8(tvb,offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_text(con_tree, tvb, offset, 1, "Length %u",len);
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
offset++;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
de_mid(tvb, con_tree, pinfo, offset, len, NULL, 0);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
} else {
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_text(con_tree, tvb, offset, 1, "Unknown IEI %u - Later spec than TS 29.060 9.4.0 used?",iei);
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
/* Function to extract the value of an hexadecimal octet. Only the lower
* nybble will be non-zero in the output.
* */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static guint8
hex2dec(guint8 x)
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
{
Move UAT xton() to wsutil library Use ws_xton() in few more places. svn path=/trunk/; revision=54642
2014-01-08 00:28:13 +00:00
/* XXX, ws_xton() */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if ((x >= 'a') && (x <= 'f'))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
x = x - 'a' + 10;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
else if ((x >= 'A') && (x <= 'F'))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
x = x - 'A' + 10;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
else if ((x >= '0') && (x <= '9'))
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
x = x - '0';
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
else
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
x = 0;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return x;
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
/* Wrapper function to add UTF-8 decoding for QoS attributes in
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
* RADIUS messages.
* */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static guint8
wrapped_tvb_get_guint8(tvbuff_t * tvb, int offset, int type)
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
{
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (type == 2)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return (hex2dec(tvb_get_guint8(tvb, offset)) << 4 | hex2dec(tvb_get_guint8(tvb, offset + 1)));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
else
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return tvb_get_guint8(tvb, offset);
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
}
Updates from Michal Melerowicz. svn path=/trunk/; revision=4650
2002-01-31 09:59:22 +00:00
/* WARNING : actually length is coded on 2 octets for QoS profile but on 1 octet for PDP Context!
* so type means length of length :-)
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
*
* WARNING :) type does not mean length of length any more... see below for
* type = 3!
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const gchar * qos_str, guint8 type)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
From Flavio Poletti: handle 3GPP QoS in RADIUS messages. svn path=/trunk/; revision=6091
2002-08-26 20:22:31 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint length;
guint8 al_ret_priority;
guint8 delay, reliability, peak, precedence, mean, spare1, spare2, spare3;
guint8 traf_class, del_order, del_err_sdu;
Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up on the OSX 10.5 buildbot. Change-Id: I49e066feab8b980ea85371095234e96e89db71e1 Reviewed-on: https://code.wireshark.org/review/5247 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-12 01:48:39 +00:00
guint8 max_sdu_size, max_ul, max_dl, max_ul_ext, max_dl_ext, max_ul_ext2 = 0, max_dl_ext2 = 0;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 res_ber, sdu_err_ratio;
guint8 trans_delay, traf_handl_prio;
Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up on the OSX 10.5 buildbot. Change-Id: I49e066feab8b980ea85371095234e96e89db71e1 Reviewed-on: https://code.wireshark.org/review/5247 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-12 01:48:39 +00:00
guint8 guar_ul, guar_dl, guar_ul_ext, guar_dl_ext, guar_ul_ext2 = 0, guar_dl_ext2 = 0;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 src_stat_desc, sig_ind;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
proto_tree *ext_tree_qos, *ext_tree_qos_arp;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int mss, mu, md, gu, gd;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
guint8 arp, qci;
guint32 apn_ambr;
guint64 br;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Will keep if the input is UTF-8 encoded (as in RADIUS messages).
* If 1, input is *not* UTF-8 encoded (i.e. each input octet corresponds
* to one byte to be dissected).
* If 2, input is UTF-8 encoded (i.e. each *couple* of input octets
* corresponds to one byte to be dissected)
* */
guint8 utf8_type = 1;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
/* Will keep the release indicator as indicated in the RADIUS message */
guint8 rel_ind = 0;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* In RADIUS messages the QoS has a version field of two octets prepended.
* As of 29.061 v.3.a.0, there is an hyphen between "Release Indicator" and
* <release specific QoS IE UTF-8 encoding>. Even if it sounds rather
* inconsistent and unuseful, I will check hyphen presence here and
* will signal its presence.
* */
guint8 hyphen;
/* Will keep the value that will be returned
* */
int retval = 0;
switch (type) {
case 1:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
length = tvb_get_guint8(tvb, offset);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_qos = proto_tree_add_subtree(tree, tvb, offset, length + 1, ett_gtp_qos, NULL, qos_str);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(ext_tree_qos, tvb, offset, 1, "Length: %u", length);
offset++;
retval = length + 1;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 2:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_qos = proto_tree_add_subtree(tree, tvb, offset, length + 3, ett_gtp_qos, NULL, qos_str);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(ext_tree_qos, tvb, offset + 1, 2, "Length: %u", length);
offset += 3; /* +1 because of first 0x86 byte for UMTS QoS */
retval = length + 3;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 3:
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
/* For QoS inside RADIUS Client messages from GGSN/P-GW */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
utf8_type = 2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* The field in the RADIUS message is the length of the tvb we were given */
The UMTS GTP QoS Profile is a UTF-8-encoded string. So use tvb_get_string_enc() with ENC_UTF_8|ENC_NA. Use tvb_reported_length() while we're at it. Change-Id: I75bfa9abb23ca411dca5844dd56fe062d16319e0 Reviewed-on: https://code.wireshark.org/review/380 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25 18:59:31 +00:00
length = tvb_reported_length(tvb);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_qos = proto_tree_add_subtree(tree, tvb, offset, length, ett_gtp_qos, NULL, qos_str);
You don't tug on Superman's cape. You don't spit into the wind. You don't pull the mask off the old Lone Ranger, and you don't overflow a guint8. Fixes the infinite loop in bug 576. Fix up whitespace. Add an entry to the release notes. Apologies to Jim Croce. svn path=/trunk/; revision=16436
2005-11-08 15:22:38 +00:00
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
rel_ind = wrapped_tvb_get_guint8(tvb, offset, 2);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_version, tvb, offset, 2, rel_ind);
You don't tug on Superman's cape. You don't spit into the wind. You don't pull the mask off the old Lone Ranger, and you don't overflow a guint8. Fixes the infinite loop in bug 576. Fix up whitespace. Add an entry to the release notes. Apologies to Jim Croce. svn path=/trunk/; revision=16436
2005-11-08 15:22:38 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* Hyphen handling */
hyphen = tvb_get_guint8(tvb, offset + 2);
if (hyphen == ((guint8) '-')) {
/* Hyphen is present, put in protocol tree */
proto_tree_add_text(ext_tree_qos, tvb, offset + 2, 1, "Hyphen separator: -");
offset++; /* "Get rid" of hyphen */
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* Now, we modify offset here and in order to use type later
* effectively.*/
offset++;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
length -= offset;
length /= 2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up with gcc 4.8.3. Change-Id: I71c9013670dd6e8c74e039bd252cfac2c9e95a18 Reviewed-on: https://code.wireshark.org/review/5246 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-11 20:37:04 +00:00
/* Fake the length of the IE including the IE id and length octets
* we are actually using it to determine precense of Octet n as counted in
* TS 24.008
*/
[GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter messages. Fixes Bug 10688 Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af Reviewed-on: https://code.wireshark.org/review/5244 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-11 20:21:28 +00:00
length = retval = length + 2; /* Actually, will be ignored. */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* XXX - what should we do with the length here? */
length = 0;
retval = 0;
ext_tree_qos = NULL;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7697 : Fix dissection of release 98 and release 99 QoS profiles (bug introduced in r43312) svn path=/trunk/; revision=44792
2012-09-06 20:58:32 +00:00
if ((type == 3) && (rel_ind == 8)) {
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
/* Release 8 or higher P-GW QoS profile */
offset++;
arp = wrapped_tvb_get_guint8(tvb, offset, 2);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_qos_arp = proto_tree_add_subtree(ext_tree_qos, tvb, offset, 2, ett_gtp_qos_arp, NULL, "Allocation/Retention Priority");
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
proto_tree_add_boolean(ext_tree_qos_arp, hf_gtp_qos_arp_pci, tvb, offset, 2, arp);
proto_tree_add_uint(ext_tree_qos_arp, hf_gtp_qos_arp_pl, tvb, offset, 2, arp);
proto_tree_add_boolean(ext_tree_qos_arp, hf_gtp_qos_arp_pvi, tvb, offset, 2, arp);
offset += 2;
qci = wrapped_tvb_get_guint8(tvb, offset, 2);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_qci, tvb, offset, 2, qci);
offset += 2;
if (qci <= 4) {
/* GBR QCI */
br = ((guint64)wrapped_tvb_get_guint8(tvb, offset , 2) << 32) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+2, 2) << 24) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+4, 2) << 16) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+6, 2) << 8) |
(guint64)wrapped_tvb_get_guint8(tvb, offset+8, 2);
proto_tree_add_uint64(ext_tree_qos, hf_gtp_qos_ul_mbr, tvb, offset, 10, br);
offset += 10;
br = ((guint64)wrapped_tvb_get_guint8(tvb, offset , 2) << 32) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+2, 2) << 24) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+4, 2) << 16) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+6, 2) << 8) |
(guint64)wrapped_tvb_get_guint8(tvb, offset+8, 2);
proto_tree_add_uint64(ext_tree_qos, hf_gtp_qos_dl_mbr, tvb, offset, 10, br);
offset += 10;
br = ((guint64)wrapped_tvb_get_guint8(tvb, offset , 2) << 32) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+2, 2) << 24) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+4, 2) << 16) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+6, 2) << 8) |
(guint64)wrapped_tvb_get_guint8(tvb, offset+8, 2);
proto_tree_add_uint64(ext_tree_qos, hf_gtp_qos_ul_gbr, tvb, offset, 10, br);
offset += 10;
br = ((guint64)wrapped_tvb_get_guint8(tvb, offset , 2) << 32) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+2, 2) << 24) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+4, 2) << 16) |
((guint64)wrapped_tvb_get_guint8(tvb, offset+6, 2) << 8) |
(guint64)wrapped_tvb_get_guint8(tvb, offset+8, 2);
proto_tree_add_uint64(ext_tree_qos, hf_gtp_qos_dl_gbr, tvb, offset, 10, br);
} else {
/* non GBR QCI */
apn_ambr = (wrapped_tvb_get_guint8(tvb, offset , 2) << 24) |
(wrapped_tvb_get_guint8(tvb, offset+2, 2) << 16) |
(wrapped_tvb_get_guint8(tvb, offset+4, 2) << 8) |
wrapped_tvb_get_guint8(tvb, offset+6, 2);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_ul_apn_ambr, tvb, offset, 8, apn_ambr);
offset += 8;
apn_ambr = (wrapped_tvb_get_guint8(tvb, offset , 2) << 24) |
(wrapped_tvb_get_guint8(tvb, offset+2, 2) << 16) |
(wrapped_tvb_get_guint8(tvb, offset+4, 2) << 8) |
wrapped_tvb_get_guint8(tvb, offset+6, 2);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_dl_apn_ambr, tvb, offset, 8, apn_ambr);
}
return retval;
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* In RADIUS messages there is no allocation-retention priority
* so I don't need to wrap the following call to tvb_get_guint8
* */
al_ret_priority = tvb_get_guint8(tvb, offset);
/* All calls are wrapped to take into account the possibility that the
* input is UTF-8 encoded. If utf8_type is equal to 1, the final value
* of the offset will be the same as in the previous version of this
* dissector, and the wrapped function will serve as a dumb wrapper;
* otherwise, if utf_8_type is 2, the offset is correctly shifted by
* two bytes for needed shift, and the wrapped function will unencode
* two values from the input.
* */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
spare1 = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SPARE1_MASK;
delay = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_DELAY_MASK;
From Tamas Regos: Another bug in packet-gtp.c (mask of Signalling Indication) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4694 svn path=/trunk/; revision=32510
2010-04-19 06:02:56 +00:00
reliability = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_RELIABILITY_MASK;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
peak = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_PEAK_MASK;
spare2 = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SPARE2_MASK;
precedence = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_PRECEDENCE_MASK;
spare3 = wrapped_tvb_get_guint8(tvb, offset + (3 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SPARE3_MASK;
mean = wrapped_tvb_get_guint8(tvb, offset + (3 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_MEAN_MASK;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* In RADIUS messages there is no allocation-retention priority */
if (type != 3)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_al_ret_priority, tvb, offset, 1, al_ret_priority);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* All additions must take care of the fact that QoS fields in RADIUS
* messages are UTF-8 encoded, so we have to use the same trick as above.
* */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare1, tvb, offset + (1 - 1) * utf8_type + 1, utf8_type, spare1);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_delay, tvb, offset + (1 - 1) * utf8_type + 1, utf8_type, delay);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_reliability, tvb, offset + (1 - 1) * utf8_type + 1, utf8_type, reliability);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_peak, tvb, offset + (2 - 1) * utf8_type + 1, utf8_type, peak);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare2, tvb, offset + (2 - 1) * utf8_type + 1, utf8_type, spare2);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_precedence, tvb, offset + (2 - 1) * utf8_type + 1, utf8_type, precedence);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare3, tvb, offset + (3 - 1) * utf8_type + 1, utf8_type, spare3);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_mean, tvb, offset + (3 - 1) * utf8_type + 1, utf8_type, mean);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
[GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter messages. Fixes Bug 10688 Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af Reviewed-on: https://code.wireshark.org/review/5244 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-11 20:21:28 +00:00
/* TS 24.008 V 7.8.0 10.5.6.5 Quality of service
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
* The quality of service is a type 4 information element with a minimum length of 14 octets and a maximum length of 18
* octets. The QoS requested by the MS shall be encoded both in the QoS attributes specified in octets 3-5 and in the QoS
* attributes specified in octets 6-14.
* In the MS to network direction and in the network to MS direction the following applies:
* - Octets 15-18 are optional. If octet 15 is included, then octet 16 shall also be included, and octets 17 and 18 may
* be included.
* - If octet 17 is included, then octet 18 shall also be included.
* - A QoS IE received without octets 6-18, without octets 14-18, without octets 15-18, or without octets 17-18 shall
* be accepted by the receiving entity.
*/
Update the QoS IE svn path=/trunk/; revision=26526
2008-10-23 19:22:54 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (length > 4) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
/* See above for the need of wrapping
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
*
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
*/
/* Octet 6 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
traf_class = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_TRAF_CLASS_MASK;
del_order = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_DEL_ORDER_MASK;
del_err_sdu = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_DEL_ERR_SDU_MASK;
max_sdu_size = wrapped_tvb_get_guint8(tvb, offset + (5 - 1) * utf8_type + 1, utf8_type);
max_ul = wrapped_tvb_get_guint8(tvb, offset + (6 - 1) * utf8_type + 1, utf8_type);
max_dl = wrapped_tvb_get_guint8(tvb, offset + (7 - 1) * utf8_type + 1, utf8_type);
res_ber = wrapped_tvb_get_guint8(tvb, offset + (8 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_RES_BER_MASK;
sdu_err_ratio = wrapped_tvb_get_guint8(tvb, offset + (8 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SDU_ERR_RATIO_MASK;
trans_delay = wrapped_tvb_get_guint8(tvb, offset + (9 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_TRANS_DELAY_MASK;
From Tamas Regos: Another bug in packet-gtp.c (mask of Signalling Indication) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4694 svn path=/trunk/; revision=32510
2010-04-19 06:02:56 +00:00
traf_handl_prio = wrapped_tvb_get_guint8(tvb, offset + (9 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
guar_ul = wrapped_tvb_get_guint8(tvb, offset + (10 - 1) * utf8_type + 1, utf8_type);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
/* Octet 13 */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
guar_dl = wrapped_tvb_get_guint8(tvb, offset + (11 - 1) * utf8_type + 1, utf8_type);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
src_stat_desc = 0;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
sig_ind = 0;
max_dl_ext = 0;
guar_dl_ext = 0;
max_ul_ext = 0;
guar_ul_ext = 0;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
From Katrina Zhang: Fix QoS dissection. svn path=/trunk/; revision=51752
2013-09-04 18:11:21 +00:00
if (length > 13 ||((type == 2) && (length == 13))) {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
src_stat_desc = wrapped_tvb_get_guint8(tvb, offset + (12 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SRC_STAT_DESC_MASK;
sig_ind = wrapped_tvb_get_guint8(tvb, offset + (12 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SIG_IND_MASK;
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
if (length > 14) {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
max_dl_ext = wrapped_tvb_get_guint8(tvb, offset + (13 - 1) * utf8_type + 1, utf8_type);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
guar_dl_ext = wrapped_tvb_get_guint8(tvb, offset + (14 - 1) * utf8_type + 1, utf8_type);
}
max_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet.(Wrong length check) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6761 svn path=/trunk/; revision=40702
2012-01-24 19:23:05 +00:00
if (length > 16) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
max_ul_ext = wrapped_tvb_get_guint8(tvb, offset + (15 - 1) * utf8_type + 1, utf8_type);
guar_ul_ext = wrapped_tvb_get_guint8(tvb, offset + (16 - 1) * utf8_type + 1, utf8_type);
}
[GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter messages. Fixes Bug 10688 Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af Reviewed-on: https://code.wireshark.org/review/5244 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-11 20:21:28 +00:00
if (length > 18) {
max_dl_ext2 = wrapped_tvb_get_guint8(tvb, offset + (17 - 1) * utf8_type + 1, utf8_type);
guar_dl_ext2 = wrapped_tvb_get_guint8(tvb, offset + (18 - 1) * utf8_type + 1, utf8_type);
}
if (length > 20) {
max_ul_ext2 = wrapped_tvb_get_guint8(tvb, offset + (19 - 1) * utf8_type + 1, utf8_type);
guar_ul_ext2 = wrapped_tvb_get_guint8(tvb, offset + (20 - 1) * utf8_type + 1, utf8_type);
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/*
max_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet.(Wrong length check) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6761 svn path=/trunk/; revision=40702
2012-01-24 19:23:05 +00:00
* See above comments for the changes
*/
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_traf_class, tvb, offset + (4 - 1) * utf8_type + 1, utf8_type, traf_class);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_del_order, tvb, offset + (4 - 1) * utf8_type + 1, utf8_type, del_order);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_del_err_sdu, tvb, offset + (4 - 1) * utf8_type + 1, utf8_type, del_err_sdu);
if (max_sdu_size == 0 || max_sdu_size > 150)
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_max_sdu_size, tvb, offset + (5 - 1) * utf8_type + 1, utf8_type, max_sdu_size);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_sdu_size > 0) && (max_sdu_size <= 150)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
mss = max_sdu_size * 10;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_sdu_size, tvb, offset + (5 - 1) * utf8_type + 1, utf8_type, mss,
"%u octets", mss);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
Update the QoS IE svn path=/trunk/; revision=26526
2008-10-23 19:22:54 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
if (max_ul == 0 || max_ul == 255)
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, max_ul);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_ul > 0) && (max_ul <= 63))
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, max_ul,
"%u kbps", max_ul);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_ul > 63) && (max_ul <= 127)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
mu = 64 + (max_ul - 64) * 8;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, mu,
"%u kbps", mu);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_ul > 127) && (max_ul <= 254)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
mu = 576 + (max_ul - 128) * 64;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, mu,
"%u kbps", mu);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
if (max_dl == 0 || max_dl == 255)
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, max_dl);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_dl > 0) && (max_dl <= 63))
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, max_dl,
"%u kbps", max_dl);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_dl > 63) && (max_dl <= 127)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 64 + (max_dl - 64) * 8;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, md,
"%u kbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_dl > 127) && (max_dl <= 254)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 576 + (max_dl - 128) * 64;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, md,
"%u kbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_res_ber, tvb, offset + (8 - 1) * utf8_type + 1, utf8_type, res_ber);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_sdu_err_ratio, tvb, offset + (8 - 1) * utf8_type + 1, utf8_type, sdu_err_ratio);
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_trans_delay, tvb, offset + (9 - 1) * utf8_type + 1, utf8_type, trans_delay);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_traf_handl_prio, tvb, offset + (9 - 1) * utf8_type + 1, utf8_type, traf_handl_prio);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
if (guar_ul == 0 || guar_ul == 255)
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, guar_ul);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_ul > 0) && (guar_ul <= 63))
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, guar_ul,
"%u kbps", guar_ul);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_ul > 63) && (guar_ul <= 127)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gu = 64 + (guar_ul - 64) * 8;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, gu,
"%u kbps", gu);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_ul > 127) && (guar_ul <= 254)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gu = 576 + (guar_ul - 128) * 64;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, gu,
"%u kbps", gu);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
/* Octet 13 */
if (guar_dl == 0 || guar_dl == 255)
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, guar_dl);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_dl > 0) && (guar_dl <= 63))
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, guar_dl,
"%u kbps", guar_dl);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_dl > 63) && (guar_dl <= 127)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 64 + (guar_dl - 64) * 8;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, gd,
"%u kbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_dl > 127) && (guar_dl <= 254)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 576 + (guar_dl - 128) * 64;
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, gd,
"%u kbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
From Katrina Zhang: Fix QoS dissection. svn path=/trunk/; revision=51752
2013-09-04 18:11:21 +00:00
if(length > 13 ||((type == 2) && (length == 13))) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_src_stat_desc, tvb, offset + (12 - 1) * utf8_type + 1, utf8_type, src_stat_desc);
proto_tree_add_boolean(ext_tree_qos, hf_gtp_qos_sig_ind, tvb, offset + (12 - 1) * utf8_type + 1, utf8_type, sig_ind);
Remove trailing whitespace. Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6 Reviewed-on: https://code.wireshark.org/review/372 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25 16:27:32 +00:00
}
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if(length > 14) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
/* Octet 15 */
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_dl_ext > 0) && (max_dl_ext <= 0x4a)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 8600 + max_dl_ext * 100;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (13 - 1) * utf8_type + 1, utf8_type, md,
From Tamas Regos: Another bug in packet-gtp.c (mask of Signalling Indication) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4694 svn path=/trunk/; revision=32510
2010-04-19 06:02:56 +00:00
"Ext Maximum bit rate for downlink: %u kbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_dl_ext > 0x4a) && (max_dl_ext <= 0xba)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 16 + (max_dl_ext-0x4a);
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (13 - 1) * utf8_type + 1, utf8_type, md,
From Tamas Regos: Another bug in packet-gtp.c (mask of Signalling Indication) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4694 svn path=/trunk/; revision=32510
2010-04-19 06:02:56 +00:00
"Ext Maximum bit rate for downlink: %u Mbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_dl_ext > 0xba) && (max_dl_ext <= 0xfa)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 128 + (max_dl_ext-0xba)*2;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (13 - 1) * utf8_type + 1, utf8_type, md,
From Tamas Regos: Another bug in packet-gtp.c (mask of Signalling Indication) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4694 svn path=/trunk/; revision=32510
2010-04-19 06:02:56 +00:00
"Ext Maximum bit rate for downlink: %u Mbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
/* Octet 16 */
if(guar_dl_ext == 0)
proto_tree_add_text(ext_tree_qos, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Guaranteed bit rate for downlink in octet 13");
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_dl_ext > 0) && (guar_dl_ext <= 0x4a)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 8600 + guar_dl_ext * 100;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, gd,
"%u kbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_dl_ext > 0x4a) && (max_dl_ext <= 0xba)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 16 + (guar_dl_ext-0x4a);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, gd,
"%u Mbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_dl_ext > 0xba) && (max_dl_ext <= 0xfa)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 128 + (guar_dl_ext-0xba)*2;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint_format_value(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, gd,
"%u Mbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
Update the QoS IE svn path=/trunk/; revision=26526
2008-10-23 19:22:54 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if(length > 16) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
/* Octet 17
* This field is an extension of the Maximum bit rate for uplink in octet 8. The coding is identical to that of the Maximum bit
* rate for downlink (extended).
*/
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_ul_ext > 0) && (max_ul_ext <= 0x4a)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 8600 + max_ul_ext * 100;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
"Ext Maximum bit rate for uplink: %u kbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_ul_ext > 0x4a) && (max_ul_ext <= 0xba)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 16 + (max_ul_ext-0x4a);
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
"Ext Maximum bit rate for uplink: %u Mbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((max_ul_ext > 0xba) && (max_ul_ext <= 0xfa)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
md = 128 + (max_ul_ext-0xba)*2;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
"Ext Maximum bit rate for uplink: %u Mbps", md);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
/* Octet 18 */
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
if (guar_ul_ext == 0)
proto_tree_add_text(ext_tree_qos, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Guaranteed bit rate for uplink in octet 12");
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_ul_ext > 0) && (guar_ul_ext <= 0x4a)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 8600 + guar_ul_ext * 100;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
"Ext Guaranteed bit rate for uplink: %u kbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_ul_ext > 0x4a) && (max_ul_ext <= 0xba)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 16 + (guar_ul_ext-0x4a);
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
"Ext Guaranteed bit rate for uplink: %u Mbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if ((guar_ul_ext > 0xba) && (max_ul_ext <= 0xfa)) {
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gd = 128 + (guar_ul_ext-0xba)*2;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
From Tamas Regos: Harmless typo and whitespace bugs in packet-gtp.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677 (didn't apply cleanly so partly applied by hand). svn path=/trunk/; revision=32474
2010-04-15 17:58:54 +00:00
"Ext Guaranteed bit rate for uplink: %u Mbps", gd);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
}
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
[GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter messages. Fixes Bug 10688 Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af Reviewed-on: https://code.wireshark.org/review/5244 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-11 20:21:28 +00:00
if(length > 18) {
/* Octet 19 Maximum bit rate for downlink (extended-2)
* This field is an extension of the Maximum bit rate for uplink in octet 8. The coding is identical to that of the Maximum bit
* rate for downlink (extended).
*/
if (guar_dl_ext2 == 0)
proto_tree_add_text(ext_tree_qos, tvb, offset + (17 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Maximum bit rate for downlink in octet 9 and octet 15.");
if ((max_dl_ext2 > 0) && (max_dl_ext2 <= 0x3d)) {
md = 256 + max_dl_ext2 * 4;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
"Ext Maximum bit rate for downlink: %u Mbps", md);
}
if ((max_dl_ext2 > 0x3d) && (max_dl_ext2 <= 0xa1)) {
md = 500 + (max_dl_ext2-0x3d) * 10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
"Ext Maximum bit rate for downlink: %u Mbps", md);
}
if ((max_dl_ext2 > 0xa1) && (max_dl_ext2 <= 0xf6)) {
md = 1500 + (max_dl_ext2-0xa1)*10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
"Ext Maximum bit rate for downlink: %u Mbps", md);
}
/* Octet 20 Guaranteed bit rate for downlink (extended-2) */
if (max_dl_ext2 == 0)
proto_tree_add_text(ext_tree_qos, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Maximum bit rate for downlink in octet 13 and octet 16.");
if ((max_dl_ext2 > 0) && (max_dl_ext2 <= 0x3d)) {
gd = 256 + max_dl_ext2 * 4;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
"Ext Guaranteed bit rate for downlink: %u Mbps", gd);
}
if ((max_dl_ext2 > 0x3d) && (max_dl_ext2 <= 0xa1)) {
gd = 500 + (max_dl_ext2-0x3d) * 10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
"Ext Guaranteed bit rate for downlink: %u Mbps", gd);
}
if ((max_dl_ext2 > 0xba) && (max_dl_ext2 <= 0xfa)) {
gd = 1500 + (max_dl_ext2-0xa1) * 10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
"Ext Guaranteed bit rate for uplink: %u Mbps", gd);
}
}
if(length > 20) {
/* Maximum bit rate for uplink (extended-2), octet 21
* This field is an extension of the Maximum bit rate for uplink in octet 8. The coding is identical to that of the Maximum bit
* rate for downlink (extended).
*/
if (guar_ul_ext2 == 0)
proto_tree_add_text(ext_tree_qos, tvb, offset + (17 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Maximum bit rate for uplink in octet 9 and octet 15.");
if ((max_ul_ext2 > 0) && (max_ul_ext2 <= 0x3d)) {
md = 256 + max_ul_ext2 * 4;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
"Ext Maximum bit rate for uplink: %u Mbps", md);
}
if ((max_ul_ext2 > 0x3d) && (max_ul_ext2 <= 0xa1)) {
md = 500 + (max_ul_ext2-0x3d) * 10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
"Ext Maximum bit rate for uplink: %u Mbps", md);
}
if ((max_ul_ext2 > 0xa1) && (max_ul_ext2 <= 0xf6)) {
md = 1500 + (max_ul_ext2-0xa1)*10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
"Ext Maximum bit rate for uplink: %u Mbps", md);
}
/* Guaranteed bit rate for uplink (extended-2), octet 22 */
if (max_ul_ext2 == 0)
proto_tree_add_text(ext_tree_qos, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Maximum bit rate for uplink in octet 13 and octet 16.");
if ((max_ul_ext2 > 0) && (max_ul_ext2 <= 0x3d)) {
gd = 256 + max_ul_ext2 * 4;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
"Ext Guaranteed bit rate for uplink: %u Mbps", gd);
}
if ((max_ul_ext2 > 0x3d) && (max_ul_ext2 <= 0xa1)) {
gd = 500 + (max_ul_ext2-0x3d) * 10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
"Ext Guaranteed bit rate for uplink: %u Mbps", gd);
}
if ((max_ul_ext2 > 0xba) && (max_ul_ext2 <= 0xfa)) {
gd = 1500 + (max_ul_ext2-0xa1) * 10;
proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
"Ext Guaranteed bit rate for uplink: %u Mbps", gd);
}
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return retval;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Dissect 3GPP AVP 5 3GPP-GPRS Negotiated QoS profile. svn path=/trunk/; revision=32622
2010-05-01 14:58:03 +00:00
/* Diameter 3GPP AVP Code: 5 3GPP-GPRS Negotiated QoS profile */
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_diameter_3gpp_qosprofile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) {
Dissect 3GPP AVP 5 3GPP-GPRS Negotiated QoS profile. svn path=/trunk/; revision=32622
2010-05-01 14:58:03 +00:00
decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3);
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
return tvb_reported_length(tvb);
Dissect 3GPP AVP 5 3GPP-GPRS Negotiated QoS profile. svn path=/trunk/; revision=32622
2010-05-01 14:58:03 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static const gchar *
dissect_radius_qos_umts(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo _U_)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3);
The UMTS GTP QoS Profile is a UTF-8-encoded string. So use tvb_get_string_enc() with ENC_UTF_8|ENC_NA. Use tvb_reported_length() while we're at it. Change-Id: I75bfa9abb23ca411dca5844dd56fe062d16319e0 Reviewed-on: https://code.wireshark.org/review/380 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25 18:59:31 +00:00
return tvb_get_string_enc(wmem_packet_scope(), tvb, 0, tvb_reported_length(tvb), ENC_UTF_8|ENC_NA);
Radius Dictionary Support Part 2: the code svn path=/trunk/; revision=14925
2005-07-15 21:12:27 +00:00
}
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
#define MAX_APN_LENGTH 100
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static void
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
decode_apn(tvbuff_t * tvb, int offset, guint16 length, proto_tree * tree, proto_item *item)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
guint8 str[MAX_APN_LENGTH+1];
guint curr_len;
Updates from Michal Melerowicz. svn path=/trunk/; revision=4650
2002-01-31 09:59:22 +00:00
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
/* init buffer and copy it */
Initialize whole buffer in GTP dissector Bug:10216 Change-Id: Ib7de616d50937eb43b16daa4067ee0de9edc8ec7 Reviewed-on: https://code.wireshark.org/review/2562 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22 20:53:35 +00:00
memset(str, 0, MAX_APN_LENGTH+1);
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
tvb_memcpy(tvb, str, offset, length<MAX_APN_LENGTH?length:MAX_APN_LENGTH);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
curr_len = 0;
while ((curr_len < length) && (curr_len < MAX_APN_LENGTH))
{
guint step = str[curr_len];
str[curr_len] = '.';
curr_len += step+1;
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Fix some spelling & grammar. Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907 Reviewed-on: https://code.wireshark.org/review/4054 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-09 18:05:52 +00:00
/* Highlight bytes including the first length byte */
High light bytes including the first lenght byte in the APN name. svn path=/trunk/; revision=45856
2012-11-01 08:24:08 +00:00
proto_tree_add_string(tree, hf_gtp_apn, tvb, offset, length, str+1);
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
if(item){
proto_item_append_text(item, ": %s", str+1);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
static void
decode_fqdn(tvbuff_t * tvb, int offset, guint16 length, proto_tree * tree)
{
guint8 *fqdn = NULL;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int name_len, tmp;
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
if (length > 0) {
name_len = tvb_get_guint8(tvb, offset);
if (name_len < 0x20) {
Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 15:30:58 +00:00
fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, length - 1, ENC_ASCII);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
for (;;) {
if (name_len >= length - 1)
break;
tmp = name_len;
name_len = name_len + fqdn[tmp] + 1;
fqdn[tmp] = '.';
}
} else
Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 15:30:58 +00:00
fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
proto_tree_add_string(tree, hf_gtp_fqdn, tvb, offset, length, fqdn);
}
}
Fix some duplicate display filter names. svn path=/trunk/; revision=40591
2012-01-19 21:01:52 +00:00
/*
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
* GPRS: 9.60 v7.6.0, chapter 7.9.20
* UMTS: 29.060 v4.0, chapter 7.7.29 PDP Context
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* TODO: unify addr functions
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
guint8 ggsn_addr_len, apn_len, trans_id, ea;
guint8 pdp_type_num, pdp_addr_len;
guint16 length;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree *ext_tree_pdp;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_pdp = proto_tree_add_subtree(tree, tvb, offset, length + 3, ett_gtp_ies[GTP_EXT_PDP_CNTXT], NULL,
val_to_str_ext_const(GTP_EXT_PDP_CNTXT, &gtp_val_ext, "Unknown message"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
GTP: add dissection of Extended End User Address Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02 21:04:58 +00:00
ea = (tvb_get_guint8(tvb, offset + 3) >> 7) & 0x01;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_extended_end_user_address, tvb, offset + 3, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_vplmn_address_allowed, tvb, offset + 3, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_activity_status_indicator, tvb, offset + 3, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_reordering_required, tvb, offset + 3, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_nsapi, tvb, offset + 3, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_cntxt_sapi, tvb, offset + 4, 1, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (gtp_version) {
case 0:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
decode_qos_gprs(tvb, offset + 5, ext_tree_pdp, "QoS subscribed", 0);
decode_qos_gprs(tvb, offset + 8, ext_tree_pdp, "QoS requested", 0);
decode_qos_gprs(tvb, offset + 11, ext_tree_pdp, "QoS negotiated", 0);
offset = offset + 14;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + 5;
offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS subscribed", 1);
offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS requested", 1);
offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS negotiated", 1);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_sequence_number_down, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_pdp, hf_gtp_sequence_number_up, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_pdp, hf_gtp_send_n_pdu_number, tvb, offset + 4, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_receive_n_pdu_number, tvb, offset + 5, 1, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (gtp_version) {
case 0:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_uplink_flow_label_signalling, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + 8;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 1:
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_cp, tvb, offset + 6, 4, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_data, tvb, offset + 10, 4, ENC_BIG_ENDIAN);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_context_identifier, tvb, offset + 14, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + 15;
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
pdp_type_num = tvb_get_guint8(tvb, offset + 1);
pdp_addr_len = tvb_get_guint8(tvb, offset + 2);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_organization, tvb, offset, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_type, tvb, offset + 1, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_length, tvb, offset + 2, 1, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (pdp_addr_len > 0) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
switch (pdp_type_num) {
case 0x21:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_ipv4, tvb, offset + 3, 4, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
case 0x57:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_ipv6, tvb, offset + 3, 16, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
default:
break;
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
offset = offset + 3 + pdp_addr_len;
ggsn_addr_len = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_address_length, tvb, offset, 1, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (ggsn_addr_len) {
case 4:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_address_for_control_plane, tvb, offset + 1, 4, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 16:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_address_for_user_traffic, tvb, offset + 1, 16, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
offset = offset + 1 + ggsn_addr_len;
if (gtp_version == 1) {
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ggsn_addr_len = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_2_address_length, tvb, offset, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
switch (ggsn_addr_len) {
case 4:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_2_address_ipv4, tvb, offset + 1, 4, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
case 16:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_ggsn_2_address_ipv6, tvb, offset + 1, 16, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
default:
break;
}
offset = offset + 1 + ggsn_addr_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
apn_len = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_apn_length, tvb, offset, 1, ENC_NA);
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
decode_apn(tvb, offset + 1, apn_len, ext_tree_pdp, NULL);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 1 + apn_len;
/*
* The Transaction Identifier is the 4 or 12 bit Transaction Identifier used in the 3GPP TS 24.008 [5] Session Management
* messages which control this PDP Context. If the length of the Transaction Identifier is 4 bit, the second octet shall be
* set to all zeros. The encoding is defined in 3GPP TS 24.007 [3]. The latest Transaction Identifier sent from SGSN to
* MS is stored in the PDP context IE.
* NOTE: Bit 5-8 of the first octet in the encoding defined in 3GPP TS 24.007 [3] is mapped into bit 1-4 of the first
* octet in this field.
*/
trans_id = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint(ext_tree_pdp, hf_gtp_transaction_identifier, tvb, offset, 2, trans_id);
GTP: add dissection of Extended End User Address Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02 21:04:58 +00:00
offset += 2;
if (ea) {
pdp_type_num = tvb_get_guint8(tvb, offset);
pdp_addr_len = tvb_get_guint8(tvb, offset + 1);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_type, tvb, offset, 1, ENC_NA);
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_length, tvb, offset + 1, 1, ENC_NA);
GTP: add dissection of Extended End User Address Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02 21:04:58 +00:00
if (pdp_addr_len > 0) {
switch (pdp_type_num) {
case 0x21:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_ipv4, tvb, offset + 2, 4, ENC_NA);
GTP: add dissection of Extended End User Address Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02 21:04:58 +00:00
break;
case 0x57:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_address_ipv6, tvb, offset + 2, 16, ENC_NA);
GTP: add dissection of Extended End User Address Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02 21:04:58 +00:00
break;
default:
break;
}
}
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60, v7.6.0, chapter 7.9.21
* UMTS: 29.060, v4.0, chapter 7.7.30
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_apn;
proto_item *te;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_apn = proto_tree_add_subtree(tree, tvb, offset, length + 3, ett_gtp_ies[GTP_EXT_APN], &te,
val_to_str_ext_const(GTP_EXT_APN, &gtp_val_ext, "Unknown field"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_apn, hf_gtp_apn_length, tvb, offset + 1, 2, ENC_NA);
The GTP dissector can't handle long APN names, max is 100. Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932 svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
decode_apn(tvb, offset + 3, length, ext_tree_apn, te);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.22
* 4.08 v. 7.1.2, chapter 10.5.6.3 (p.580)
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
* UMTS: 29.060 v4.0, chapter 7.7.31 Protocol Configuration Options
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* 24.008, v4.2, chapter 10.5.6.3
From Michal Melerowicz: Fixed TFT decoding and processing PPP payload inside of GTP protocol conf options That change also put all GTP preferences under a "gtp" heading; put in another hack so that your old "gtpv0" and "gtpv1" settings are recognized. svn path=/trunk/; revision=5588
2002-05-29 07:35:55 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
int
decode_gtp_proto_conf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
tvbuff_t *next_tvb;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_proto;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_proto = proto_tree_add_subtree(tree, tvb, offset, length + 3,
ett_gtp_proto, NULL, val_to_str_ext_const(GTP_EXT_PROTO_CONF, &gtp_val_ext, "Unknown message"));
Instead of tweaking a "Protocol configuration options" extension header item to look more-or-less like a PPP packet, just dissect it in place and hand off to the appropriate subdissector using the PPP dissector's handoff table (which we export, along with its value_string table for protocol IDs, which we use to report the protocol ID symbolically). This means there's no point in having a configurable option to control whether to do that tweaking; make it an obsolete option. Bring "col_get_writable()" back from the dead, and have the GTP dissector save the current "writable" flag for columns, mark the columns non-writable before calling the subdissector for the PPP configuration protocol, and restore the state of the writable flag, rather than putting the columns back after the PPP configuration protocol's dissector is done. Fix some more typos in comments. Don't register the IP dissector in the "ppp.protocol" table in the GTP dissector's handoff registration routine - it's already being done in the IP dissector's handoff routine. Fix the name for CHAP to match what RFC 1994 calls it (if the name changed, it should be changed in all places, but, at least according to this message, a while ago, from Bob Sutterfield, "since the RFC defines the protocol, the RFC defines the name": http://mail-index.netbsd.org/netbsd-help/1996/05/16/0011.html and the RFC defines the name as "PPP Challenge Handshake Authentication Protocol (CHAP)"). svn path=/trunk/; revision=6617
2002-11-11 19:23:14 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint(ext_tree_proto, hf_gtp_length, tvb, offset + 1, 2, length);
From Michal Melerowicz: Fixed TFT decoding and processing PPP payload inside of GTP protocol conf options That change also put all GTP preferences under a "gtp" heading; put in another hack so that your old "gtpv0" and "gtpv1" settings are recognized. svn path=/trunk/; revision=5588
2002-05-29 07:35:55 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (length < 1)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* The Protocol Configuration Options contains external network protocol options that may be necessary to transfer
* between the GGSN and the MS. The content and the coding of the Protocol Configuration are defined in octet 3-z of the
* Protocol Configuration Options in3GPP TS 24.008 [5].
*/
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset + 3, length);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
de_sm_pco(next_tvb, ext_tree_proto, pinfo, 0, length, NULL, 0);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.23
* UMTS: 29.060 v4.0, chapter 7.7.32
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_gsn_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 addr_type, addr_len;
guint16 length;
guint32 addr_ipv4;
struct e_in6_addr addr_ipv6;
proto_tree *ext_tree_gsn_addr;
proto_item *te;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_gsn_addr = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_gsn_addr, &te, "GSN address : ");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (length) {
case 4:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_gsn_addr, hf_gtp_gsn_address_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
proto_tree_add_ipv4(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 3, 4, addr_ipv4);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 5:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_gsn_addr, hf_gtp_gsn_address_information_element_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
addr_type = tvb_get_guint8(tvb, offset + 3) & 0xC0;
proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_type, tvb, offset + 3, 1, addr_type);
addr_len = tvb_get_guint8(tvb, offset + 3) & 0x3F;
proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_len, tvb, offset + 3, 1, addr_len);
addr_ipv4 = tvb_get_ipv4(tvb, offset + 4);
proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
proto_tree_add_ipv4(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 4, 4, addr_ipv4);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 16:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_gsn_addr, hf_gtp_gsn_address_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
proto_tree_add_ipv6(ext_tree_gsn_addr, hf_gtp_gsn_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 17:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_gsn_addr, hf_gtp_gsn_address_information_element_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
addr_type = tvb_get_guint8(tvb, offset + 3) & 0xC0;
proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_type, tvb, offset + 3, 1, addr_type);
addr_len = tvb_get_guint8(tvb, offset + 3) & 0x3F;
proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_len, tvb, offset + 3, 1, addr_len);
tvb_get_ipv6(tvb, offset + 4, &addr_ipv6);
proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
proto_tree_add_ipv6(ext_tree_gsn_addr, hf_gtp_gsn_ipv6, tvb, offset + 4, 16, (guint8 *) & addr_ipv6);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_item_append_text(te, "unknown type or wrong length");
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.24
* UMTS: 29.060 v4.0, chapter 7.7.33
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Refactor to use dissect_gsm_map_msisdn(). svn path=/trunk/; revision=42036
2012-04-12 14:34:52 +00:00
decode_gtp_msisdn(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
tvbuff_t *next_tvb;
Refactor to use dissect_gsm_map_msisdn(). svn path=/trunk/; revision=42036
2012-04-12 14:34:52 +00:00
proto_tree *ext_tree_proto;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_proto = proto_tree_add_subtree(tree, tvb, offset, length + 3, ett_gtp_proto, NULL,
val_to_str_ext_const(GTP_EXT_MSISDN, &gtp_val_ext, "Unknown message"));
Refactor to use dissect_gsm_map_msisdn(). svn path=/trunk/; revision=42036
2012-04-12 14:34:52 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint(ext_tree_proto, hf_gtp_length, tvb, offset + 1, 2, length);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (length < 1)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset+3, length);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
dissect_gsm_map_msisdn(next_tvb, pinfo, ext_tree_proto);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.34
* 24.008 v4.2, chapter 10.5.6.5
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_qos_umts(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return decode_qos_umts(tvb, offset, tree, "Quality of Service", 2);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.35
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
guint8 xres_len, auth_len;
Fix decoding of quintuplets. svn path=/trunk/; revision=14907
2005-07-12 20:30:33 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Fix decoding of quintuplets. svn path=/trunk/; revision=14907
2005-07-12 20:30:33 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, length + 1, ett_gtp_quint, NULL, "Quintuplet");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
Fix decoding of quintuplets. svn path=/trunk/; revision=14907
2005-07-12 20:30:33 +00:00
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Fix decoding of quintuplets. svn path=/trunk/; revision=14907
2005-07-12 20:30:33 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_rand, tvb, offset, 16, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 16;
xres_len = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_xres_length, tvb, offset, 1, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_xres, tvb, offset, xres_len, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + xres_len;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_quintuplet_ciphering_key, tvb, offset, 16, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 16;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_quintuplet_integrity_key, tvb, offset, 16, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 16;
auth_len = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_authentication_length, tvb, offset, 1, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_auth, tvb, offset, auth_len, ENC_NA);
Fix decoding of quintuplets. svn path=/trunk/; revision=14907
2005-07-12 20:30:33 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return (3 + length);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.36
* 24.008 v4.2, chapter 10.5.6.12
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length, port1, port2, tos;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
guint8 tft_flags, tft_code, no_packet_filters, i, pf_eval, pf_len, pf_content_id, proto;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint pf_offset;
guint32 mask_ipv4, addr_ipv4, ipsec_id, label;
struct e_in6_addr addr_ipv6, mask_ipv6;
proto_tree *ext_tree_tft, *ext_tree_tft_pf, *ext_tree_tft_flags;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item *tee, *pf_item;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_tft = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_tft, NULL, "Traffic flow template");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
tft_flags = tvb_get_guint8(tvb, offset + 3);
tft_code = (tft_flags >> 5) & 0x07;
no_packet_filters = tft_flags & 0x0F;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_tft, hf_gtp_tft_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
From Michal Melerowicz: Fixed TFT decoding and processing PPP payload inside of GTP protocol conf options That change also put all GTP preferences under a "gtp" heading; put in another hack so that your old "gtpv0" and "gtpv1" settings are recognized. svn path=/trunk/; revision=5588
2002-05-29 07:35:55 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_tft_flags = proto_tree_add_subtree(ext_tree_tft, tvb, offset + 3, 1, ett_gtp_tft_flags, NULL, "TFT flags");
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_uint(ext_tree_tft_flags, hf_gtp_tft_code, tvb, offset + 3, 1, tft_flags);
proto_tree_add_uint(ext_tree_tft_flags, hf_gtp_tft_spare, tvb, offset + 3, 1, tft_flags);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_uint(ext_tree_tft_flags, hf_gtp_tft_number, tvb, offset + 3, 1, tft_flags);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 4;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
for (i = 0; i < no_packet_filters; i++) {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
tee = proto_tree_add_item(ext_tree_tft, hf_gtp_tft_packet_filter_id, tvb, offset, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ext_tree_tft_pf = proto_item_add_subtree(tee, ett_gtp_tft_pf);
offset++;
if (tft_code != 2) {
pf_eval = tvb_get_guint8(tvb, offset);
pf_len = tvb_get_guint8(tvb, offset + 1);
proto_tree_add_uint(ext_tree_tft_pf, hf_gtp_tft_eval, tvb, offset, 1, pf_eval);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_tft_pf, hf_gtp_tft_content_length, tvb, offset + 1, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + 2;
pf_offset = 0;
while (pf_offset < pf_len) {
pf_content_id = tvb_get_guint8(tvb, offset + pf_offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
pf_item = proto_tree_add_item(ext_tree_tft_pf, hf_gtp_tft_content_id, tvb, offset + pf_offset, 1, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
switch (pf_content_id) {
/* address IPv4 and mask = 8 bytes */
case 0x10:
addr_ipv4 = tvb_get_ipv4(tvb, offset + pf_offset + 1);
mask_ipv4 = tvb_get_ipv4(tvb, offset + pf_offset + 5);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x10: IPv4/mask: %s/%s", ip_to_str((guint8 *) & addr_ipv4),
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ip_to_str((guint8 *) & mask_ipv4));
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_len(pf_item, 9);
pf_offset += 9;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* address IPv6 and mask = 32 bytes */
case 0x20:
tvb_get_ipv6(tvb, offset + pf_offset + 1, &addr_ipv6);
tvb_get_ipv6(tvb, offset + pf_offset + 17, &mask_ipv6);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x20: IPv6/mask: %s/%s",
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ip6_to_str((struct e_in6_addr *) &addr_ipv6), ip6_to_str((struct e_in6_addr *) &mask_ipv6));
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_len(pf_item, 33);
pf_offset += 33;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* protocol identifier/next header type = 1 byte */
case 0x30:
proto = tvb_get_guint8(tvb, offset + pf_offset + 1);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x30: IPv4 protocol identifier/IPv6 next header: %u (%x)",
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto, proto);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_len(pf_item, 2);
pf_offset += 2;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* single destination port type = 2 bytes */
case 0x40:
port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x40: destination port: %u", port1);
proto_item_set_len(pf_item, 3);
pf_offset += 3;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* destination port range type = 4 bytes */
case 0x41:
port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
port2 = tvb_get_ntohs(tvb, offset + pf_offset + 3);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x41: destination port range: %u - %u", port1, port2);
proto_item_set_len(pf_item, 5);
pf_offset += 5;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* single source port type = 2 bytes */
case 0x50:
port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x50: source port: %u", port1);
proto_item_set_len(pf_item, 3);
pf_offset += 3;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* source port range type = 4 bytes */
case 0x51:
port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
port2 = tvb_get_ntohs(tvb, offset + pf_offset + 3);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x51: source port range: %u - %u", port1, port2);
proto_item_set_len(pf_item, 5);
pf_offset += 5;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* security parameter index type = 4 bytes */
case 0x60:
ipsec_id = tvb_get_ntohl(tvb, offset + pf_offset + 1);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x60: security parameter index: %x", ipsec_id);
proto_item_set_len(pf_item, 5);
pf_offset += 5;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* type of service/traffic class type = 2 bytes */
case 0x70:
tos = tvb_get_ntohs(tvb, offset + pf_offset + 1);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x70: Type of Service/Traffic Class: %u (%x)", tos, tos);
proto_item_set_len(pf_item, 3);
pf_offset += 3;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
/* flow label type = 3 bytes */
case 0x80:
label = tvb_get_ntoh24(tvb, offset + pf_offset + 1) & 0x0FFFFF;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "ID 0x80: Flow Label: %u (%x)", label, label);
proto_item_set_len(pf_item, 4);
pf_offset += 4;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
default:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item_set_text(pf_item, "Unknown value: %x ", pf_content_id);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
pf_offset++; /* to avoid infinite loop */
break;
}
}
offset = offset + pf_offset;
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
From Michal Melerowicz: Fixed TFT decoding and processing PPP payload inside of GTP protocol conf options That change also put all GTP preferences under a "gtp" heading; put in another hack so that your old "gtpv0" and "gtpv1" settings are recognized. svn path=/trunk/; revision=5588
2002-05-29 07:35:55 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
* UMTS: 3GPP TS 29.060 version 10.4.0 Release 10, chapter 7.7.37
Fix bug 973: While in 3GPP spec, the last two (Down/up nextPDCP-PDU seq. no.) would be 2 BYTES. So ethreal could not read the message correctly. We have to modify the log to make Ethreal analysis it. Add disection of TargetID. svn path=/trunk/; revision=18228
2006-05-27 22:09:07 +00:00
* Type = 138 (Decimal)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* 25.413(RANAP) TargetID
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
* There are several CRs to to this IE make sure to check with a recent spec if dissection is questioned.
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_TARGET_ID], NULL, "Target Identification");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 1;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
/* Quote from specification:
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
* The Target Identification information element contains the identification of a target RNC. Octets 4-n shall contain a
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
* non-transparent copy of the corresponding IEs (see subclause 7.7.2) and be encoded as specified in Figure 51 below.
* The "Target RNC-ID" part of the "Target ID" parameter is specified in 3GPP TS 25.413 [7].
* NOTE 1: The ASN.1 parameter "Target ID" is forwarded non-transparently in order to maintain backward compatibility.
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
* NOTE 2: The preamble of the "Target RNC-ID" (numerical value of e.g. 0x20) however shall not be included in
* octets 4-n. Also the optional "iE-Extensions" parameter shall not be included into the GTP IE.
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
*/
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
/* Octet 4-6 MCC + MNC */
dissect_e212_mcc_mnc(tvb, pinfo, ext_tree, offset, TRUE);
offset+=3;
/* Octet 7-8 LAC */
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
proto_tree_add_item(ext_tree, hf_gtp_rai_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
offset+=2;
/* Octet 9 RAC */
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
proto_tree_add_item(ext_tree, hf_gtp_rai_rac, tvb, offset, 1, ENC_BIG_ENDIAN);
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
offset++;
/* Octet 10-11 RNC-ID*/
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
proto_tree_add_item(ext_tree, hf_gtp_target_rnc_id, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
/* If the optional Extended RNC-ID is not included, then the length variable 'n' = 8 and the overall length of the IE is 11
* octets. Otherwise, 'n' = 10 and the overall length of the IE is 13 octets
*/
if(length == 10){
proto_tree_add_item(ext_tree, hf_gtp_target_ext_rnc_id, tvb, offset, 2, ENC_BIG_ENDIAN);
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.38
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_utran_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_UTRAN_CONT], NULL, "UTRAN transparent Container");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 1;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Fix a copy/paste error and factorize dissection of extension header length and next extension header svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
proto_tree_add_item(ext_tree, hf_gtp_utran_field, tvb, offset, length, ENC_NA);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.39
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rab_setup(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
guint32 teid;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
proto_tree *ext_tree_rab_setup;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_rab_setup = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_rab_setup, NULL, "Radio Access Bearer Setup Information");
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_rab_setup, hf_gtp_rab_setup_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree_rab_setup, hf_gtp_nsapi, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (length > 1) {
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
teid = tvb_get_ntohl(tvb, offset + 4);
proto_tree_add_uint(ext_tree_rab_setup, hf_gtp_teid_data, tvb, offset + 4, 4, teid);
switch (length) {
case 12:
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_item(ext_tree_rab_setup, hf_gtp_rnc_ipv4, tvb, offset + 8, 4, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
case 24:
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_item(ext_tree_rab_setup, hf_gtp_rnc_ipv6, tvb, offset + 8, 16, ENC_NA);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
break;
default:
break;
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.40
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_hdr_list(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int i;
guint8 length, hdr;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_hdr_list;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_guint8(tvb, offset + 1);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_hdr_list = proto_tree_add_subtree(tree, tvb, offset, 2 + length, ett_gtp_hdr_list, NULL,
val_to_str_ext_const(GTP_EXT_HDR_LIST, &gtp_val_ext, "Unknown"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_text(ext_tree_hdr_list, tvb, offset + 1, 1, "Number of Extension Header Types in list (i.e., length) : %u", length);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
for (i = 0; i < length; i++) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
hdr = tvb_get_guint8(tvb, offset + 2 + i);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Fix a copy/paste error and factorize dissection of extension header length and next extension header svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
proto_tree_add_text(ext_tree_hdr_list, tvb, offset + 2 + i, 1, "No. %u --> Extension Header Type value : %s (0x%02x)", i + 1,
From Lakshmi Narayana Madala : GTP dissector enhanced to support UDP Port extension header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418 svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
val_to_str_const(hdr, next_extension_header_fieldvals, "Unknown Extension Header Type"), hdr);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 2 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.41
* TODO: find TriggerID description
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_trigger_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint16 length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
If the tvbuff pointer is null in "alloc_field_info()", get the data source name from "pi.compat_top_tvb", which should always be set to the tvbuff that refers to the data that old-style dissectors are currently working on. Arrange that it be so set in those dissectors that create alternate data sources and call other dissectors, and also arrange that "pi.len" and "pi.captured_len" be set appropriately as well. svn path=/trunk/; revision=3286
2001-04-10 19:10:10 +00:00
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
proto_tree_add_text(tree, tvb, offset, 3 + length, "%s length : %u", val_to_str_ext_const(GTP_EXT_TRIGGER_ID, &gtp_val_ext, "Unknown"), length);
If the tvbuff pointer is null in "alloc_field_info()", get the data source name from "pi.compat_top_tvb", which should always be set to the tvbuff that refers to the data that old-style dissectors are currently working on. Arrange that it be so set in those dissectors that create alternate data sources and call other dissectors, and also arrange that "pi.len" and "pi.captured_len" be set appropriately as well. svn path=/trunk/; revision=3286
2001-04-10 19:10:10 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
If the tvbuff pointer is null in "alloc_field_info()", get the data source name from "pi.compat_top_tvb", which should always be set to the tvbuff that refers to the data that old-style dissectors are currently working on. Arrange that it be so set in those dissectors that create alternate data sources and call other dissectors, and also arrange that "pi.len" and "pi.captured_len" be set appropriately as well. svn path=/trunk/; revision=3286
2001-04-10 19:10:10 +00:00
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: not present
* UMTS: 29.060 v4.0, chapter 7.7.42
* TODO: find OMC-ID description
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_omc_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint16 length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
proto_tree_add_text(tree, tvb, offset, 3 + length, "%s length : %u", val_to_str_ext_const(GTP_EXT_OMC_ID, &gtp_val_ext, "Unknown"), length);
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.25
* UMTS: 29.060 v6.11.0, chapter 7.7.44 Charging Gateway Address
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_chrg_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
guint32 addr_ipv4;
struct e_in6_addr addr_ipv6;
proto_tree *ext_tree_chrg_addr;
proto_item *te;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_chrg_addr = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CHRG_ADDR], &te,
"%s : ", val_to_str_ext_const(GTP_EXT_CHRG_ADDR, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
proto_tree_add_text(ext_tree_chrg_addr, tvb, offset + 1, 2, "%s length : %u", val_to_str_ext_const(GTP_EXT_CHRG_ADDR, &gtp_val_ext, "Unknown"), length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (length) {
case 4:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
proto_tree_add_ipv4(ext_tree_chrg_addr, hf_gtp_chrg_ipv4, tvb, offset + 3, 4, addr_ipv4);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 16:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
proto_tree_add_ipv6(ext_tree_chrg_addr, hf_gtp_chrg_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_item_append_text(te, "unknown type or wrong length");
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
* UMTS: 29.060 V9.4.0, chapter 7.7.43 RAN Transparent Container
* The information in the value part of the RAN Transparent Container IE contains all information elements (starting with
* and including the BSSGP "PDU Type") in either of the RAN INFORMATION, RAN INFORMATION REQUEST,
* RAN INFORMATION ACK or RAN INFORMATION ERROR messages respectively as specified in 3GPP TS 48.018
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_ran_tr_cont(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RAN_TR_CONT], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_RAN_TR_CONT, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if (bssgp_handle) {
No C++/C99 comments, as not all compilers handle them. Use #if 0/#endif instead. svn path=/trunk/; revision=53734
2013-12-02 21:18:25 +00:00
#if 0
col_set_fence(pinfo->cinfo, COL_INFO);
#endif
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
call_dissector(bssgp_handle, next_tvb, pinfo, ext_tree);
Get rid of non-ASCII characters in comments. Convert "4-space tabs" to spaces. svn path=/trunk/; revision=39735
2011-11-04 18:43:23 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.45 PDP Context Prioritization
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
decode_gtp_pdp_cont_prio(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_PDP_CONT_PRIO], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_PDP_CONT_PRIO, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.45A Additional RAB Setup Information
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_add_rab_setup_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_ADD_RAB_SETUP_INF], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_ADD_RAB_SETUP_INF, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.47 SGSN Number
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ssgn_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_SSGN_NO], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_SSGN_NO, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.48 Common Flags
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_common_flgs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_COMMON_FLGS], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_COMMON_FLGS, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
/* Dual Address Bearer Flag */
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_dual_addr_bearer_flg, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Upgrade QoS Supported */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_upgrd_qos_sup, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* NRSN bit field */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_nrsn, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* No QoS negotiation */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_no_qos_neg, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* MBMS Counting Information bi */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_cnt_inf, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* RAN Procedures Ready */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_ran_pcd_rdy, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* MBMS Service Type */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_srv_type, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Prohibit Payload Compression */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_ppc, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.49
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_apn_res(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_apn_res;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_apn_res = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_APN_RES], NULL,
"%s : ", val_to_str_ext_const(GTP_EXT_APN_RES, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_apn_res, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Restriction Type value */
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
if (length != 1) {
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
proto_tree_add_expert_format(tree, pinfo, &ei_gtp_ext_length_mal, tvb, 0, length, "Wrong length indicated. Expected 1, got %u", length);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3 + length;
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
}
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_apn_res, hf_gtp_ext_apn_res, tvb, offset, length, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
* UMTS: 29.060 v6.11.0, chapter 7.7.50 RAT Type
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
* RAT Type
* Type = 151 (Decimal)
*/
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_rat_type(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_rat_type;
proto_item *te;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_rat_type = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RAT_TYPE], &te,
val_to_str_ext_const(GTP_EXT_RAT_TYPE, &gtp_val_ext, "Unknown"));
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_rat_type, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* RAT Type value */
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
if (length != 1) {
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
proto_tree_add_expert_format(tree, pinfo, &ei_gtp_ext_length_mal, tvb, 0, length, "Wrong length indicated. Expected 1, got %u", length);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3 + length;
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
}
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_rat_type, hf_gtp_ext_rat_type, tvb, offset, length, ENC_BIG_ENDIAN);
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
proto_item_append_text(te, ": %s", val_to_str_const(tvb_get_guint8(tvb,offset), gtp_ext_rat_type_vals, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
let packet-gsm_a_gm.c dissect Protocol Configuration Options. svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
return 3 + length;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.51
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
* User Location Information
* Type = 152 (Decimal)
*/
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static const
gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int offset = 0;
guint8 geo_loc_type;
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
guint16 length = tvb_reported_length(tvb);
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* Geographic Location Type */
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
geo_loc_type = tvb_get_guint8(tvb, offset);
offset++;
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474 : Dissect LTE RADIUS AVP 3GPP-User-Location-Info svn path=/trunk/; revision=43700
2012-07-13 21:18:35 +00:00
switch(geo_loc_type) {
case 0:
/* Geographic Location field included and it holds the Cell Global
* Identification (CGI) of where the user currently is registered.
* CGI is defined in sub-clause 4.3.1 of 3GPP TS 23.003 [2].
*/
/* Use gsm_a's function to dissect Geographic Location by faking disc ( last 0) */
be_cell_id_aux(tvb, tree, pinfo, offset, length - 1, NULL, 0, 0);
break;
case 1:
/* Geographic Location field included and it holds the Service
* Area Identity (SAI) of where the user currently is registered.
* SAI is defined in sub-clause 9.2.3.9 of 3GPP TS 25.413 [7].
*/
/* Use gsm_a's function to dissect Geographic Location by faking disc ( last 4) */
be_cell_id_aux(tvb, tree, pinfo, offset, length - 1, NULL, 0, 4);
offset = offset + 5;
proto_tree_add_item(tree, hf_gtp_ext_sac, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
case 2:
/* Geographic Location field included and it holds the Routing
* Area Identification (RAI) of where the user currently is
* registered. RAI is defined in sub-clause 4.2 of 3GPP TS 23.003
* [2].
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_rai_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
offset+=2;
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
proto_tree_add_item(tree, hf_gtp_rai_rac, tvb, offset, 1, ENC_BIG_ENDIAN);
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474 : Dissect LTE RADIUS AVP 3GPP-User-Location-Info svn path=/trunk/; revision=43700
2012-07-13 21:18:35 +00:00
break;
case 128:
/* Geographic Location field included and it holds the Tracking
* Area Identity (TAI) of where the user currently is registered.
* TAI is defined in sub-clause 8.21.4 of 3GPP TS 29.274.
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_tac, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
case 129:
/* Geographic Location field included and it holds the E-UTRAN Cell
* Global Identifier (ECGI) of where the user currently is registered.
* ECGI is defined in sub-clause 8.21.5 of 3GPP TS 29.274.
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_eci, tvb, offset, 4, ENC_BIG_ENDIAN);
break;
case 130:
/* Geographic Location field included and it holds the Tracking
* Area Identity (TAI) and E-UTRAN CellGlobal Identifier (ECGI)
* of where the user currently is registered.
* TAI is defined in sub-clause 8.21.4 of 3GPP TS 29.274.
* ECGI is defined in sub-clause 8.21.5 of 3GPP TS 29.274.
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_tac, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_eci, tvb, offset, 4, ENC_BIG_ENDIAN);
break;
default:
proto_tree_add_text(tree, tvb, offset, length - 1, "Unknown Location type data");
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
Rename a couple of to_str functions to have ep_ in the name. This makes it obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249
2013-12-19 15:49:09 +00:00
return tvb_bytes_to_ep_str(tvb, 0, length);
- Add application Id:s to Diameter - Further dissect 3GPP Radius AVP:s. svn path=/trunk/; revision=24293
2008-02-08 16:32:12 +00:00
}
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
/*
* 7.7.51 User Location Information
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_usr_loc_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
proto_tree *ext_tree, *rai_tree;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 geo_loc_type;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_USR_LOC_INF], NULL,
val_to_str_ext_const(GTP_EXT_USR_LOC_INF, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
/* Geographic Location Type */
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
geo_loc_type = tvb_get_guint8(tvb, offset);
offset++;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
switch(geo_loc_type) {
case 0:
/* Geographic Location field included and it holds the Cell Global
* Identification (CGI) of where the user currently is registered.
* CGI is defined in sub-clause 4.3.1 of 3GPP TS 23.003 [2].
*/
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
/* Use gsm_a's function to dissect Geographic Location by faking disc ( last 0) */
be_cell_id_aux(tvb, ext_tree, pinfo, offset, length - 1, NULL, 0, 0);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
case 1:
/* Geographic Location field included and it holds the Service
* Area Identity (SAI) of where the user currently is registered.
* SAI is defined in sub-clause 9.2.3.9 of 3GPP TS 25.413 [7].
*/
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
/* Use gsm_a's function to dissect Geographic Location by faking disc ( last 4) */
be_cell_id_aux(tvb, ext_tree, pinfo, offset, length - 1, NULL, 0, 4);
offset = offset + 5;
proto_tree_add_item(ext_tree, hf_gtp_ext_sac, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
case 2:
/* Geographic Location field included and it holds the Routing
* Area Identification (RAI) of where the user currently is
* registered. RAI is defined in sub-clause 4.2 of 3GPP TS 23.003
* [2].
*/
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
rai_tree = proto_tree_add_subtree(ext_tree, tvb, offset + 1, 7, ett_gtp_uli_rai, NULL, "Routeing Area Identity (RAI)");
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
dissect_e212_mcc_mnc(tvb, pinfo, rai_tree, offset, TRUE);
Extend ULI dissection. svn path=/trunk/; revision=40069
2011-12-02 21:45:45 +00:00
offset+=3;
proto_tree_add_item(rai_tree, hf_gtp_rai_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
offset+=2;
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
proto_tree_add_item(rai_tree, hf_gtp_rai_rac, tvb, offset, 1, ENC_BIG_ENDIAN);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
default:
proto_tree_add_text(tree, tvb, offset, length - 1, "Unknown Location type data");
break;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
static const value_string daylight_saving_time_vals[] = {
{0, "No adjustment"},
{1, "+1 hour adjustment for Daylight Saving Time"},
{2, "+2 hours adjustment for Daylight Saving Time"},
{3, "Reserved"},
{0, NULL}
Fix for bug 2618: Add MS Time Zone interpretation. svn path=/trunk/; revision=25478
2008-06-18 19:59:24 +00:00
};
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.52
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
* MS Time Zone
* Type = 153 (Decimal)
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* The ' MS Time Zone' IE is used to indicate the offset between universal time and local time
* in steps of 15 minutes of where the MS currently resides. The 'Time Zone' field uses the same
Update a comment. svn path=/trunk/; revision=28309
2009-05-08 18:11:39 +00:00
* format as the 'Time Zone' IE in 3GPP TS 24.008 (10.5.3.8)
* its value shall be set as defined in 3GPP TS 22.042
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ms_time_zone(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
proto_item *te;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 data;
char sign;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree_format(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MS_TIME_ZONE], &te,
"%s: ", val_to_str_ext_const(GTP_EXT_MS_TIME_ZONE, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* 3GPP TS 23.040 version 6.6.0 Release 6
* 9.2.3.11 TP-Service-Centre-Time-Stamp (TP-SCTS)
* :
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* The Time Zone indicates the difference, expressed in quarters of an hour,
* between the local time and GMT. In the first of the two semi-octets,
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* the first bit (bit 3 of the seventh octet of the TP-Service-Centre-Time-Stamp field)
* represents the algebraic sign of this difference (0: positive, 1: negative).
*/
Fix for bug 2618: Add MS Time Zone interpretation. svn path=/trunk/; revision=25478
2008-06-18 19:59:24 +00:00
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
data = tvb_get_guint8(tvb, offset);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
sign = (data & 0x08) ? '-' : '+';
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
data = (data >> 4) + (data & 0x07) * 10;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint_format_value(ext_tree, hf_gtp_timezone, tvb, offset, 1, data, "GMT %c %d hours %d minutes", sign, data / 4, data % 4 * 15);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_item_append_text(te, "GMT %c %d hours %d minutes", sign, data / 4, data % 4 * 15);
Fix for bug 2618: Add MS Time Zone interpretation. svn path=/trunk/; revision=25478
2008-06-18 19:59:24 +00:00
offset++;
data = tvb_get_guint8(tvb, offset) & 0x3;
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
proto_tree_add_text(ext_tree, tvb, offset, 1, "%s", val_to_str_const(data, daylight_saving_time_vals, "Unknown"));
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.53
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
* International Mobile Equipment Identity (and Software Version) (IMEI(SV))
* Type = 154 (Decimal)
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_imeisv(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_imeisv;
proto_item *te;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
Squelch a bunch of compiler warnings. svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
const char *digit_str;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_imeisv = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_IMEISV], &te,
val_to_str_ext_const(GTP_EXT_IMEISV, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_imeisv, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* IMEI(SV)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* The structure of the IMEI and IMEISV are defined in sub-clause 6.2 of 3GPP TS 23.003 [2].
* The 'IMEI(SV)' field shall contain the IMEISV if it is available. If only the IMEI is available,
* then the IMEI shall be placed in the IMEI(SV) field and the last semi-octet of octet 11 shall be
* set to '1111'. Both IMEI and IMEISV are BCD encoded.
*/
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length);
Replace a couple of implementations of unpack_digits() with tvb_bcd_dig_to_wmem_packet_str(). Change-Id: Ic9e740345fb3a748f6df4f624441bb947bbd9429 Reviewed-on: https://code.wireshark.org/review/3797 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 19:44:20 +00:00
digit_str = tvb_bcd_dig_to_wmem_packet_str(next_tvb, 0, -1, NULL, FALSE);
Restore hf_gtp_ext_rat_type as it's used in decode_gtp_rat_type(). Fix IMEI(SV) While we're at it. svn path=/trunk/; revision=29053
2009-07-10 12:26:39 +00:00
proto_tree_add_string(ext_imeisv, hf_gtp_ext_imeisv, next_tvb, 0, -1, digit_str);
Squelch a bunch of compiler warnings. svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
proto_item_append_text(te, ": %s", digit_str);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.54
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
* CAMEL Charging Information Container
* Type = 155 (Decimal)
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_camel_chg_inf_con(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CAMEL_CHG_INF_CON], NULL,
val_to_str_ext_const(GTP_EXT_CAMEL_CHG_INF_CON, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.55
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS UE Context
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_ue_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_UE_CTX], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_UE_CTX, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.56
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Temporary Mobile Group Identity (TMGI)
Decode som MBMS elements. svn path=/trunk/; revision=24184
2008-01-24 22:21:13 +00:00
* The Temporary Mobile Group Identity (TMGI) information element contains
* a TMGI allocated by the BM-SC. It is coded as in the value part defined
* in 3GPP T S 24.008 [5] (i.e. the IEI and octet length indicator are not included).
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
*/
Decode som MBMS elements. svn path=/trunk/; revision=24184
2008-01-24 22:21:13 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_tmgi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree, *tmgi_tree;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_item *ti;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_TMGI], NULL,
val_to_str_ext_const(GTP_EXT_TMGI, &gtp_val_ext, "Unknown"));
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types: FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
ti = proto_tree_add_item(ext_tree, hf_gtp_tmgi, tvb, offset, length, ENC_NA);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
tmgi_tree = proto_item_add_subtree(ti, ett_gtp_tmgi);
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length);
Change the signature of elem_fcn():ns to include pinfo. svn path=/trunk/; revision=36443
2011-04-04 14:37:25 +00:00
de_mid(next_tvb, tmgi_tree, pinfo, 0, length, NULL, 0);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.57
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* RIM Routing Address
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rim_ra(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RIM_RA], NULL,
val_to_str_ext_const(GTP_EXT_RIM_RA, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
/* To dissect the Address the Routing Address discriminator must be known */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/*
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* Octets 4-n are coded according to 3GPP TS 48.018 [20] 11.3.77 RIM Routing Information IE octets 4-n.
*/
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
proto_tree_add_item(ext_tree, hf_gtp_rim_routing_addr, tvb, offset, length, ENC_NA);
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.58
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS Protocol Configuration Options
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_prot_conf_opt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_PROT_CONF_OPT], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_PROT_CONF_OPT, &gtp_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.59
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS Session Duration
*/
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
/* Used for Diameter */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_gtp_mbms_ses_dur(tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree, void *data _U_)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
int offset = 0;
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
From Liangfeng via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7012 : According to 3GPP R7//R8/R9/R10/R11, AVP 'MBMS-Session-Duration' has 3 octets. First 17 bits indicate seconds, the rest of bits(7 bits) represents days. However, in the source file packet-gtp.c, it parse the AVP reversely -- taking first 7 bits as days, the rest of 17 bits as seconds. This patch fixes that. svn path=/trunk/; revision=41849
2012-03-30 17:40:01 +00:00
proto_tree_add_item(tree, hf_gtp_mbms_ses_dur_days, tvb, offset, 3, ENC_BIG_ENDIAN);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(tree, hf_gtp_mbms_ses_dur_s, tvb, offset, 3, ENC_BIG_ENDIAN);
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3;
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_ses_dur(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_SES_DUR], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_SES_DUR, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* The MBMS Session Duration is defined in 3GPP TS 23.246 [26].
* The MBMS Session Duration information element indicates the estimated
* session duration of the MBMS service data transmission if available.
* The payload shall be encoded as per the MBMS-Session-Duration AVP defined
* in 3GPP TS 29.061 [27], excluding the AVP Header fields
* (as defined in IETF RFC 3588 [36], section 4.1).
*/
/* The MBMS-Session-Duration AVP (AVP code 904) is of type OctetString
* with a length of three octets and indicates the estimated session duration
* (MBMS Service data transmission). Bits 0 to 16 (17 bits) express seconds, for which the
* maximum allowed value is 86400 seconds. Bits 17 to 23 (7 bits) express days,
* for which the maximum allowed value is 18 days. For the whole session duration the seconds
* and days are added together and the maximum session duration is 19 days.
*/
From Liangfeng via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7012 : According to 3GPP R7//R8/R9/R10/R11, AVP 'MBMS-Session-Duration' has 3 octets. First 17 bits indicate seconds, the rest of bits(7 bits) represents days. However, in the source file packet-gtp.c, it parse the AVP reversely -- taking first 7 bits as days, the rest of 17 bits as seconds. This patch fixes that. svn path=/trunk/; revision=41849
2012-03-30 17:40:01 +00:00
proto_tree_add_item(ext_tree, hf_gtp_mbms_ses_dur_days, tvb, offset, 3, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_mbms_ses_dur_s, tvb, offset, 3, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.60
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS Service Area
*/
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_gtp_3gpp_mbms_service_area(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int offset = 0;
Fix a few cases of proto_item_add_subtree() using the wrong tree: Coverity 916-918; Also: Fix some indentation: e.g., "4 space tabs". svn path=/trunk/; revision=36585
2011-04-12 15:39:19 +00:00
guint8 no_of_mbms_sa_codes;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int i;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* The MBMS Service Area is defined in 3GPP TS 23.246 [26].
* The MBMS Service Area information element indicates the area over
* which the Multimedia Broadcast/Multicast Service is to be distributed.
* The payload shall be encoded as per the MBMS-Service-Area AVP defined
* in 3GPP TS 29.061 [27], excluding the AVP Header fields (as defined in
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* IETF RFC 3588 [36], section 4.1).
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
*/
/* Number N of MBMS service area codes coded as:
* 1 binary value is '00000000'
* ... ...
* 256 binary value is '11111111'
*/
no_of_mbms_sa_codes = tvb_get_guint8(tvb, offset) + 1;
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
proto_tree_add_uint(tree, hf_gtp_no_of_mbms_sa_codes, tvb, offset, 1, no_of_mbms_sa_codes);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* A consecutive list of N MBMS service area codes
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* The MBMS Service Area Identity and its semantics are defined in 3GPP TS 23.003
* The length of an MBMS service area code is 2 octets.
*/
for (i = 0; i < no_of_mbms_sa_codes; i++) {
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
proto_tree_add_item(tree, hf_gtp_mbms_sa_code, tvb, offset, 2, ENC_BIG_ENDIAN);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + 2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Fix a few cases of proto_item_add_subtree() using the wrong tree: Coverity 916-918; Also: Fix some indentation: e.g., "4 space tabs". svn path=/trunk/; revision=36585
2011-04-12 15:39:19 +00:00
return offset;
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_mbms_sa(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
guint16 length;
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_SA], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_SA, &gtp_val_ext, "Unknown"));
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length-3);
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_gtp_3gpp_mbms_service_area(next_tvb, pinfo, ext_tree, NULL);
Add sub dissection of AVP MBMS Service Area. svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.61
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Source RNC PDCP context info
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_src_rnc_pdp_ctx_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_SRC_RNC_PDP_CTX_INF], NULL,
val_to_str_ext_const(GTP_EXT_SRC_RNC_PDP_CTX_INF, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.62
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
* Additional Trace Info
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_add_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_ADD_TRS_INF], NULL,
val_to_str_ext_const(GTP_EXT_ADD_TRS_INF, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.63
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Hop Counter
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_hop_count(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_HOP_COUNT], NULL,
val_to_str_ext_const(GTP_EXT_HOP_COUNT, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.64
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Selected PLMN ID
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_sel_plmn_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_SES_ID], NULL,
val_to_str_ext_const(GTP_EXT_SEL_PLMN_ID, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
From Katrina Zhang sligtly modified. - Add dissection of Selected PLMN ID. - Put enterpice id in the tree - Filter for UTRAN Transparent Field. svn path=/trunk/; revision=47252
2013-01-24 09:59:06 +00:00
dissect_e212_mcc_mnc(tvb, pinfo, ext_tree, offset, FALSE);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.65
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS Session Identifier
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_ses_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_SES_ID], NULL, val_to_str_ext_const(GTP_EXT_MBMS_SES_ID, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.66
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS 2G/3G Indicator
*/
Decode som MBMS elements. svn path=/trunk/; revision=24184
2008-01-24 22:21:13 +00:00
static const value_string gtp_mbs_2g_3g_ind_vals[] = {
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{0, "2G only"},
{1, "3G only"},
{2, "Both 2G and 3G"},
{0, NULL}
Decode som MBMS elements. svn path=/trunk/; revision=24184
2008-01-24 22:21:13 +00:00
};
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_2g_3g_ind(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_2G_3G_IND], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_2G_3G_IND, &gtp_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* MBMS 2G/3G Indicator */
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_mbs_2g_3g_ind, tvb, offset, 1, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.67
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Enhanced NSAPI
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_enh_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_ENH_NSAPI], NULL, val_to_str_ext_const(GTP_EXT_ENH_NSAPI, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.68
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Additional MBMS Trace Info
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_add_mbms_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_ADD_MBMS_TRS_INF], NULL,
val_to_str_ext_const(GTP_EXT_ADD_MBMS_TRS_INF, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.69
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS Session Identity Repetition Number
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_ses_id_rep_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_SES_ID_REP_NO], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_SES_ID_REP_NO, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 3GPP TS 29.060 version 7.8.0 Release 7
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* MBMS Time To Data Transfer
*/
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
/* Used for Diameter */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_gtp_mbms_time_to_data_tr(tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree, void *data _U_)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int offset = 0;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
guint8 time_2_dta_tr;
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
time_2_dta_tr = tvb_get_guint8(tvb, offset) + 1;
proto_tree_add_uint(tree, hf_gtp_time_2_dta_tr, tvb, offset, 1, time_2_dta_tr);
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3;
Make it possible to do subdissection of Diameter AVP:s and add dissection of some 3GPP AVP:s. svn path=/trunk/; revision=24211
2008-01-27 21:06:33 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_mbms_time_to_data_tr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint8 time_2_dta_tr;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_TIME_TO_DATA_TR], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_TIME_TO_DATA_TR, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* TODO add decoding of data
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* The MBMS Time To Data Transfer is defined in 3GPP TS 23.246 [26].
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* The MBMS Time To Data Transfer information element contains a
* MBMS Time To Data Transfer allocated by the BM-SC.
* The payload shall be encoded as per the MBMS-Time-To-Data-Transfer AVP
* defined in 3GPP TS 29.061 [27], excluding the AVP Header fields
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* (as defined in IETF RFC 3588 [36], section 4.1).
*/
/* The coding is specified as per the Time to MBMS Data Transfer Value Part Coding
* of the Time to MBMS Data Transfer IE in 3GPP TS 48.018
* Bits
* 8 7 6 5 4 3 2 1
* 0 0 0 0 0 0 0 0 1s
* 0 0 0 0 0 0 0 1 2s
* 0 0 0 0 0 0 1 0 3s
* :
* 1 1 1 1 1 1 1 1 256s
*/
time_2_dta_tr = tvb_get_guint8(tvb, offset) + 1;
proto_tree_add_uint(ext_tree, hf_gtp_time_2_dta_tr, tvb, offset, 1, time_2_dta_tr);
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.71
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* PS Handover Request Context
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_ps_ho_req_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_PS_HO_REQ_CTX], NULL,
val_to_str_ext_const(GTP_EXT_PS_HO_REQ_CTX, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.72
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* BSS Container
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_bss_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_BSS_CONT], NULL,
val_to_str_ext_const(GTP_EXT_BSS_CONT, &gtpv1_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/*
* The content of this container is defined in 3GPP TS 48.018
*/
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.73
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* Cell Identification
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_cell_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CELL_ID], NULL,
val_to_str_ext_const(GTP_EXT_CELL_ID, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/*
* for PS handover from A/Gb mode, the identification of a target cell (Cell ID 1) and the identification of the
* source cell (Cell ID 2) as defined in 3GPP TS 48.018 [20].
*
* for PS handover from Iu mode, the identification of a target cell (Cell ID 1)) and the identification of the
* source RNC (RNC-ID) as defined in 3GPP TS 48.018
*/
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.74
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* PDU Numbers
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_pdu_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_PDU_NO], NULL,
val_to_str_ext_const(GTP_EXT_PDU_NO, &gtpv1_val_ext, "Unknown"));
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.75
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
* BSSGP Cause
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_bssgp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_BSSGP_CAUSE], NULL,
val_to_str_ext_const(GTP_EXT_BSSGP_CAUSE, &gtpv1_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/*
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* The BSSGP Cause information element contains the cause as defined in 3GPP TS 48.018
*/
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_bssgp_cause, tvb, offset, 2, ENC_BIG_ENDIAN);
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
Add some IE:s svn path=/trunk/; revision=17817
2006-04-05 16:05:29 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Wrap newly added (svn rev 22007) but unused "Required MBMS bearer capabilities 7.7.76" function called decode_gtp_mbms_bearer_cap in an #if 0 block to get the Unix buildbots going again. Left code intact on the asumption that it is about to be used since it was recently added. svn path=/trunk/; revision=22014
2007-05-31 01:29:16 +00:00
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* Required MBMS bearer capabilities 7.7.76
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_mbms_bearer_cap(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_REQ_MBMS_BEARER_CAP], NULL,
val_to_str_ext_const(GTP_EXT_REQ_MBMS_BEARER_CAP, &gtpv1_val_ext, "Unknown"));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=36703
2011-04-18 17:48:23 +00:00
#if 0 /* Fix Dead Store Warning */
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=36703
2011-04-18 17:48:23 +00:00
#endif
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* The payload shall be encoded as per the
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
* Required-MBMS-Bearer-Capabilities AVP defined in 3GPP TS 29.061 [27],
* excluding the AVP Header fields (as defined in IETF RFC 3588 [36], section 4.1).
*/
/* TODO Add decoding (call Diameter dissector???) */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
return 3 + length;
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
}
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* RIM Routing Address Discriminator 7.7.77
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
static const value_string gtp_bssgp_ra_discriminator_vals[] = {
{ 0, "A Cell Identifier is used to identify a GERAN cell" },
{ 1, "A Global RNC-ID is used to identify a UTRAN RNC" },
{ 2, "An eNB identifier is used to identify an E-UTRAN eNodeB or HeNB" },
Remove a couple trailing commas svn path=/trunk/; revision=41538
2012-03-13 16:49:43 +00:00
{ 0, NULL }
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
};
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_rim_ra_disc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RIM_ROUTING_ADDR_DISC], NULL,
val_to_str_ext_const(GTP_EXT_RIM_ROUTING_ADDR_DISC, &gtpv1_val_ext, "Unknown"));
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset = offset + 2;
Fix some duplicate display filter names. svn path=/trunk/; revision=40591
2012-01-19 21:01:52 +00:00
/* Octet 4 bits 4 - 1 is coded according to 3GPP TS 48.018 [20]
Get rid of non-ASCII characters in comments. Convert "4-space tabs" to spaces. svn path=/trunk/; revision=39735
2011-11-04 18:43:23 +00:00
* RIM Routing Information IE octet 3 bits 4 - 1.
* Bits 8 - 5 are coded "0000".
*/
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
proto_tree_add_item(ext_tree, hf_gtp_bssgp_ra_discriminator, tvb, offset, 1, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
return 3 + length;
}
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* List of set-up PFCs 7.7.78
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static int
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
decode_gtp_lst_set_up_pfc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_LIST_OF_SETUP_PFCS], NULL,
val_to_str_ext_const(GTP_EXT_LIST_OF_SETUP_PFCS, &gtpv1_val_ext, "Unknown"));
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
return 3 + length;
}
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* PS Handover XID Parameters 7.7.79
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_ps_handover_xid(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
guint8 sapi;
guint8 xid_par_len;
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_PS_HANDOVER_XIP_PAR], NULL,
val_to_str_ext_const(GTP_EXT_PS_HANDOVER_XIP_PAR, &gtpv1_val_ext, "Unknown"));
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset = offset + 2;
sapi = tvb_get_guint8(tvb, offset) & 0x0F;
proto_tree_add_uint(ext_tree, hf_gtp_sapi, tvb, offset, 1, sapi);
offset++;
xid_par_len = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(ext_tree, hf_gtp_xid_par_len, tvb, offset, 1, xid_par_len);
offset++;
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (sndcpxid_handle) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(sndcpxid_handle, next_tvb, pinfo, tree);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
} else
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree_add_text(tree, tvb, offset, 0, "Data");
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 4 + length;
}
FromVincent Helfre: A patch for the PS handover XID parameters Information element, which uses the sndcp-xid dissector. svn path=/trunk/; revision=25934
2008-08-05 18:49:02 +00:00
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* MS Info Change Reporting Action 7.7.80
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_ms_inf_chg_rep_act(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MS_INF_CHG_REP_ACT], NULL,
val_to_str_ext_const(GTP_EXT_MS_INF_CHG_REP_ACT, &gtpv1_val_ext, "Unknown"));
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
return 3 + length;
}
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* Direct Tunnel Flags 7.7.81
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_direct_tnl_flg(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_DIRECT_TUNNEL_FLGS], NULL,
val_to_str_ext_const(GTP_EXT_DIRECT_TUNNEL_FLGS, &gtpv1_val_ext, "Unknown"));
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
/* TODO add decoding of data */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_ei, tvb, offset, 1, ENC_BIG_ENDIAN);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_gcsi, tvb, offset, 1, ENC_BIG_ENDIAN);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_dti, tvb, offset, 1, ENC_BIG_ENDIAN);
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
offset++;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
return 3 + length;
}
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* Correlation-ID 7.7.82
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_corrl_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CORRELATION_ID], NULL,
val_to_str_ext_const(GTP_EXT_CORRELATION_ID, &gtpv1_val_ext, "Unknown"));
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset = offset + 2;
/* TODO add decoding of data */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
return 3 + length;
}
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
/*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* Bearer Control Mode 7.7.83
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
* version 10.0.0
Update value strings. svn path=/trunk/; revision=22007
2007-05-30 19:02:14 +00:00
*/
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
static const value_string gtp_pdp_bcm_type_vals[] = {
{0, "MS_only"},
{1, "MS/NW"},
{0, NULL}
};
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_bearer_cntrl_mod(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
{
Add some extension IE:s - APN Restriction - RAT Type - IMEI(SV) svn path=/trunk/; revision=17648
2006-03-16 20:13:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_BEARER_CONTROL_MODE], NULL,
val_to_str_ext_const(GTP_EXT_BEARER_CONTROL_MODE, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
offset = offset + 2;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_bcm, tvb, offset, 1, ENC_BIG_ENDIAN);
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
return 3 + length;
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
}
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
/*
* 7.7.84 MBMS Flow Identifier
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_mbms_flow_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_FLOW_ID], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_FLOW_ID, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* 4-n MBMS Flow Identifier */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
proto_tree_add_item(ext_tree, hf_gtp_mbms_flow_id, tvb, offset, length, ENC_NA);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.85 MBMS IP Multicast Distribution
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_mbms_ip_mcast_dist(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_IP_MCAST_DIST], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_IP_MCAST_DIST, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.86 MBMS Distribution Acknowledgement
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
/* Table 7.7.86.1: Distribution Indication values */
static const value_string gtp_mbms_dist_indic_vals[] = {
{0, "No RNCs have accepted IP multicast distribution"},
{1, "All RNCs have accepted IP multicast distribution"},
{2, "Some RNCs have accepted IP multicast distribution"},
{3, "Spare. For future use."},
{0, NULL}
};
static int
decode_gtp_mbms_dist_ack(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MBMS_DIST_ACK], NULL,
val_to_str_ext_const(GTP_EXT_MBMS_DIST_ACK, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* Distribution Indication values */
proto_tree_add_item(ext_tree, hf_gtp_mbms_dist_indic, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.87 Reliable INTER RAT HANDOVER INFO
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_reliable_irat_ho_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RELIABLE_IRAT_HO_INF], NULL,
val_to_str_ext_const(GTP_EXT_RELIABLE_IRAT_HO_INF, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.88 RFSP Index
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_rfsp_index(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
From Katrina Zhang: Add/fix RFSP dissection. svn path=/trunk/; revision=53163
2013-11-08 05:58:13 +00:00
guint16 length, rfsp;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RFSP_INDEX], NULL,
val_to_str_ext_const(GTP_EXT_RFSP_INDEX, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
From Katrina Zhang: Add/fix RFSP dissection. svn path=/trunk/; revision=53163
2013-11-08 05:58:13 +00:00
rfsp = tvb_get_ntohs(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint(ext_tree, hf_gtp_rfsp_index, tvb, offset, length, rfsp+1);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.89 PDP Type
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
*/
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.90 Fully Qualified Domain Name (FQDN)
*/
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
static int
decode_gtp_fqdn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, length + 3, ett_gtp_ies[GTP_EXT_FQDN], NULL,
val_to_str_ext_const(GTP_EXT_FQDN, &gtp_val_ext, "Unknown field"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_fqdn_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
decode_fqdn(tvb, offset + 3, length, ext_tree);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
return 3 + length;
}
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
/*
A bit more indentation cleanup svn path=/trunk/; revision=35749
2011-02-02 02:44:14 +00:00
* 7.7.91 Evolved Allocation/Retention Priority I
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_evolved_allc_rtn_p1(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
proto_tree *ext_tree;
Replace some blurbs with NULL svn path=/trunk/; revision=35728
2011-01-31 21:09:28 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_EVO_ALLO_RETE_P1], NULL,
val_to_str_ext_const(GTP_EXT_EVO_ALLO_RETE_P1, &gtpv1_val_ext, "Unknown"));
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Replace some blurbs with NULL svn path=/trunk/; revision=35728
2011-01-31 21:09:28 +00:00
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree, hf_gtp_earp_pvi, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree, hf_gtp_earp_pl, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree, hf_gtp_earp_pci, tvb, offset, 1, ENC_BIG_ENDIAN);
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
return 3 + length;
Replace some blurbs with NULL svn path=/trunk/; revision=35728
2011-01-31 21:09:28 +00:00
Add dissection of Evolved Allocation/Retention Priority I IE. svn path=/trunk/; revision=35723
2011-01-31 16:25:26 +00:00
Add a cople of IE's svn path=/trunk/; revision=26975
2008-12-12 20:36:57 +00:00
}
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
/*
* 7.7.92 Evolved Allocation/Retention Priority II
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
*/
static int
decode_gtp_evolved_allc_rtn_p2(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_EVO_ALLO_RETE_P2], NULL,
val_to_str_ext_const(GTP_EXT_EVO_ALLO_RETE_P2, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
proto_tree_add_item(ext_tree, hf_gtp_nsapi, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
Add missing element NSAP to IE Evolved Allocation/Retention Priority II. svn path=/trunk/; revision=49474
2013-05-21 05:08:50 +00:00
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
proto_tree_add_item(ext_tree, hf_gtp_earp_pvi, tvb, offset, 1, ENC_BIG_ENDIAN);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree, hf_gtp_earp_pl, tvb, offset, 1, ENC_BIG_ENDIAN);
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
proto_tree_add_item(ext_tree, hf_gtp_earp_pci, tvb, offset, 1, ENC_BIG_ENDIAN);
return 3 + length;
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.93 Extended Common Flags
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_extended_common_flgs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_EXTENDED_COMMON_FLGS], NULL,
val_to_str_ext_const(GTP_EXT_EXTENDED_COMMON_FLGS, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.94 User CSG Information (UCI)
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_uci(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_UCI], NULL,
val_to_str_ext_const(GTP_EXT_UCI, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.95 CSG Information Reporting Action
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_csg_inf_rep_act(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CSG_INF_REP_ACT], NULL,
val_to_str_ext_const(GTP_EXT_CSG_INF_REP_ACT, &gtpv1_val_ext, "Unknown"));
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.96 CSG ID
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
*/
static int
decode_gtp_csg_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CSG_ID], NULL,
val_to_str_ext_const(GTP_EXT_CSG_ID, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.97 CSG Membership Indication (CMI)
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
*/
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
static int
decode_gtp_cmi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_CMI], NULL,
val_to_str_ext_const(GTP_EXT_CMI, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
}
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.98 APN Aggregate Maximum Bit Rate (APN-AMBR)
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
*/
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
static int
Add basic IE dissection for new IE:s svn path=/trunk/; revision=42158
2012-04-20 12:32:17 +00:00
decode_gtp_apn_ambr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
proto_tree *ext_tree;
proto_item *te;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_RELIABLE_IRAT_HO_INF], NULL,
val_to_str_ext_const(GTP_EXT_AMBR, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* APN Aggregate Maximum Bit Rate (APN-AMBR) is defined in clause 9.9.4.2 of 3GPP TS 24.301 [42], but shall be
* formatted as shown in Figure 7.7.98-1 as Unsigned32 binary integer values in kbps (1000 bits per second).
*/
/* 4 to 7 APN-AMBR for Uplink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_apn_ambr_ul, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
offset+=4;
/* 8 to 11 APN-AMBR for Downlink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_apn_ambr_dl, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
}
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.99 UE Network Capability
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
*/
static int
decode_gtp_ue_network_cap(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_UE_NETWORK_CAP], NULL,
val_to_str_ext_const(GTP_EXT_UE_NETWORK_CAP, &gtpv1_val_ext, "Unknown"));
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
de_emm_ue_net_cap(tvb, ext_tree, pinfo, offset, length, NULL, 0);
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Dissect IE Type = 106 fully. svn path=/trunk/; revision=42023
2012-04-11 15:52:14 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.100 UE-AMBR
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_ue_ambr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
proto_item *te;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_APN_AMBR_WITH_NSAPI], NULL,
val_to_str_ext_const(GTP_EXT_APN_AMBR_WITH_NSAPI, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* 4 to 7 Subscribed UE-AMBR for Uplink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_sub_ue_ambr_ul, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
offset+=4;
/* 8 to 11 Subscribed UE-AMBR for Downlink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_sub_ue_ambr_dl, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
offset+=4;
/* Authorized UE-AMBR for Uplink and Downlink fields are present in the IE only if the sender has their valid values
* available. Otherwise, the fields from m to (n+3) shall not be present.
*/
if(offset >= length)
return 3 + length;
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* m to (m+3) Authorized UE-AMBR for Uplink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_auth_ue_ambr_ul, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
offset+=4;
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* (m+4) to (n+3) Authorized UE-AMBR for Downlink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_auth_ue_ambr_dl, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.101 APN-AMBR with NSAPI
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_apn_ambr_with_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
proto_item *te;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_UE_AMBR], NULL,
val_to_str_ext_const(GTP_EXT_UE_AMBR, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_nsapi, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
offset++;
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* 5 to 8 Authorized APN-AMBR for Uplink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_auth_apn_ambr_ul, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
offset+=4;
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* 9 to12 Authorized APN-AMBR for Downlink */
te = proto_tree_add_item(ext_tree, hf_gtp_ext_auth_apn_ambr_dl, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " kbps");
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.102 GGSN Back-Off Time
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
Fully dissect more IEs svn path=/trunk/; revision=42259
2012-04-26 13:23:16 +00:00
/* Table 7.7.102.1: GGSN Back-Off Time information element */
static const value_string gtp_ggsn_back_off_time_units_vals[] = {
{0, "value is incremented in multiples of 2 seconds"},
{1, "value is incremented in multiples of 1 minute"},
{2, "value is incremented in multiples of 10 minutes"},
{3, "value is incremented in multiples of 1 hour"},
{4, "value is incremented in multiples of 10 hours"},
{5, "value indicates that the timer is infinite"},
{0, NULL}
};
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
static int
decode_gtp_ggsn_back_off_time(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_GGSN_BACK_OFF_TIME], NULL,
val_to_str_ext_const(GTP_EXT_GGSN_BACK_OFF_TIME, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* 4 Timer unit Timer value */
proto_tree_add_item(ext_tree, hf_gtp_ext_ggsn_back_off_time_units, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree, hf_gtp_ext_ggsn_back_off_timer, tvb, offset, 2, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.103 Signalling Priority Indication
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_sig_pri_ind(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_SIG_PRI_IND], NULL,
val_to_str_ext_const(GTP_EXT_SIG_PRI_IND, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.104 Signalling Priority Indication with NSAPI
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_sig_pri_ind_w_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_SIG_PRI_IND_W_NSAPI], NULL,
val_to_str_ext_const(GTP_EXT_SIG_PRI_IND_W_NSAPI, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.105 Higher bitrates than 16 Mbps flag
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
static const value_string gtp_higher_br_16mb_flg_vals[] = {
{0, "Not allowed"},
{1, "Allowed"},
{0, NULL}
};
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
static int
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
decode_gtp_higher_br_16mb_flg(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_HIGHER_BR_16MB_FLG], NULL,
val_to_str_ext_const(GTP_EXT_HIGHER_BR_16MB_FLG, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* Higher bitrates than 16 Mbps flag */
proto_tree_add_item(ext_tree, hf_gtp_higher_br_16mb_flg, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.106 Max MBR/APN-AMBR
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_max_mbr_apn_ambr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint32 max_ul;
guint32 max_dl;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_MAX_MBR_APN_AMBR], NULL,
val_to_str_ext_const(GTP_EXT_MAX_MBR_APN_AMBR, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
/* Max MBR/APN-AMBR for uplink */
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
max_ul = tvb_get_ntohl(tvb, offset);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_uint_format_value(ext_tree, hf_gtp_max_mbr_apn_ambr_ul, tvb, offset, 4, max_ul, "%u %s",
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
(max_ul) > 1000 ? max_ul/1000 : max_ul,
(max_ul) > 1000 ? "Mbps" : "kbps");
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 4;
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
/* Max MBR/APN-AMBR for downlink */
max_dl = tvb_get_ntohl(tvb, offset);
proto_tree_add_uint_format_value(ext_tree, hf_gtp_max_mbr_apn_ambr_dl, tvb, offset, 4, max_dl, "%u %s",
(max_dl) > 1000 ? max_dl/1000 : max_dl,
(max_dl) > 1000 ? "Mbps" : "kbps");
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.107 Additional MM context for SRVCC
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_add_mm_ctx_srvcc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_ADD_MM_CTX_SRVCC], NULL,
val_to_str_ext_const(GTP_EXT_ADD_MM_CTX_SRVCC, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.108 Additional flags for SRVCC
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_add_flgs_srvcc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_ADD_FLGS_SRVCC], NULL,
val_to_str_ext_const(GTP_EXT_ADD_FLGS_SRVCC, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.109 STN-SR
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_stn_sr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_STN_SR], NULL,
val_to_str_ext_const(GTP_EXT_STN_SR, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.110 C-MSISDN
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
*/
static int
decode_gtp_c_msisdn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_C_MSISDN], NULL,
val_to_str_ext_const(GTP_EXT_C_MSISDN, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
/*
Add comments about new IEs svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
* 7.7.111 Extended RANAP Cause
*/
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
static int
decode_gtp_ext_ranap_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
proto_tree *ext_tree;
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_ies[GTP_EXT_EXT_RANAP_CAUSE], NULL,
val_to_str_ext_const(GTP_EXT_EXT_RANAP_CAUSE, &gtpv1_val_ext, "Unknown"));
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ie_id, tvb, offset, 1, ENC_BIG_ENDIAN);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
offset++;
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_tree_add_expert(ext_tree, pinfo, &ei_gtp_undecoded, tvb, offset, length);
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
return 3 + length;
Basic IE dissectoon for more IE:s svn path=/trunk/; revision=42198
2012-04-22 19:28:21 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 12.15
* UMTS: 33.015
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_rel_pack(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length, n, number;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_rel_pack;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_rel_pack = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_rel_pack, NULL,
"Sequence numbers of released packets IE");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
n = 0;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
while (n < length) {
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
number = tvb_get_ntohs(tvb, offset + 3 + n);
proto_tree_add_text(ext_tree_rel_pack, tvb, offset + 3 + n, 2, "%u", number);
n = n + 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 12.15
* UMTS: 33.015
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_can_pack(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length, n, number;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_can_pack;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_can_pack = proto_tree_add_subtree(tree, tvb, offset, 3 + length, ett_gtp_can_pack, NULL,
"Sequence numbers of cancelled packets IE");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
n = 0;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
while (n < length) {
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
number = tvb_get_ntohs(tvb, offset + 3 + n);
proto_tree_add_text(ext_tree_can_pack, tvb, offset + 3 + n, 2, "%u", number);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
n += 2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
/* CDRs dissector
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
* 3GPP TS 32.295 version 9.0.0 Release 9
*/
Use gprscdr to dissect CDRs. svn path=/trunk/; revision=35763
2011-02-02 17:51:00 +00:00
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
static const value_string gtp_cdr_fmt_vals[] = {
{1, "Basic Encoding Rules (BER)"},
{2, "Unaligned basic Packed Encoding Rules (PER)"},
{3, "Aligned basic Packed Encoding Rules (PER)"},
{0, NULL}
};
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
decode_gtp_data_req(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length, cdr_length;
guint8 no, format, app_id, rel_id, ver_id, i;
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
proto_tree *ext_tree, *ver_tree, *cdr_dr_tree;
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
proto_item *fmt_item;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree = proto_tree_add_subtree(tree, tvb, offset, 1, ett_gtp_ext, NULL,
val_to_str_ext_const(GTP_EXT_DATA_REQ, &gtp_val_ext, "Unknown message"));
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
offset++;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
length = tvb_get_ntohs(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint(ext_tree, hf_gtp_length, tvb, offset, 2, length);
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
offset+=2;
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
GTP: allow empty Data Record Packet IE Bug: 10277 Change-Id: I4edf330fa1c44a52d985d70555c7756954fb9364 Reviewed-on: https://code.wireshark.org/review/3008 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-11 17:49:46 +00:00
if (length == 0) {
return 3;
}
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
/* Octet 4 Number of Data Records */
no = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree, hf_gtp_number_of_data_records, tvb, offset, 1, ENC_NA);
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
offset++;
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
/* Octet 5 Data Record Format */
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
format = tvb_get_guint8(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
fmt_item = proto_tree_add_item(ext_tree, hf_gtp_data_record_format, tvb, offset, 1, ENC_NA);
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
offset++;
/* The value range is 1-255 in decimal. The value '0' should not be used.
* Only the values 1-10 and 51-255 can be used for standards purposes.
* Values in the range of 11-50 are to be configured only by operators, and are not subject to standardization.
*/
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if(format < 4) {
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
proto_item_append_text(fmt_item, " %s", val_to_str_const(format, gtp_cdr_fmt_vals, "Unknown"));
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
/* Octet 6 -7 Data Record Format Version
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
* 8 7 6 5 4 3 2 1
* 6 Application Identifier Release Identifier
* 7 Version Identifier
*/
app_id = tvb_get_guint8(tvb,offset);
rel_id = app_id & 0x0f;
app_id = app_id >>4;
ver_id =tvb_get_guint8(tvb,offset+1);
/* The second octet (#7 in Data Record Packet IE) identifies the version of the TS used to encode the CDR,
* i.e. its value corresponds to the second digit of the version number of the document [51]
* (as shown on the cover sheet), plus '1'.
* E.g. for version 3.4.0, the Version Identifier would be "5".
* In circumstances where the second digit is an alphabetical character, (e.g. 3.b.0), the corresponding ASCII value shall
* be taken, e.g. the Version Identifier would be "66" (ASCII(b)).
*/
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if(ver_id < 0x65)
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
ver_id = ver_id -1;
/* XXX We don't handle ASCCI version */
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ver_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, 2, ett_gtp_cdr_ver, NULL,
"Data record format version: AppId %u Rel %u.%u.0", app_id,rel_id,ver_id);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ver_tree, hf_gtp_cdr_app, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ver_tree, hf_gtp_cdr_rel, tvb, offset, 1, ENC_BIG_ENDIAN);
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
offset++;
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ver_tree, hf_gtp_cdr_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
offset++;
for(i = 0; i < no; ++i) {
cdr_length = tvb_get_ntohs(tvb, offset);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
cdr_dr_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, cdr_length+2,
ett_gtp_cdr_dr, NULL, "Data record %d", i + 1);
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
proto_tree_add_text(cdr_dr_tree, tvb, offset, 2, "Length: %u", cdr_length);
offset+=2;
proto_tree_add_text(cdr_dr_tree, tvb, offset, cdr_length, "Content");
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset);
Use gprscdr to dissect CDRs. svn path=/trunk/; revision=35763
2011-02-02 17:51:00 +00:00
From David Wei: Change GTP and GTPv2 dissectors for pre-Rel7 UEs that do not support bitrates higher than 16 Mbps. svn path=/trunk/; revision=42381
2012-05-02 07:23:32 +00:00
/* XXX this is for release 6, may not work for higher releases */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if(format==1) {
Dissect Release 8 CDR:s svn path=/trunk/; revision=43624
2012-07-09 14:09:59 +00:00
if(rel_id == 6){
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_gprscdr_GPRSCallEventRecord_PDU(next_tvb, pinfo, cdr_dr_tree, NULL);
Update to handle version 9. svn path=/trunk/; revision=50981
2013-07-28 19:25:14 +00:00
}else if((rel_id == 8)||(rel_id == 9)){
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_gprscdr_GPRSRecord_PDU(next_tvb, pinfo, cdr_dr_tree, NULL);
Dissect Release 8 CDR:s svn path=/trunk/; revision=43624
2012-07-09 14:09:59 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
} else {
Get rid of non-ASCII characters in comments. Convert "4-space tabs" to spaces. svn path=/trunk/; revision=39735
2011-11-04 18:43:23 +00:00
/* Do we have a dissector regestering for this data format? */
dissector_try_uint(gtp_cdr_fmt_dissector_table, format, next_tvb, pinfo, cdr_dr_tree);
}
Use gprscdr to dissect CDRs. svn path=/trunk/; revision=35763
2011-02-02 17:51:00 +00:00
Register ett_gtp_bcm. Replace some tabs with spaces. svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
offset = offset + cdr_length;
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
} else {
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
/* Proprietary CDR format */
proto_item_append_text(fmt_item, " Proprietary or un documented format");
}
From Michal Melerowicz: merge gtpv0 and gtpv1 dissectors into one; fix up XXX_to_str routines. svn path=/trunk/; revision=8715
2003-10-16 09:55:10 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (gtpcdr_handle) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(gtpcdr_handle, next_tvb, pinfo, tree);
Dissect a bit more of data records. svn path=/trunk/; revision=35744
2011-02-01 22:47:12 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 12.15
* UMTS: 33.015
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_data_resp(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length, n, number;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_data_resp;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_data_resp = proto_tree_add_subtree(tree, tvb, offset, 3 + length,
ett_gtp_data_resp, NULL, "Requests responded");
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
n = 0;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
while (n < length) {
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
number = tvb_get_ntohs(tvb, offset + 3 + n);
proto_tree_add_text(ext_tree_data_resp, tvb, offset + 3 + n, 2, "%u", number);
n = n + 2;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 12.15
* UMTS: 33.015
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length;
guint32 addr_ipv4;
struct e_in6_addr addr_ipv6;
proto_tree *ext_tree_node_addr;
proto_item *te;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
length = tvb_get_ntohs(tvb, offset + 1);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_node_addr = proto_tree_add_subtree(tree, tvb, offset, 3 + length,
ett_gtp_node_addr, &te, "Node address: ");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_item(ext_tree_node_addr, hf_gtp_node_address_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
switch (length) {
case 4:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
proto_tree_add_ipv4(ext_tree_node_addr, hf_gtp_node_ipv4, tvb, offset + 3, 4, addr_ipv4);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
case 16:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
proto_tree_add_ipv6(ext_tree_node_addr, hf_gtp_node_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
default:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_item_append_text(te, "unknown type or wrong length");
break;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
return 3 + length;
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* GPRS: 9.60 v7.6.0, chapter 7.9.26
* UMTS: 29.060 v4.0, chapter 7.7.46 Private Extension
*
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
*/
Do some more of the relase 6 stuff. svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
From Katrina Zhang sligtly modified. - Add dissection of Selected PLMN ID. - Put enterpice id in the tree - Filter for UTRAN Transparent Field. svn path=/trunk/; revision=47252
2013-01-24 09:59:06 +00:00
decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint16 length, ext_id;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree *ext_tree_priv_ext;
proto_item *te;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
tvbuff_t *next_tvb;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
ext_tree_priv_ext = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_gtp_ext, &te,
"%s : ", val_to_str_ext_const(GTP_EXT_PRIV_EXT, &gtp_val_ext, "Unknown message"));
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
offset++;
length = tvb_get_ntohs(tvb, offset);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
offset += 2;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (length >= 2) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ext_id = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(ext_tree_priv_ext, hf_gtp_ext_id, tvb, offset, 2, ext_id);
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
proto_item_append_text(te, "%s (%u)", val_to_str_ext_const(ext_id, &sminmpec_values_ext, "Unknown"), ext_id);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
offset = offset + 2;
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if (length > 2) {
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length-2);
From Katrina Zhang:Pretify dissection if a dissector exists for the private extension svn path=/trunk/; revision=46857
2012-12-30 09:35:27 +00:00
if(!dissector_try_uint(gtp_priv_ext_dissector_table, ext_id, next_tvb, pinfo, ext_tree_priv_ext)){
proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_val, tvb, offset, length - 2, ENC_NA);
}
Make the _to_str() functions in here take a pointer to a TVB and an offset rather than (generally) a pointer into the TVB. Replace some tabs with spaces (for consistency). Remove a couple unnecessary includes. svn path=/trunk/; revision=36123
2011-03-03 02:18:57 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
return 3 + length;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static int
decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_tree_add_text(tree, tvb, offset, 1, "Unknown extension header");
GTPv1 support and GTPv0 improvements, from Michal Melerowicz and Nicolas Balkota. svn path=/trunk/; revision=3919
2001-09-11 08:14:39 +00:00
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
return tvb_reported_length_remaining(tvb, offset);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
static int
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
{
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
guint8 octet;
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
gtp_hdr_t *gtp_hdr = NULL;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree *gtp_tree = NULL, *ext_tree;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_item *ti = NULL, *tf, *ext_hdr_len_item, *message_item;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
int i, offset = 0, checked_field, mandatory;
gboolean gtp_prime;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
int seq_no = 0;
int flow_label = 0;
guint8 pdu_no, next_hdr = 0;
guint8 ext_hdr_val;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
guint ext_hdr_length;
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
guint16 ext_hdr_pdcpsn;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
gchar *tid_str;
tvbuff_t *next_tvb;
guint8 sub_proto;
guint8 acfield_len = 0;
guint8 control_field;
gtp_msg_hash_t *gcrp = NULL;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
conversation_t *conversation;
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
gtp_conv_info_t *gtp_info;
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
/* Do we have enough bytes for the version and message type? */
if (!tvb_bytes_exist(tvb, 0, 2)) {
/* No - reject the packet. */
return 0;
}
octet = tvb_get_guint8(tvb, 0);
if (((octet >> 5) & 0x07) > 2) {
/* Version > 2; reject the packet */
return 0;
}
octet = tvb_get_guint8(tvb, 1);
Rename value string (and similar) functions to use a consistent pattern. This was done using textual search+replace, not anything syntax-aware, so presumably it got most comments as well (except where there were typos). Use a consistent coding style, and make proper use of the WS_DLL_* defines. Group the functions appropriately in the header. I ended up getting rid of most of the explanatory comments since many of them duplicated what was in the value_string.c file (and were out of sync with the recent updates I made to those in r48633). Presumably most of the comments should be in the .h file not the .c file, but there's enough churn ahead that it's not worth fixing yet. Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467 svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
if (octet == GTP_MSG_UNKNOWN || try_val_to_str(octet, gtp_message_type) == NULL) {
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
/* Unknown message type; reject the packet */
return 0;
}
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
/* Setting everything to 0, so that the TEID is 0 for GTP version 0
* The magic number should perhaps be replaced.
*/
Convert a few more dissectors to wmem API svn path=/trunk/; revision=52053
2013-09-15 10:29:49 +00:00
gtp_hdr = wmem_new0(wmem_packet_scope(), gtp_hdr_t);
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
/* Setting the TEID to -1 to say that the TEID is not valid for this packet */
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
gtp_hdr->teid = -1;
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP");
col_clear(pinfo->cinfo, COL_INFO);
/*
* Do we have a conversation for this connection?
*/
conversation = find_or_create_conversation(pinfo);
/*
* Do we already know this conversation?
*/
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
gtp_info = (gtp_conv_info_t *)conversation_get_proto_data(conversation, proto_gtp);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
if (gtp_info == NULL) {
/* No. Attach that information to the conversation, and add
* it to the list of information structures.
*/
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
gtp_info = (gtp_conv_info_t *)g_malloc(sizeof(gtp_conv_info_t));
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/*Request/response matching tables*/
gtp_info->matched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_matched);
gtp_info->unmatched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_unmatched);
conversation_add_proto_data(conversation, proto_gtp, gtp_info);
gtp_info->next = gtp_info_items;
gtp_info_items = gtp_info;
}
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
gtp_hdr->flags = tvb_get_guint8(tvb, offset);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
if (!(gtp_hdr->flags & 0x10)){
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
gtp_prime = TRUE;
}else{
gtp_prime = FALSE;
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
switch ((gtp_hdr->flags >> 5) & 0x07) {
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
case 0:
gtp_version = 0;
break;
case 1:
gtp_version = 1;
break;
default:
gtp_version = 1;
break;
}
if (tree) {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
proto_tree *flags_tree;
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
ti = proto_tree_add_item(tree, proto_gtp, tvb, 0, -1, ENC_NA);
gtp_tree = proto_item_add_subtree(ti, ett_gtp);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
tf = proto_tree_add_uint(gtp_tree, hf_gtp_flags, tvb, offset, 1, gtp_hdr->flags);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
flags_tree = proto_item_add_subtree(tf, ett_gtp_flags);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
if(gtp_prime) {
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* Octet 8 7 6 5 4 3 2 1
Handle 20 byte GTP' V0 header. svn path=/trunk/; revision=40081
2011-12-03 12:11:01 +00:00
* 1 Version | PT| Spare '1 1 1 '| ' 0/1 '
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
*/
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_tree_add_uint(flags_tree, hf_gtp_prime_flags_ver, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_uint(flags_tree, hf_gtp_flags_pt, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_uint(flags_tree, hf_gtp_flags_spare1, tvb, offset, 1, gtp_hdr->flags);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
/* Bit 1 of octet 1 is not used in GTP' (except in v0), and it is marked '0'
* in the GTP' header. It is in use in GTP' v0 and distinguishes the used header-length.
* In the case of GTP' v0, this bit being marked one (1) indicates the usage of the 6
* octets header. If the bit is set to '0' (usually the case) the 20-octet header is used.
* For all other versions of GTP', this bit is not used and is set to '0'. However,
* this does not suggest the use of the 20-octet header, rather a shorter 6-octet header.
*/
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if(gtp_version == 0) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_tree_add_item(flags_tree, hf_gtp_flags_hdr_length, tvb, offset, 1, ENC_BIG_ENDIAN);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
}
} else {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_tree_add_uint(flags_tree, hf_gtp_flags_ver, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_uint(flags_tree, hf_gtp_flags_pt, tvb, offset, 1, gtp_hdr->flags);
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if(gtp_version == 0) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_tree_add_uint(flags_tree, hf_gtp_flags_spare1, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_boolean(flags_tree, hf_gtp_flags_snn, tvb, offset, 1, gtp_hdr->flags);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
} else {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_tree_add_uint(flags_tree, hf_gtp_flags_spare2, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_boolean(flags_tree, hf_gtp_flags_e, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_boolean(flags_tree, hf_gtp_flags_s, tvb, offset, 1, gtp_hdr->flags);
proto_tree_add_boolean(flags_tree, hf_gtp_flags_pn, tvb, offset, 1, gtp_hdr->flags);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
}
}
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
}
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
offset++;
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
gtp_hdr->message = tvb_get_guint8(tvb, offset);
Set pinfo->link_dir per message not in the IE dissection. svn path=/trunk/; revision=48873
2013-04-16 05:42:17 +00:00
/* Link direction is needed to properly dissect PCO */
switch(gtp_hdr->message){
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
case GTP_MSG_DELETE_PDP_REQ:
case GTP_MSG_UPDATE_PDP_REQ:
case GTP_MSG_CREATE_PDP_REQ:
case GTP_MSG_INIT_PDP_CONTEXT_ACT_REQ:
case GTP_MSG_PDU_NOTIFY_REQ:
case GTP_MSG_PDU_NOTIFY_REJ_REQ:
pinfo->link_dir = P2P_DIR_UL;
break;
case GTP_MSG_DELETE_PDP_RESP:
case GTP_MSG_UPDATE_PDP_RESP:
case GTP_MSG_CREATE_PDP_RESP:
case GTP_MSG_INIT_PDP_CONTEXT_ACT_RESP:
pinfo->link_dir = P2P_DIR_DL;
break;
Set pinfo->link_dir per message not in the IE dissection. svn path=/trunk/; revision=48873
2013-04-16 05:42:17 +00:00
default:
break;
}
From didier gautheron: remove redundant or use faster col_xxx functions - when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(gtp_hdr->message, &gtp_message_type_ext, "Unknown"));
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
message_item = proto_tree_add_uint(gtp_tree, hf_gtp_message_type, tvb, offset, 1, gtp_hdr->message);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
offset++;
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
gtp_hdr->length = tvb_get_ntohs(tvb, offset);
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
proto_tree_add_uint(gtp_tree, hf_gtp_length, tvb, 2, 2, gtp_hdr->length);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
offset += 2;
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
if (gtp_prime) {
seq_no = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
offset += 2;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
/* If GTP' version is 0 and bit 1 is 0 20 bytes header is used, dissect it */
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
if( (gtp_version == 0) && ((gtp_hdr->flags & 0x01) == 0) ) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
/* XXX - is this just like GTPv0? */
flow_label = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_flow_label, tvb, offset, 2, flow_label);
offset += 2;
pdu_no = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_sndcp_number, tvb, offset, 1, pdu_no);
offset += 4;
tid_str = id_to_str(tvb, offset);
proto_tree_add_string(gtp_tree, hf_gtp_tid, tvb, offset, 8, tid_str);
offset += 8;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
}
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
set_actual_length(tvb, offset + gtp_hdr->length);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
} else {
switch (gtp_version) {
case 0:
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
seq_no = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
offset += 2;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
flow_label = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_flow_label, tvb, offset, 2, flow_label);
offset += 2;
pdu_no = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_sndcp_number, tvb, offset, 1, pdu_no);
offset += 4;
tid_str = id_to_str(tvb, offset);
proto_tree_add_string(gtp_tree, hf_gtp_tid, tvb, offset, 8, tid_str);
offset += 8;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
set_actual_length(tvb, offset + gtp_hdr->length);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
break;
case 1:
From Martin Isaksson: - Initiiate GTP header to zero. - Dont' load TEID unconditionaly, it might not be present. svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
gtp_hdr->teid = tvb_get_ntohl(tvb, offset);
proto_tree_add_item(gtp_tree, hf_gtp_teid, tvb, offset, 4, ENC_BIG_ENDIAN);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
offset += 4;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
set_actual_length(tvb, offset + gtp_hdr->length);
/* Are sequence number/N-PDU Number/extension header present?
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
See NOTE 5 of Figure 2 of 3GPP TS 29.060 version 4.3.0
Release 4 - the Sequence Number, N-PDU Number, and
Next Extension Header fields are present if any of
GTP_E_MASK, GTP_S_MASK, or GTP_PN_MASK are set. */
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
if (gtp_hdr->flags & (GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK)) {
/* Those fields are only *interpreted* if the
particular flag for the field is set. */
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
if (gtp_hdr->flags & GTP_S_MASK) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
seq_no = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
offset += 2;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
if (gtp_hdr->flags & GTP_PN_MASK) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
pdu_no = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(gtp_tree, hf_gtp_npdu_number, tvb, offset, 1, pdu_no);
}
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
offset++;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
if (gtp_hdr->flags & GTP_E_MASK) {
next_hdr = tvb_get_guint8(tvb, offset);
Use hf_gtp_ext_hdr_next for all "next header" fields, and get rid of hf_gtp_next. Don't do "dummy" dissection of extension headers that we don't actually dissect - we label them by next extension header type, and dissect them in the default case, which should suffice (until somebody adds dissection for those types). svn path=/trunk/; revision=48075
2013-03-05 00:17:56 +00:00
proto_tree_add_uint(gtp_tree, hf_gtp_ext_hdr_next, tvb, offset, 1, next_hdr);
Fix a copy/paste error and factorize dissection of extension header length and next extension header svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
offset++;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
while (next_hdr != 0) {
ext_hdr_length = tvb_get_guint8(tvb, offset);
tf = proto_tree_add_item(gtp_tree, hf_gtp_ext_hdr, tvb, offset, ext_hdr_length*4, ENC_NA);
ext_tree = proto_item_add_subtree(tf, ett_gtp_ext_hdr);
ext_hdr_len_item = proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_length, tvb, offset,1, ENC_BIG_ENDIAN);
if (ext_hdr_length == 0) {
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, ext_hdr_len_item, &ei_gtp_ext_length_mal,
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
"Extension header length is zero");
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
return tvb_reported_length(tvb);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
}
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
offset++;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
switch (next_hdr) {
case GTP_EXT_HDR_PDCP_SN:
/* PDCP PDU
* 3GPP 29.281 v9.0.0, 5.2.2.2 PDCP PDU Number
*
* "This extension header is transmitted, for
* example in UTRAN, at SRNS relocation time,
* to provide the PDCP sequence number of not
* yet acknowledged N-PDUs. It is 4 octets long,
* and therefore the Length field has value 1.
*
* When used between two eNBs at the X2 interface
* in E-UTRAN, bits 5-8 of octet 2 are spare.
* The meaning of the spare bits shall be set
* to zero.
*
* Wireshark Note: TS 29.060 does not define bit
* 5-6 as spare, so no check is possible unless
* a preference is used.
*/
/* First byte is length (should be 1) */
if (ext_hdr_length == 1) {
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
proto_item* ext_item;
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
ext_hdr_pdcpsn = tvb_get_ntohs(tvb, offset);
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
ext_item = proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_pdcpsn, tvb, offset, 2, ENC_BIG_ENDIAN);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
if (ext_hdr_pdcpsn & 0x700) {
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_add_info(pinfo, ext_item, &ei_gtp_ext_hdr_pdcpsn);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
}
} else {
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, ext_tree, &ei_gtp_ext_length_warn, "The length field for the PDCP SN Extension header should be 1.");
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
}
break;
case GTP_EXT_HDR_UDP_PORT:
/* UDP Port
* 3GPP 29.281 v9.0.0, 5.2.2.1 UDP Port
* "This extension header may be transmitted in
* Error Indication messages to provide the UDP
* Source Port of the G-PDU that triggered the
* Error Indication. It is 4 octets long, and
* therefore the Length field has value 1"
*/
if (ext_hdr_length == 1) {
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
/* UDP Port of source */
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_udp_port, tvb, offset, 2, ENC_BIG_ENDIAN);
} else {
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
/* Bad length */
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, ext_tree, &ei_gtp_ext_length_warn, "The length field for the UDP Port Extension header should be 1.");
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
}
break;
case GTP_EXT_HDR_SUSPEND_REQ:
/* Suspend Request */
break;
case GTP_EXT_HDR_SUSPEND_RESP:
/* Suspend Response */
break;
default:
break;
From Lakshmi Narayana Madala : GTP dissector enhanced to support UDP Port extension header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418 svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
}
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
offset += ext_hdr_length*4 - 2;
From Lakshmi Narayana Madala : GTP dissector enhanced to support UDP Port extension header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418 svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
next_hdr = tvb_get_guint8(tvb, offset);
Use hf_gtp_ext_hdr_next for all "next header" fields, and get rid of hf_gtp_next. Don't do "dummy" dissection of extension headers that we don't actually dissect - we label them by next extension header type, and dissect them in the default case, which should suffice (until somebody adds dissection for those types). svn path=/trunk/; revision=48075
2013-03-05 00:17:56 +00:00
proto_tree_add_uint(ext_tree, hf_gtp_ext_hdr_next, tvb, offset, 1, next_hdr);
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
offset++;
Fix a copy/paste error and factorize dissection of extension header length and next extension header svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
}
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
} else
Fix a copy/paste error and factorize dissection of extension header length and next extension header svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
offset++;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
}
break;
default:
break;
}
}
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
if (gtp_hdr->message != GTP_MSG_TPDU) {
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
/* Dissect IEs */
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
mandatory = 0; /* check order of GTP fields against ETSI */
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
while (tvb_reported_length_remaining(tvb, offset) > 0) {
ext_hdr_val = tvb_get_guint8(tvb, offset);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
if (g_gtp_etsi_order) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
checked_field = check_field_presence(gtp_hdr->message, ext_hdr_val, &mandatory);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
switch (checked_field) {
case -2:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
expert_add_info(pinfo, message_item, &ei_gtp_message_not_found);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
case -1:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
expert_add_info(pinfo, message_item, &ei_gtp_field_not_present);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
case 0:
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
default:
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
expert_add_info_format(pinfo, message_item, &ei_gtp_wrong_next_field, "[WARNING] wrong next field, should be: %s",
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
val_to_str_ext_const(checked_field, &gtp_val_ext, "Unknown extension field"));
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
break;
}
}
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
i = -1;
while (gtpopt[++i].optcode)
if (gtpopt[i].optcode == ext_hdr_val)
break;
offset = offset + (*gtpopt[i].decode) (tvb, offset, pinfo, gtp_tree);
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/*Use sequence number to track Req/Resp pairs*/
if (seq_no) {
Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used. svn path=/trunk/; revision=52930
2013-10-28 20:00:04 +00:00
gcrp = gtp_match_response(tvb, pinfo, gtp_tree, seq_no, gtp_hdr->message, gtp_info);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
/*pass packet to tap for response time reporting*/
if (gcrp) {
tap_queue_packet(gtp_tap,pinfo,gcrp);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
}
}
}
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
proto_item_set_end (ti, tvb, offset);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
if ((gtp_hdr->message == GTP_MSG_TPDU) && dissect_tpdu_as == GTP_TPDU_AS_TPDU) {
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
if(tvb_reported_length_remaining(tvb, offset) > 0){
proto_tree_add_text(tree, tvb, offset, -1, "T-PDU Data %u bytes", tvb_reported_length_remaining(tvb, offset));
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
sub_proto = tvb_get_guint8(tvb, offset);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
if ((sub_proto >= 0x45) && (sub_proto <= 0x4e)) {
/* this is most likely an IPv4 packet
* we can exclude 0x40 - 0x44 because the minimum header size is 20 octets
* 0x4f is excluded because PPP protocol type "IPv6 header compression"
* with protocol field compression is more likely than a plain IPv4 packet with 60 octet header size */
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(ip_handle, next_tvb, pinfo, tree);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
} else if ((sub_proto & 0xf0) == 0x60) {
/* this is most likely an IPv6 packet */
next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(ipv6_handle, next_tvb, pinfo, tree);
} else {
/* this seems to be a PPP packet */
if (sub_proto == 0xff) {
/* this might be an address field, even it shouldn't be here */
control_field = tvb_get_guint8(tvb, offset + 1);
if (control_field == 0x03)
/* now we are pretty sure that address and control field are mistakenly inserted -> ignore it for PPP dissection */
acfield_len = 2;
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset + acfield_len);
call_dissector(ppp_handle, next_tvb, pinfo, tree);
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
}
}
col_prepend_fstr(pinfo->cinfo, COL_PROTOCOL, "GTP <");
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
col_append_str(pinfo->cinfo, COL_PROTOCOL, ">");
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
}
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
else if ((gtp_hdr->message == GTP_MSG_TPDU) && dissect_tpdu_as == GTP_TPDU_AS_SYNC) {
Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset + acfield_len);
call_dissector(sync_handle, next_tvb, pinfo, tree);
col_prepend_fstr(pinfo->cinfo, COL_PROTOCOL, "GTP <");
col_append_str(pinfo->cinfo, COL_PROTOCOL, ">");
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
}
Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used. svn path=/trunk/; revision=52930
2013-10-28 20:00:04 +00:00
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
tap_queue_packet(gtpv1_tap,pinfo, gtp_hdr);
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
return tvb_reported_length(tvb);
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
static int
dissect_gtpprim(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
void *private_data _U_)
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
{
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
return dissect_gtp_common(tvb, pinfo, tree);
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
}
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
static int
dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
void *private_data _U_)
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
{
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
guint8 version;
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
/*
* Do we have enough data to check the first byte?
*/
if (!tvb_bytes_exist(tvb, 0, 1)) {
/* No. */
return 0;
}
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/*
* If this is GTPv2-C call the gtpv2 dissector if present
* Should this be moved to after the conversation stuff to retain that functionality for GTPv2 ???
*/
version = tvb_get_guint8(tvb,0)>>5;
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
if (version > 2) {
/* Unknown version - reject the packet */
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
return 0;
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
if (version == 2) {
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
/* GTPv2-C 3GPP TS 29.274 */
if (gtpv2_handle) {
call_dissector(gtpv2_handle, tvb, pinfo, tree);
Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:55:52 +00:00
return tvb_reported_length(tvb);
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
}
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
}
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
return dissect_gtp_common(tvb, pinfo, tree);
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
}
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
static void
gtp_reinit(void)
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
{
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gtp_conv_info_t *gtp_info;
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
/* Free up state attached to the gtp_info structures */
for (gtp_info = gtp_info_items; gtp_info != NULL; ) {
gtp_conv_info_t *next;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
g_hash_table_destroy(gtp_info->matched);
gtp_info->matched=NULL;
g_hash_table_destroy(gtp_info->unmatched);
gtp_info->unmatched=NULL;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
next = gtp_info->next;
g_free(gtp_info);
gtp_info = next;
}
Radius Dictionary Support Part 2: the code svn path=/trunk/; revision=14925
2005-07-15 21:12:27 +00:00
Fix some indentation ..... svn path=/trunk/; revision=27307
2009-01-27 00:54:09 +00:00
gtp_info_items = NULL;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
You don't tug on Superman's cape. You don't spit into the wind. You don't pull the mask off the old Lone Ranger, and you don't overflow a guint8. Fixes the infinite loop in bug 576. Fix up whitespace. Add an entry to the release notes. Apologies to Jim Croce. svn path=/trunk/; revision=16436
2005-11-08 15:22:38 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
void
proto_register_gtp(void)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
module_t *gtp_module;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_module_t* expert_gtp;
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
guint i;
guint last_offset;
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
static hf_register_info hf_gtp[] = {
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
{&hf_gtp_ie_id,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "IE Id", "gtp.ie_id",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &gtp_val_ext, 0x0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_response_in,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Response In", "gtp.response_in",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"The response to this GTP request is in this frame", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_response_to,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Response To", "gtp.response_to",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This is a response to the GTP request in this frame", HFILL}
},
{&hf_gtp_time,
{ "Time", "gtp.time",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"The time between the Request and the Response", HFILL}
},
{&hf_gtp_apn,
{ "APN", "gtp.apn",
FT_STRING, BASE_NONE, NULL, 0,
"Access Point Name", HFILL}
},
{&hf_gtp_cause,
{ "Cause", "gtp.cause",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &cause_type_ext, 0,
"Cause of operation", HFILL}
},
{&hf_gtp_chrg_char,
{ "Charging characteristics", "gtp.chrg_char",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_chrg_char_s,
{ "Spare", "gtp.chrg_char_s",
FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_S,
NULL, HFILL}
},
{&hf_gtp_chrg_char_n,
{ "Normal charging", "gtp.chrg_char_n",
FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_N,
NULL, HFILL}
},
{&hf_gtp_chrg_char_p,
{ "Prepaid charging", "gtp.chrg_char_p",
FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_P,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_chrg_char_f,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Flat rate charging", "gtp.chrg_char_f",
FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_F,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_chrg_char_h,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Hot billing charging", "gtp.chrg_char_h",
FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_H,
NULL, HFILL}
},
{&hf_gtp_chrg_char_r,
{ "Reserved", "gtp.chrg_char_r",
FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_R,
NULL, HFILL}
},
{&hf_gtp_chrg_id,
{ "Charging ID", "gtp.chrg_id",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_chrg_ipv4,
{ "CG address IPv4", "gtp.chrg_ipv4",
FT_IPv4, BASE_NONE, NULL, 0,
"Charging Gateway address IPv4", HFILL}
},
{&hf_gtp_chrg_ipv6,
{ "CG address IPv6", "gtp.chrg_ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
"Charging Gateway address IPv6", HFILL}
},
{&hf_gtp_ext_flow_label,
{ "Flow Label Data I", "gtp.ext_flow_label",
FT_UINT16, BASE_HEX, NULL, 0,
"Flow label data", HFILL}
},
{&hf_gtp_ext_id,
{ "Extension identifier", "gtp.ext_id",
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0,
From Katrina Zhang sligtly modified. - Add dissection of Selected PLMN ID. - Put enterpice id in the tree - Filter for UTRAN Transparent Field. svn path=/trunk/; revision=47252
2013-01-24 09:59:06 +00:00
"Private Enterprise number", HFILL}
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
},
{&hf_gtp_ext_val,
{ "Extension value", "gtp.ext_val",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_flags,
{ "Flags", "gtp.flags",
FT_UINT8, BASE_HEX, NULL, 0,
"Ver/PT/Spare...", HFILL}
},
{&hf_gtp_ext_hdr,
{ "Extension header", "gtp.ext_hdr",
Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'. Give URLs for the 3gpp.org pages for all those specs. Add #defines for all the GTP v1 extension header types we handle. "gtp_prime" is a Boolean; make it a gboolean. Dissect the first 4 octets of the header one field at a time, so that if the packet is cut short by a snapshot length we at least dissect what's there. 32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is; assume it's the same as the header for GTP v0. Once we've fetched the length field from the fixed-length portion of the header, set the length of the tvbuff to the sum of the offset past the fixed-length portion and the length field, to catch running past that value. Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the presence of those fields, to make it a bit clearer what's being checked for. Don't actually add those fields to the protocol tree unless the flag for the field is set. We only need one chunk of code to handle extension headers. Make that chunk a loop, and put the header in as an FT_NONE item, with the length, header data, and next header under it. Put the initial next header field in as well. (We treat this like IPv6 extension headers, with the next header field being part of the previous header, rather than like a set of TLVs, with the next header field being the type value of its header.) Fail if the extension header length is zero. Use the reported length when processing IEs or T-PDU payload. svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
FT_NONE, BASE_NONE, NULL, 0,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
NULL, HFILL}
},
{&hf_gtp_ext_hdr_next,
Use hf_gtp_ext_hdr_next for all "next header" fields, and get rid of hf_gtp_next. Don't do "dummy" dissection of extension headers that we don't actually dissect - we label them by next extension header type, and dissect them in the default case, which should suffice (until somebody adds dissection for those types). svn path=/trunk/; revision=48075
2013-03-05 00:17:56 +00:00
{ "Next extension header type", "gtp.ext_hdr.next",
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0,
NULL, HFILL}
},
{&hf_gtp_ext_hdr_pdcpsn,
{ "PDCP Sequence Number", "gtp.ext_hdr.pdcp_sn",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL}
},
From Lakshmi Narayana Madala : GTP dissector enhanced to support UDP Port extension header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418 svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
{&hf_gtp_ext_hdr_udp_port,
{ "UDP Port", "gtp.ext_hdr.udp_port",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL}
},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{&hf_gtp_ext_hdr_length,
{ "Extension Header Length", "gtp.ext_hdr.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_flags_ver,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Version", "gtp.flags.version",
FT_UINT8, BASE_DEC, VALS(ver_types), GTP_VER_MASK,
"GTP Version", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
Try to fix the GTP' header dissection a bit. svn path=/trunk/; revision=33689
2010-08-01 20:55:29 +00:00
{&hf_gtp_prime_flags_ver,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Version", "gtp.prim.flags.version",
FT_UINT8, BASE_DEC,NULL, GTP_VER_MASK,
"GTP' Version", HFILL}
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_flags_pt,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Protocol type", "gtp.flags.payload",
FT_UINT8, BASE_DEC, VALS(pt_types), GTP_PT_MASK,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_flags_spare1,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Reserved", "gtp.flags.reserved",
FT_UINT8, BASE_DEC, NULL, GTP_SPARE1_MASK,
"Reserved (shall be sent as '111' )", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
Handle 20 byte GTP' V0 header. svn path=/trunk/; revision=40081
2011-12-03 12:11:01 +00:00
{&hf_gtp_flags_hdr_length,
remove unnecessary underscores from display filters svn path=/trunk/; revision=44181
2012-08-01 02:59:17 +00:00
{ "Header length", "gtp.flags.hdr_length",
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
FT_BOOLEAN, 8, TFS(&gtp_hdr_length_vals), 0x01,
NULL, HFILL}
},
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
{&hf_gtp_flags_snn,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Is SNDCP N-PDU included?", "gtp.flags.snn",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), GTP_SNN_MASK,
"Is SNDCP N-PDU LLC Number included? (1 = yes, 0 = no)", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_flags_spare2,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Reserved", "gtp.flags.reserved",
FT_UINT8, BASE_DEC, NULL, GTP_SPARE2_MASK,
"Reserved (shall be sent as '1' )", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_flags_e,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Is Next Extension Header present?", "gtp.flags.e",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), GTP_E_MASK,
"Is Next Extension Header present? (1 = yes, 0 = no)", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_flags_s,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Is Sequence Number present?", "gtp.flags.s",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), GTP_S_MASK,
"Is Sequence Number present? (1 = yes, 0 = no)", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_flags_pn,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Is N-PDU number present?", "gtp.flags.pn",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), GTP_PN_MASK,
"Is N-PDU number present? (1 = yes, 0 = no)", HFILL}
},
{&hf_gtp_flow_ii,
{ "Flow Label Data II", "gtp.flow_ii",
FT_UINT16, BASE_DEC, NULL, 0,
"Downlink flow label data", HFILL}
},
{&hf_gtp_flow_label,
{ "Flow label", "gtp.flow_label",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_flow_sig,
{ "Flow label Signalling", "gtp.flow_sig",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_gsn_addr_len,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "GSN Address Length", "gtp.gsn_addr_len",
FT_UINT8, BASE_DEC, NULL, GTP_EXT_GSN_ADDR_LEN_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_gsn_addr_type,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "GSN Address Type", "gtp.gsn_addr_type",
FT_UINT8, BASE_DEC, VALS(gsn_addr_type), GTP_EXT_GSN_ADDR_TYPE_MASK,
NULL, HFILL}
},
{&hf_gtp_gsn_ipv4,
{ "GSN address IPv4", "gtp.gsn_ipv4",
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_gsn_ipv6,
{ "GSN address IPv6", "gtp.gsn_ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_length,
{ "Length", "gtp.length",
FT_UINT16, BASE_DEC, NULL, 0,
"Length (i.e. number of octets after TID or TEID)", HFILL}
},
{&hf_gtp_map_cause,
{ "MAP cause", "gtp.map_cause",
FT_UINT8, BASE_DEC, VALS(gsm_old_GSMMAPLocalErrorcode_vals), 0,
NULL, HFILL}
},
{&hf_gtp_message_type,
{ "Message Type", "gtp.message",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &gtp_message_type_ext, 0x0,
"GTP Message Type", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_ms_reason,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "MS not reachable reason", "gtp.ms_reason",
FT_UINT8, BASE_DEC, VALS(ms_not_reachable_type), 0,
NULL, HFILL}
},
{&hf_gtp_ms_valid,
{ "MS validated", "gtp.ms_valid",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_node_ipv4,
{ "Node address IPv4", "gtp.node_ipv4",
FT_IPv4, BASE_NONE, NULL, 0,
"Recommended node address IPv4", HFILL}
},
{&hf_gtp_node_ipv6,
{ "Node address IPv6", "gtp.node_ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
"Recommended node address IPv6", HFILL}
},
{&hf_gtp_npdu_number,
{ "N-PDU Number", "gtp.npdu_number",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_nsapi,
{ "NSAPI", "gtp.nsapi",
FT_UINT8, BASE_DEC, NULL, 0x0f,
"Network layer Service Access Point Identifier", HFILL}
},
{&hf_gtp_qos_version,
{ "Version", "gtp.qos_version",
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7697 : Fix dissection of release 98 and release 99 QoS profiles (bug introduced in r43312) svn path=/trunk/; revision=44792
2012-09-06 20:58:32 +00:00
FT_UINT8, BASE_HEX, NULL, 0,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
"Version of the QoS Profile", HFILL}
},
{&hf_gtp_qos_spare1,
{ "Spare", "gtp.qos_spare1",
FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE1_MASK,
"Spare (shall be sent as '00' )", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_delay,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "QoS delay", "gtp.qos_delay",
FT_UINT8, BASE_DEC, VALS(qos_delay_type), GTP_EXT_QOS_DELAY_MASK,
"Quality of Service Delay Class", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_reliability,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "QoS reliability", "gtp.qos_reliability",
FT_UINT8, BASE_DEC, VALS(qos_reliability_type), GTP_EXT_QOS_RELIABILITY_MASK,
"Quality of Service Reliability Class", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_peak,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "QoS peak", "gtp.qos_peak",
FT_UINT8, BASE_DEC, VALS(qos_peak_type), GTP_EXT_QOS_PEAK_MASK,
"Quality of Service Peak Throughput", HFILL}
},
{&hf_gtp_qos_spare2,
{ "Spare", "gtp.qos_spare2",
FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE2_MASK,
"Spare (shall be sent as 0)", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_precedence,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "QoS precedence", "gtp.qos_precedence",
FT_UINT8, BASE_DEC, VALS(qos_precedence_type), GTP_EXT_QOS_PRECEDENCE_MASK,
"Quality of Service Precedence Class", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_spare3,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Spare", "gtp.qos_spare3",
FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE3_MASK,
"Spare (shall be sent as '000' )", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_mean,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "QoS mean", "gtp.qos_mean",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &qos_mean_type_ext, GTP_EXT_QOS_MEAN_MASK,
"Quality of Service Mean Throughput", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_al_ret_priority,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Allocation/Retention priority", "gtp.qos_al_ret_priority",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_traf_class,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Traffic class", "gtp.qos_traf_class",
FT_UINT8, BASE_DEC, VALS(qos_traf_class), GTP_EXT_QOS_TRAF_CLASS_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_del_order,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Delivery order", "gtp.qos_del_order",
FT_UINT8, BASE_DEC, VALS(qos_del_order), GTP_EXT_QOS_DEL_ORDER_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_del_err_sdu,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Delivery of erroneous SDU", "gtp.qos_del_err_sdu",
FT_UINT8, BASE_DEC, VALS(qos_del_err_sdu), GTP_EXT_QOS_DEL_ERR_SDU_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_max_sdu_size,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Maximum SDU size", "gtp.qos_max_sdu_size",
FT_UINT8, BASE_DEC, VALS(qos_max_sdu_size), 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_max_ul,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Maximum bit rate for uplink", "gtp.qos_max_ul",
FT_UINT8, BASE_DEC, VALS(qos_max_ul), 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_max_dl,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Maximum bit rate for downlink", "gtp.qos_max_dl",
FT_UINT8, BASE_DEC, VALS(qos_max_dl), 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_res_ber,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Residual BER", "gtp.qos_res_ber",
FT_UINT8, BASE_DEC, VALS(qos_res_ber), GTP_EXT_QOS_RES_BER_MASK,
"Residual Bit Error Rate", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_sdu_err_ratio,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "SDU Error ratio", "gtp.qos_sdu_err_ratio",
FT_UINT8, BASE_DEC, VALS(qos_sdu_err_ratio), GTP_EXT_QOS_SDU_ERR_RATIO_MASK,
NULL,
HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_trans_delay,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Transfer delay", "gtp.qos_trans_delay",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &qos_trans_delay_ext, GTP_EXT_QOS_TRANS_DELAY_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_traf_handl_prio,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Traffic handling priority", "gtp.qos_traf_handl_prio",
FT_UINT8, BASE_DEC, VALS(qos_traf_handl_prio), GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_guar_ul,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Guaranteed bit rate for uplink", "gtp.qos_guar_ul",
FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_guar_dl,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Guaranteed bit rate for downlink", "gtp.qos_guar_dl",
FT_UINT8, BASE_DEC, VALS(qos_guar_dl), 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_src_stat_desc,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Source Statistics Descriptor", "gtp.src_stat_desc",
FT_UINT8, BASE_DEC, VALS(src_stat_desc_vals), GTP_EXT_QOS_SRC_STAT_DESC_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_qos_sig_ind,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Signalling Indication", "gtp.sig_ind",
FT_BOOLEAN, 8, TFS(&gtp_sig_ind), GTP_EXT_QOS_SIG_IND_MASK,
NULL, HFILL}
},
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
{ &hf_gtp_qos_arp_pci,
{"Pre-emption Capability (PCI)", "gtp.qos_arp_pci",
Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability svn path=/trunk/; revision=44091
2012-07-28 13:40:11 +00:00
FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
NULL, HFILL}
},
{ &hf_gtp_qos_arp_pl,
{"Priority Level", "gtp.qos_arp_pl",
FT_UINT8, BASE_DEC, NULL, 0x3c,
NULL, HFILL}
},
{ &hf_gtp_qos_arp_pvi,
{"Pre-emption Vulnerability (PVI)", "gtp.qos_arp_pvi",
Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability svn path=/trunk/; revision=44091
2012-07-28 13:40:11 +00:00
FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
NULL, HFILL}
},
{&hf_gtp_qos_qci,
{"QCI", "gtp.qos_qci",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_qos_ul_mbr,
{"Uplink Maximum Bit Rate", "gtp.qos_ul_mbr",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_qos_dl_mbr,
{"Downlink Maximum Bit Rate", "gtp.qos_dl_mbr",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_qos_ul_gbr,
{"Uplink Guaranteed Bit Rate", "gtp.qos_ul_gbr",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_qos_dl_gbr,
{"Downlink Guaranteed Bit Rate", "gtp.qos_dl_gbr",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_qos_ul_apn_ambr,
{"Uplink APN Aggregate Maximum Bit Rate", "gtp.qos_ul_apn_ambr",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_qos_dl_apn_ambr,
{"Downlink APN Aggregate Maximum Bit Rate", "gtp.qos_dl_apn_ambr",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{&hf_gtp_pkt_flow_id,
{ "Packet Flow ID", "gtp.pkt_flow_id",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_ptmsi,
{ "P-TMSI", "gtp.ptmsi",
FT_UINT32, BASE_HEX, NULL, 0,
"Packet-Temporary Mobile Subscriber Identity", HFILL}
},
{&hf_gtp_ptmsi_sig,
{ "P-TMSI Signature", "gtp.ptmsi_sig",
FT_UINT24, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_rab_gtpu_dn,
{ "Downlink GTP-U seq number", "gtp.rab_gtp_dn",
FT_UINT16, BASE_DEC, NULL, 0,
"Downlink GTP-U sequence number", HFILL}
},
{&hf_gtp_rab_gtpu_up,
{ "Uplink GTP-U seq number", "gtp.rab_gtp_up",
FT_UINT16, BASE_DEC, NULL, 0,
"Uplink GTP-U sequence number", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_rab_pdu_dn,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Downlink next PDCP-PDU seq number", "gtp.rab_pdu_dn",
FT_UINT16, BASE_DEC, NULL, 0,
"Downlink next PDCP-PDU sequence number", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_rab_pdu_up,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Uplink next PDCP-PDU seq number", "gtp.rab_pdu_up",
FT_UINT16, BASE_DEC, NULL, 0,
"Uplink next PDCP-PDU sequence number", HFILL}
},
{&hf_gtp_rai_rac,
{ "RAC", "gtp.rac",
FT_UINT8, BASE_DEC, NULL, 0,
"Routing Area Code", HFILL}
},
{&hf_gtp_rai_lac,
{ "LAC", "gtp.lac",
FT_UINT16, BASE_DEC, NULL, 0,
"Location Area Code", HFILL}
},
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474 : Dissect LTE RADIUS AVP 3GPP-User-Location-Info svn path=/trunk/; revision=43700
2012-07-13 21:18:35 +00:00
{ &hf_gtp_tac,
{"TAC", "gtp.tac",
FT_UINT16, BASE_DEC, NULL, 0,
"Tracking Area Code", HFILL}
},
{ &hf_gtp_eci,
{"ECI", "gtp.eci",
FT_UINT32, BASE_DEC, NULL, 0x0FFFFFFF,
"E-UTRAN Cell Identifier", HFILL}
},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{&hf_gtp_ranap_cause,
{ "RANAP cause", "gtp.ranap_cause",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ranap_cause_type_ext, 0,
NULL, HFILL}
},
{&hf_gtp_recovery,
{ "Recovery", "gtp.recovery",
FT_UINT8, BASE_DEC, NULL, 0,
"Restart counter", HFILL}
},
{&hf_gtp_reorder,
{ "Reordering required", "gtp.reorder",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_rnc_ipv4,
{ "RNC address IPv4", "gtp.rnc_ipv4",
FT_IPv4, BASE_NONE, NULL, 0,
"Radio Network Controller address IPv4", HFILL}
},
{&hf_gtp_rnc_ipv6,
{ "RNC address IPv6", "gtp.rnc_ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
"Radio Network Controller address IPv6", HFILL}
},
{&hf_gtp_rp,
{ "Radio Priority", "gtp.rp",
FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_MASK,
"Radio Priority for uplink tx", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_rp_nsapi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "NSAPI in Radio Priority", "gtp.rp_nsapi",
FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_NSAPI_MASK,
"Network layer Service Access Point Identifier in Radio Priority", HFILL}
},
{&hf_gtp_rp_sms,
{ "Radio Priority SMS", "gtp.rp_sms",
FT_UINT8, BASE_DEC, NULL, 0,
"Radio Priority for MO SMS", HFILL}
},
{&hf_gtp_rp_spare,
{ "Reserved", "gtp.rp_spare",
FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_SPARE_MASK,
"Spare bit", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_sel_mode,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Selection mode", "gtp.sel_mode",
FT_UINT8, BASE_DEC, VALS(sel_mode_type), 0x03,
NULL, HFILL}
},
{&hf_gtp_seq_number,
{ "Sequence number", "gtp.seq_number",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_sndcp_number,
{ "SNDCP N-PDU LLC Number", "gtp.sndcp_number",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_tear_ind,
{ "Teardown Indicator", "gtp.tear_ind",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_teid,
{ "TEID", "gtp.teid",
FT_UINT32, BASE_HEX, NULL, 0,
"Tunnel Endpoint Identifier", HFILL}
},
{&hf_gtp_teid_cp,
{ "TEID Control Plane", "gtp.teid_cp",
FT_UINT32, BASE_HEX, NULL, 0,
"Tunnel Endpoint Identifier Control Plane", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_ulink_teid_cp,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Uplink TEID Control Plane", "gtp.ulink_teid_cp",
FT_UINT32, BASE_HEX, NULL, 0,
"Uplink Tunnel Endpoint Identifier Control Plane", HFILL}
},
{&hf_gtp_teid_data,
{ "TEID Data I", "gtp.teid_data",
FT_UINT32, BASE_HEX, NULL, 0,
"Tunnel Endpoint Identifier Data I", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_ulink_teid_data,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Uplink TEID Data I", "gtp.ulink_teid_data",
FT_UINT32, BASE_HEX, NULL, 0,
"UplinkTunnel Endpoint Identifier Data I", HFILL}
},
{&hf_gtp_teid_ii,
{ "TEID Data II", "gtp.teid_ii",
FT_UINT32, BASE_HEX, NULL, 0,
"Tunnel Endpoint Identifier Data II", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_tft_code,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "TFT operation code", "gtp.tft_code",
FT_UINT8, BASE_DEC, VALS(tft_code_type), GTPv1_TFT_CODE_MASK,
NULL, HFILL}
},
{&hf_gtp_tft_spare,
{ "TFT spare bit", "gtp.tft_spare",
FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_SPARE_MASK,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_tft_number,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Number of packet filters", "gtp.tft_number",
FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_NUMBER_MASK,
NULL, HFILL}
},
{&hf_gtp_tft_eval,
{ "Evaluation precedence", "gtp.tft_eval",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
{&hf_gtp_tft_content_id,
{ "Content ID", "gtp.tft_content_id",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{&hf_gtp_tid,
{ "TID", "gtp.tid",
FT_STRING, BASE_NONE, NULL, 0,
"Tunnel Identifier", HFILL}
},
{&hf_gtp_tlli,
{ "TLLI", "gtp.tlli",
FT_UINT32, BASE_HEX, NULL, 0,
"Temporary Logical Link Identity", HFILL}
},
{&hf_gtp_tr_comm,
{ "Packet transfer command", "gtp.tr_comm",
FT_UINT8, BASE_DEC, VALS(tr_comm_type), 0,
NULL, HFILL}
},
{&hf_gtp_trace_ref,
{ "Trace reference", "gtp.trace_ref",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_trace_type,
{ "Trace type", "gtp.trace_type",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_user_addr_pdp_org,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "PDP type organization", "gtp.user_addr_pdp_org",
FT_UINT8, BASE_DEC, VALS(pdp_org_type), 0,
NULL, HFILL}
},
{&hf_gtp_user_addr_pdp_type,
{ "PDP type number", "gtp.user_addr_pdp_type",
FT_UINT8, BASE_HEX, VALS(pdp_type), 0,
NULL, HFILL}
},
{&hf_gtp_user_ipv4,
{ "End user address IPv4", "gtp.user_ipv4",
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{&hf_gtp_user_ipv6,
{ "End user address IPv6", "gtp.user_ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_security_mode,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Security Mode", "gtp.security_mode",
FT_UINT8, BASE_DEC, VALS(mm_sec_modep), 0xc0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_no_of_vectors,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "No of Vectors", "gtp.no_of_vectors",
FT_UINT8, BASE_DEC, NULL, 0x38,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_cipher_algorithm,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Cipher Algorithm", "gtp.cipher_algorithm",
FT_UINT8, BASE_DEC, VALS(gtp_cipher_algorithm), 0x07,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_cksn_ksi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Ciphering Key Sequence Number (CKSN)/Key Set Identifier (KSI)", "gtp.cksn_ksi",
FT_UINT8, BASE_DEC, NULL, 0x07,
"CKSN/KSI", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_cksn,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Ciphering Key Sequence Number (CKSN)", "gtp.cksn",
FT_UINT8, BASE_DEC, NULL, 0x07,
"CKSN", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ksi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Key Set Identifier (KSI)", "gtp.ksi",
FT_UINT8, BASE_DEC, NULL, 0x07,
"KSI", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ext_length,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Length", "gtp.ext_length",
FT_UINT16, BASE_DEC, NULL, 0x0,
"IE Length", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
From Katrina Zhang sligtly modified. - Add dissection of Selected PLMN ID. - Put enterpice id in the tree - Filter for UTRAN Transparent Field. svn path=/trunk/; revision=47252
2013-01-24 09:59:06 +00:00
{&hf_gtp_utran_field,
{ "UTRAN Transparent Field", "gtp.utran_field",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_ext_apn_res,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Restriction Type", "gtp.ext_apn_res",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ext_rat_type,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "RAT Type", "gtp.ext_rat_type",
FT_UINT8, BASE_DEC, VALS(gtp_ext_rat_type_vals), 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ext_geo_loc_type,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Geographic Location Type", "gtp.ext_geo_loc_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ext_sac,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "SAC", "gtp.ext_sac",
GTP: display SAC as BASE_HEX_DEC Bug: 10490 Change-Id: I0afe1f2ff51f2452830bfc57210dc3a298b68cbf Reviewed-on: https://code.wireshark.org/review/4290 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25 21:11:10 +00:00
FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ext_imeisv,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "IMEI(SV)", "gtp.ext_imeisv",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
{ &hf_gtp_target_rnc_id,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ "targetRNC-ID", "gtp.targetRNC_ID",
Bug 3974 - wrong decoding of gtp.target identification. Use the IE description from 3GPP TS 29.060 version 10.4.0 Release 10. - Fix bugs with RAI and LAC in other parts of the code. svn path=/trunk/; revision=46439
2012-12-07 12:06:40 +00:00
FT_UINT16, BASE_HEX, NULL, 0x0fff,
NULL, HFILL }
},
{ &hf_gtp_target_ext_rnc_id,
{ "Extended RNC-ID", "gtp.target_ext_RNC_ID",
FT_UINT16, BASE_HEX, NULL, 0,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
NULL, HFILL }
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_bssgp_cause,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "BSSGP Cause", "gtp.bssgp_cause",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &bssgp_cause_vals_ext, 0,
NULL, HFILL}
},
Dissect RIM Routing Address Discriminator and RAN Transparent Container. svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
{ &hf_gtp_bssgp_ra_discriminator,
{ "Routing Address Discriminator", "gtp.bssgp.rad",
FT_UINT8, BASE_DEC, VALS(gtp_bssgp_ra_discriminator_vals), 0x0f,
NULL, HFILL }
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_sapi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "PS Handover XID SAPI", "gtp.ps_handover_xid_sapi",
FT_UINT8, BASE_DEC, NULL, 0x0F,
"SAPI", HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_xid_par_len,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "PS Handover XID parameter length", "gtp.ps_handover_xid_par_len",
FT_UINT8, BASE_DEC, NULL, 0xFF,
"XID parameter length", HFILL}
},
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
{&hf_gtp_earp_pvi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "PVI Pre-emption Vulnerability", "gtp.EARP_pre_emption_par_vulnerability",
Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability svn path=/trunk/; revision=44091
2012-07-28 13:40:11 +00:00
FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
NULL, HFILL}
},
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
{&hf_gtp_earp_pl,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "PL Priority Level", "gtp.EARP_priority_level",
FT_UINT8, BASE_DEC, NULL, 0x3C,
NULL, HFILL}
},
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
{&hf_gtp_earp_pci,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "PCI Pre-emption Capability", "gtp.EARP_pre_emption_Capability",
Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability svn path=/trunk/; revision=44091
2012-07-28 13:40:11 +00:00
FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
NULL, HFILL}
},
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
{&hf_gtp_cdr_app,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Application Identifier", "gtp.cdr_app",
FT_UINT8, BASE_DEC, NULL, 0xf0,
NULL, HFILL}
},
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
{ &hf_gtp_cdr_rel,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Release Identifier", "gtp.cdr_rel",
FT_UINT8, BASE_DEC, NULL, 0x0f,
NULL, HFILL}
},
Get rid of unused variable warnings. Clean up indentation. svn path=/trunk/; revision=35746
2011-02-02 00:04:18 +00:00
{ &hf_gtp_cdr_ver,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Version Identifier", "gtp.cdr_ver",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_ppc,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Prohibit Payload Compression", "gtp.cmn_flg.ppc",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_mbs_srv_type,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "MBMS Service Type", "gtp.cmn_flg.mbs_srv_type",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_mbs_ran_pcd_rdy,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "RAN Procedures Ready", "gtp.cmn_flg.mbs_ran_pcd_rdy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_mbs_cnt_inf,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "MBMS Counting Information", "gtp.cmn_flg.mbs_cnt_inf",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_no_qos_neg,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "No QoS negotiation", "gtp.cmn_flg.no_qos_neg",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_nrsn,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "NRSN bit field", "gtp.cmn_flg.nrsn",
FT_BOOLEAN, 8, NULL, 0x20,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_cmn_flg_upgrd_qos_sup,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Upgrade QoS Supported", "gtp.cmn_flg.upgrd_qos_sup",
FT_BOOLEAN, 8, NULL, 0x40,
NULL, HFILL}
},
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 : Add dissection of Dual Address Bearer Flag bit in Common Flags IE svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
{&hf_gtp_cmn_flg_dual_addr_bearer_flg,
{ "Dual Address Bearer Flag", "gtp.cmn_flg.dual_addr_bearer_flg",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_tmgi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Temporary Mobile Group Identity (TMGI)", "gtp.tmgi",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_no_of_mbms_sa_codes,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Number of MBMS service area codes", "gtp.no_of_mbms_sa_codes",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Number N of MBMS service area codes", HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{&hf_gtp_mbms_ses_dur_days,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Estimated session duration days", "gtp.mbms_ses_dur_days",
FT_UINT24, BASE_DEC, NULL, 0x00007F,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_mbms_ses_dur_s,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Estimated session duration seconds", "gtp.mbms_ses_dur_s",
FT_UINT24, BASE_DEC, NULL, 0xFFFF80,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_mbms_sa_code,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "MBMS service area code", "gtp.mbms_sa_code",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_mbs_2g_3g_ind,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "MBMS 2G/3G Indicator", "gtp.mbs_2g_3g_ind",
FT_UINT8, BASE_DEC, VALS(gtp_mbs_2g_3g_ind_vals), 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_time_2_dta_tr,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Time to MBMS Data Transfer", "gtp.time_2_dta_tr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{ &hf_gtp_ext_ei,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Error Indication (EI)", "gtp.ei",
FT_UINT8, BASE_DEC, NULL, 0x04,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{&hf_gtp_ext_gcsi,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "GPRS-CSI (GCSI)", "gtp.gcsi",
FT_UINT8, BASE_DEC, NULL, 0x02,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
{ &hf_gtp_ext_dti,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Direct Tunnel Indicator (DTI)", "gtp.dti",
FT_UINT8, BASE_DEC, NULL, 0x01,
NULL, HFILL}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
},
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
{ &hf_gtp_ra_prio_lcs,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Radio Priority LCS", "gtp.raplcs",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL}
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
},
{ &hf_gtp_bcm,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "Bearer Control Mode", "gtp.bcm",
FT_UINT8, BASE_DEC, VALS(gtp_pdp_bcm_type_vals), 0,
NULL, HFILL}
Dissect RIM related IEs svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
},
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
{ &hf_gtp_fqdn,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "FQDN", "gtp.fqdn",
FT_STRING, BASE_NONE, NULL, 0,
"Fully Qualified Domain Name", HFILL}
From Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE. svn path=/trunk/; revision=41861
2012-03-30 21:45:42 +00:00
},
Fix up indentation/white space. Use global tfs_yes_no instead of local version. svn path=/trunk/; revision=41537
2012-03-13 16:47:11 +00:00
{ &hf_gtp_rim_routing_addr,
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
{ "RIM Routing Address value", "gtp.rim_routing_addr_val",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_gtp_mbms_flow_id,
{ "MBMS Flow Identifier", "gtp.mbms_flow_id",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_gtp_mbms_dist_indic,
{ "Distribution Indication", "gtp.mbms_dist_indic",
FT_UINT8, BASE_DEC, VALS(gtp_mbms_dist_indic_vals), 0x03,
NULL, HFILL}
},
{ &hf_gtp_ext_apn_ambr_ul,
{ "APN-AMBR for Uplink", "gtp.apn_ambr_ul",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_apn_ambr_dl,
{ "APN-AMBR for Downlink", "gtp.apn_ambr_dl",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_sub_ue_ambr_ul,
{ "Subscribed UE-AMBR for Uplink", "gtp.sub_ue_ambr_ul",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_sub_ue_ambr_dl,
{ "Subscribed UE-AMBR for Downlink", "gtp.sub_ue_ambr_dl",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_auth_ue_ambr_ul,
{ "Authorized UE-AMBR for Uplink", "gtp.auth_ue_ambr_ul",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_auth_ue_ambr_dl,
{ "Authorized UE-AMBR for Downlink", "gtp.auth_ue_ambr_dl",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_auth_apn_ambr_ul,
{ "Authorized APN-AMBR for Uplink", "gtp.auth_apn_ambr_ul",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_auth_apn_ambr_dl,
{ "Authorized APN-AMBR for Downlink", "gtp.auth_apn_ambr_dl",
FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_ext_ggsn_back_off_time_units,
{ "Timer unit", "gtp.ggsn_back_off_time_units",
FT_UINT8, BASE_DEC, VALS(gtp_ggsn_back_off_time_units_vals), 0xe0,
NULL, HFILL}
},
{ &hf_gtp_ext_ggsn_back_off_timer,
{ "Timer value", "gtp.ggsn_back_off_timer",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL}
},
{ &hf_gtp_higher_br_16mb_flg,
{ "Higher bitrates than 16 Mbps flag", "gtp.higher_br_16mb_flg",
FT_UINT8, BASE_DEC, VALS(gtp_higher_br_16mb_flg_vals), 0x0,
NULL, HFILL}
},
{ &hf_gtp_max_mbr_apn_ambr_ul,
{ "Max MBR/APN-AMBR for uplink", "gtp.max_mbr_apn_ambr_ul",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtp_max_mbr_apn_ambr_dl,
{ "Max MBR/APN-AMBR for downlink", "gtp.max_mbr_apn_ambr_dl",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
From Grzegorz Szczytowski: Add Bearer Control Mode selection support in gtpv1 dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634 Sligtly reworked by me: - prefix names with gtp - Use proto_tree_add_item() - remove ref to specific protocol version, as it's probably a mix. - Changed the update to the AUTHORS file. svn path=/trunk/; revision=35699
2011-01-30 11:32:42 +00:00
},
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
{ &hf_gtp_rand, { "RAND", "gtp.rand", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_sres, { "SRES", "gtp.sres", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_kc, { "Kc", "gtp.kc", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_xres_length, { "XRES length", "gtp.xres_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_xres, { "XRES", "gtp.xres", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_quintuplet_ciphering_key, { "Quintuplet Ciphering Key", "gtp.quintuplet_ciphering_key", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_quintuplet_integrity_key, { "Quintuplet Integrity Key", "gtp.quintuplet_integrity_key", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_authentication_length, { "Authentication length", "gtp.authentication_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_auth, { "AUTH", "gtp.auth", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ciphering_key_ck, { "Ciphering key CK", "gtp.ciphering_key_ck", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_integrity_key_ik, { "Integrity key IK", "gtp.integrity_key_ik", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_quintuplets_length, { "Quintuplets length", "gtp.quintuplets_length", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ciphering_key_kc, { "Ciphering key Kc", "gtp.ciphering_key_kc", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_container_length, { "Container length", "gtp.container_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_extended_end_user_address, { "Extended End User Address", "gtp.extended_end_user_address", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x80, NULL, HFILL }},
{ &hf_gtp_vplmn_address_allowed, { "VPLMN address allowed", "gtp.vplmn_address_allowed", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x40, NULL, HFILL }},
{ &hf_gtp_activity_status_indicator, { "Activity Status Indicator", "gtp.activity_status_indicator", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, NULL, HFILL }},
{ &hf_gtp_reordering_required, { "Reordering required", "gtp.reordering_required", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x10, NULL, HFILL }},
{ &hf_gtp_pdp_cntxt_sapi, { "SAPI", "gtp.pdp_cntxt.sapi", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }},
{ &hf_gtp_sequence_number_down, { "Sequence number down", "gtp.sequence_number_down", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_sequence_number_up, { "Sequence number up", "gtp.sequence_number_up", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_send_n_pdu_number, { "Send N-PDU number", "gtp.send_n_pdu_number", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_receive_n_pdu_number, { "Receive N-PDU number", "gtp.receive_n_pdu_number", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_uplink_flow_label_signalling, { "Uplink flow label signalling", "gtp.uplink_flow_label_signalling", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_pdp_context_identifier, { "PDP context identifier", "gtp.pdp_context_identifier", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_pdp_organization, { "PDP organization", "gtp.pdp_organization", FT_UINT8, BASE_DEC, VALS(pdp_type), 0x0F, NULL, HFILL }},
{ &hf_gtp_pdp_type, { "PDP type", "gtp.pdp_type", FT_UINT8, BASE_DEC, VALS(pdp_type), 0x0, NULL, HFILL }},
{ &hf_gtp_pdp_address_length, { "PDP address length", "gtp.pdp_address_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_pdp_address_ipv4, { "PDP address", "gtp.pdp_address.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_pdp_address_ipv6, { "PDP address", "gtp.pdp_address.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ggsn_address_length, { "GGSN address length", "gtp.ggsn_address_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ggsn_address_for_control_plane, { "GGSN Address for control plane", "gtp.ggsn_address_for_control_plane", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ggsn_address_for_user_traffic, { "GGSN Address for User Traffic", "gtp.ggsn_address_for_user_traffic", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ggsn_2_address_length, { "GGSN 2 address length", "gtp.ggsn_2_address_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ggsn_2_address_ipv4, { "GGSN 2 address", "gtp.ggsn_2_address.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_ggsn_2_address_ipv6, { "GGSN 2 address", "gtp.ggsn_2_address.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_apn_length, { "APN length", "gtp.apn_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_transaction_identifier, { "Transaction identifier", "gtp.transaction_identifier", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_gsn_address_length, { "GSN address length", "gtp.gsn_address_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_gsn_address_information_element_length, { "GSN address Information Element length", "gtp.gsn_address_information_element_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_tft_length, { "TFT length", "gtp.tft_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_tft_packet_filter_id, { "Packet filter id", "gtp.tft_packet_filter_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_tft_content_length, { "Content length", "gtp.tft_content_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_rab_setup_length, { "RAB setup length", "gtp.rab_setup_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_timezone, { "Timezone", "gtp.timezone", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_rfsp_index, { "RFSP Index", "gtp.rfsp_index", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_fqdn_length, { "FQDN length", "gtp.fqdn_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_number_of_data_records, { "Number of data records", "gtp.number_of_data_records", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_data_record_format, { "Data record format", "gtp.data_record_format", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_gtp_node_address_length, { "Node address length", "gtp.node_address_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
};
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static ei_register_info ei[] = {
{ &ei_gtp_ext_length_mal, { "gtp.ext_length.invalid", PI_MALFORMED, PI_ERROR, "Malformed length", EXPFILL }},
{ &ei_gtp_ext_hdr_pdcpsn, { "gtp.ext_hdr.pdcp_sn.non_zero", PI_PROTOCOL, PI_NOTE, "3GPP TS 29.281 v9.0.0: When used between two eNBs at the X2 interface in E-UTRAN, bits 5-8 of octet 2 are spare. The meaning of the spare bits shall be set to zero.", EXPFILL }},
{ &ei_gtp_ext_length_warn, { "gtp.ext_length.invalid", PI_PROTOCOL, PI_WARN, "Length warning", EXPFILL }},
convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-27 00:33:02 +00:00
{ &ei_gtp_undecoded, { "gtp.undecoded", PI_UNDECODED, PI_WARN, "Data not decoded yet", EXPFILL }},
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
{ &ei_gtp_message_not_found, { "gtp.message_not_found", PI_PROTOCOL, PI_WARN, "Message not found", EXPFILL }},
{ &ei_gtp_field_not_present, { "gtp.field_not_present", PI_PROTOCOL, PI_WARN, "Field not present", EXPFILL }},
{ &ei_gtp_wrong_next_field, { "gtp.wrong_next_field", PI_PROTOCOL, PI_WARN, "Wrong next field", EXPFILL }},
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
};
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
/* Setup protocol subtree array */
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
#define GTP_NUM_INDIVIDUAL_ELEMS 29
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
static gint *ett_gtp_array[GTP_NUM_INDIVIDUAL_ELEMS + NUM_GTP_IES];
ett_gtp_array[0] = &ett_gtp;
ett_gtp_array[1] = &ett_gtp_flags;
ett_gtp_array[2] = &ett_gtp_ext;
Get rid of a few more of the explicitly defined ett:s svn path=/trunk/; revision=42234
2012-04-25 15:33:06 +00:00
ett_gtp_array[3] = &ett_gtp_cdr_dr;
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
ett_gtp_array[4] = &ett_gtp_qos;
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7371 : Add dissection of Release 8 or higher P-GW QoS profile svn path=/trunk/; revision=43280
2012-06-16 13:09:51 +00:00
ett_gtp_array[5] = &ett_gtp_qos_arp;
ett_gtp_array[6] = &ett_gtp_uli_rai;
ett_gtp_array[7] = &ett_gtp_flow_ii;
ett_gtp_array[8] = &ett_gtp_ext_hdr;
ett_gtp_array[9] = &ett_gtp_rp;
ett_gtp_array[10] = &ett_gtp_pkt_flow_id;
ett_gtp_array[11] = &ett_gtp_data_resp;
ett_gtp_array[12] = &ett_gtp_cdr_ver;
ett_gtp_array[13] = &ett_gtp_tmgi;
ett_gtp_array[14] = &ett_gtp_trip;
ett_gtp_array[15] = &ett_gtp_quint;
Add a DRX subtree to GTP dissector now that the subtree (useless for NAS and EPS NAS dissectors) was removed from de_gmm_drx_param in r51537 svn path=/trunk/; revision=51541
2013-08-27 19:38:35 +00:00
ett_gtp_array[16] = &ett_gtp_drx;
ett_gtp_array[17] = &ett_gtp_net_cap;
ett_gtp_array[18] = &ett_gtp_can_pack;
ett_gtp_array[19] = &ett_gtp_proto;
ett_gtp_array[20] = &ett_gtp_gsn_addr;
ett_gtp_array[21] = &ett_gtp_tft;
ett_gtp_array[22] = &ett_gtp_tft_pf;
ett_gtp_array[23] = &ett_gtp_tft_flags;
ett_gtp_array[24] = &ett_gtp_rab_setup;
ett_gtp_array[25] = &ett_gtp_hdr_list;
ett_gtp_array[26] = &ett_gtp_rel_pack;
ett_gtp_array[27] = &ett_gtp_node_addr;
Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 18:09:31 +00:00
ett_gtp_array[28] = &ett_gtp_mm_cntxt;
Add the basic code to dissect IE APN Aggregate Maximum Bit Rate (APN-AMBR) svn path=/trunk/; revision=42151
2012-04-20 05:47:02 +00:00
last_offset = GTP_NUM_INDIVIDUAL_ELEMS;
for (i=0; i < NUM_GTP_IES; i++, last_offset++)
{
ett_gtp_ies[i] = -1;
ett_gtp_array[last_offset] = &ett_gtp_ies[i];
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
proto_gtp = proto_register_protocol("GPRS Tunneling Protocol", "GTP", "gtp");
proto_register_field_array(proto_gtp, hf_gtp, array_length(hf_gtp));
proto_register_subtree_array(ett_gtp_array, array_length(ett_gtp_array));
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_gtp = expert_register_protocol(proto_gtp);
expert_register_field_array(expert_gtp, ei, array_length(ei));
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
gtp_module = prefs_register_protocol(proto_gtp, proto_reg_handoff_gtp);
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
prefs_register_uint_preference(gtp_module, "v0_port", "GTPv0 and GTP' port", "GTPv0 and GTP' port (default 3386)", 10, &g_gtpv0_port);
prefs_register_uint_preference(gtp_module, "v1c_port", "GTPv1 or GTPv2 control plane (GTP-C, GTPv2-C) port", "GTPv1 and GTPv2 control plane port (default 2123)", 10,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
&g_gtpv1c_port);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
prefs_register_uint_preference(gtp_module, "v1u_port", "GTPv1 user plane (GTP-U) port", "GTPv1 user plane port (default 2152)", 10,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
&g_gtpv1u_port);
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
prefs_register_enum_preference(gtp_module, "dissect_tpdu_as",
"Dissect T-PDU as",
"Dissect T-PDU as",
&dissect_tpdu_as,
gtp_decode_tpdu_as,
FALSE);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
prefs_register_obsolete_preference(gtp_module, "v0_dissect_cdr_as");
prefs_register_obsolete_preference(gtp_module, "v0_check_etsi");
prefs_register_obsolete_preference(gtp_module, "v1_check_etsi");
prefs_register_bool_preference(gtp_module, "check_etsi", "Compare GTP order with ETSI", "GTP ETSI order", &g_gtp_etsi_order);
prefs_register_obsolete_preference(gtp_module, "ppp_reorder");
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
prefs_register_obsolete_preference(gtp_module, "dissect_tpdu");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
/* This preference can be used to disable the dissection of GTP over TCP. Most of the Wireless operators uses GTP over UDP.
* The preference is set to TRUE by default forbackward compatibility
*/
prefs_register_bool_preference(gtp_module, "dissect_gtp_over_tcp", "Dissect GTP over TCP", "Dissect GTP over TCP", &g_gtp_over_tcp);
Make the GTP and GTP' dissectors new-style dissectors, so that they can reject packets that don't look enough like GTP/GTP' packets. This fixes bug 1706, and fixes some other cases where non-GTP/GTP' packets are being dissected as GTP/GTP'. svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
new_register_dissector("gtp", dissect_gtp, proto_gtp);
new_register_dissector("gtpprim", dissect_gtpprim, proto_gtp);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Make the _to_str() functions in here take a pointer to a TVB and an offset rather than (generally) a pointer into the TVB. Replace some tabs with spaces (for consistency). Remove a couple unnecessary includes. svn path=/trunk/; revision=36123
2011-03-03 02:18:57 +00:00
gtp_priv_ext_dissector_table = register_dissector_table("gtp.priv_ext", "GTP PRIVATE EXT", FT_UINT16, BASE_DEC);
Add a dissector table for CDR:s svn path=/trunk/; revision=37751
2011-06-22 13:58:04 +00:00
gtp_cdr_fmt_dissector_table = register_dissector_table("gtp.cdr_fmt", "GTP DATA RECORD TYPE", FT_UINT16, BASE_DEC);
- Add a dissector table for Private Extensions. - Use ENC_BIG_ENDIAN. svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
register_init_routine(gtp_reinit);
From Martin Isaksson: Preparattions for GTP tap. svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
gtp_tap = register_tap("gtp");
gtpv1_tap = register_tap("gtpv1");
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
/* TS 132 295 V9.0.0 (2010-02)
* 5.1.3 Port usage
* - The UDP Destination Port may be the server port number 3386 which has been reserved for GTP'.
* Alternatively another port can be used, which has been configured by O&M, except Port Number 2123
* which is used by GTPv2-C.
* :
* The TCP Destination Port may be the server port number 3386, which has been reserved for G-PDUs. Alternatively,
* another port may be used as configured by O&M. Extra implementation-specific destination ports are possible but
* all CGFs shall support the server port number.
*/
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
General minor cleanup including: - remove unneeded #includes; - use val_to_str_const() as appropriate; - reformat hf[] entries; - reformat long lines; - use #if 0/#endif to coment out code instead of /* ... */; - remove boilerplate comments; - whitespace & indentation svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
void
proto_reg_handoff_gtp(void)
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
{
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
static gboolean Initialized = FALSE;
Split dissection of GTP and GTP' in ordet to try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055 svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
static dissector_handle_t gtp_handle, gtp_prim_handle;
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
static gboolean gtp_over_tcp;
static guint gtpv0_port;
static guint gtpv1c_port;
static guint gtpv1u_port;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (!Initialized) {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
gtp_handle = find_dissector("gtp");
Minor cleanup: - Initialize a few static global variables; - Remove two unnecessary calls to g_hash_table_foreach_remove; - Do whitespace cleanup and use consistent indentation; - Fix a few typos and fix up several comments. svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
gtp_prim_handle = find_dissector("gtpprim");
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
ppp_subdissector_table = find_dissector_table("ppp.protocol");
radius_register_avp_dissector(VENDOR_THE3GPP, 5, dissect_radius_qos_umts);
radius_register_avp_dissector(VENDOR_THE3GPP, 12, dissect_radius_selection_mode);
radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc);
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
ip_handle = find_dissector("ip");
ipv6_handle = find_dissector("ipv6");
ppp_handle = find_dissector("ppp");
From jamie Neufeld: Add an option to selct if payload is to be dissected as SYNC. svn path=/trunk/; revision=49595
2013-05-27 16:27:50 +00:00
sync_handle = find_dissector("sync");
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
gtpcdr_handle = find_dissector("gtpcdr");
sndcpxid_handle = find_dissector("sndcpxid");
gtpv2_handle = find_dissector("gtpv2");
bssgp_handle = find_dissector("bssgp");
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
bssap_pdu_type_table = find_dissector_table("bssap.pdu_type");
/* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("diameter.3gpp", 5, new_create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp));
Fix a few cases of proto_item_add_subtree() using the wrong tree: Coverity 916-918; Also: Fix some indentation: e.g., "4 space tabs". svn path=/trunk/; revision=36585
2011-04-12 15:39:19 +00:00
/* AVP Code: 903 MBMS-Service-Area */
dissector_add_uint("diameter.3gpp", 903, new_create_dissector_handle(dissect_gtp_3gpp_mbms_service_area, proto_gtp));
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* AVP Code: 904 MBMS-Session-Duration */
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp));
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/* AVP Code: 911 MBMS-Time-To-Data-Transfer */
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("diameter.3gpp", 911, new_create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp));
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Initialized = TRUE;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
} else {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
dissector_delete_uint("udp.port", gtpv0_port, gtp_prim_handle);
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_delete_uint("udp.port", gtpv1c_port, gtp_handle);
dissector_delete_uint("udp.port", gtpv1u_port, gtp_handle);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
if (gtp_over_tcp) {
Don't call subdissectors / expert...() / col...() under 'if (tree)' Also: Remove some uneeded initializers; Do some whitespace cleanup and re-formatting. svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
dissector_delete_uint("tcp.port", gtpv0_port, gtp_prim_handle);
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_delete_uint("tcp.port", gtpv1c_port, gtp_handle);
dissector_delete_uint("tcp.port", gtpv1u_port, gtp_handle);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
}
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
gtp_over_tcp = g_gtp_over_tcp;
Use value_string_ext fcns to access various value_string arrays. Also: use value_string_const() instead of value_string() where apropriate; minor reformatting & whitespace cleanup. svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
gtpv0_port = g_gtpv0_port;
gtpv1c_port = g_gtpv1c_port;
gtpv1u_port = g_gtpv1u_port;
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("udp.port", g_gtpv0_port, gtp_prim_handle);
dissector_add_uint("udp.port", g_gtpv1c_port, gtp_handle);
dissector_add_uint("udp.port", g_gtpv1u_port, gtp_handle);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
if (g_gtp_over_tcp) {
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("tcp.port", g_gtpv0_port, gtp_prim_handle);
dissector_add_uint("tcp.port", g_gtpv1c_port, gtp_handle);
dissector_add_uint("tcp.port", g_gtpv1u_port, gtp_handle);
From Kari Tiirikainen: Req/resp tracking and service response time stats for GTP-C svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
}
GTP support, from Michal Melerowicz. svn path=/trunk/; revision=3252
2001-04-04 01:00:19 +00:00
}
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* indent-tabs-mode: nil
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
* End:
*
Fix vi "modeline" so it works; See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748 svn path=/trunk/; revision=39074
2011-09-21 16:28:53 +00:00
* vi: set shiftwidth=4 tabstop=8 expandtab:
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* :indentSize=4:tabSize=8:noTabs=true:
Add some length checks. svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
*/