Commit Graph

166 Commits

Author SHA1 Message Date
Anders Broman 289c42fd58 From David Wei:
Update the latest IE's

svn path=/trunk/; revision=40831
2012-02-04 09:41:21 +00:00
Jeff Morriss eba7aaecc0 dissect_gtpv2_mbms_session_duration(): 'tree' is unused but 'item' is. Mark them as such.
svn path=/trunk/; revision=40817
2012-02-02 21:35:51 +00:00
Anders Broman d35177e0d2 From David Wei:
Start update with the latest signals and IE's

svn path=/trunk/; revision=40812
2012-02-02 20:56:20 +00:00
Jörg Mayer dbf1be8944 As reported by hyphenated on #wireshark:
don't increase offset by 4 after two add_item(...,2 ,...) commands.
Increase by 2 after each add_item instead.

svn path=/trunk/; revision=40606
2012-01-20 16:12:24 +00:00
Chris Maynard 436b44b99e Fix some duplicate display filter names.
svn path=/trunk/; revision=40592
2012-01-19 21:57:24 +00:00
Bill Meier 29c17df6a5 Fix [-Wunused-but-set-variable] gcc warning;
Use consistent indentation.

svn path=/trunk/; revision=40192
2011-12-14 00:06:16 +00:00
Anders Broman dd48ee3af3 Add a dissector table for private extensions.
svn path=/trunk/; revision=40114
2011-12-07 19:04:13 +00:00
Anders Broman 628a4abea3 Squelch a warning.
svn path=/trunk/; revision=40066
2011-12-01 21:48:25 +00:00
Anders Broman 4dd121e599 Extend dissection of GTPv2 EPS Security Context and Quadruplets.
svn path=/trunk/; revision=40065
2011-12-01 21:26:22 +00:00
Bill Meier a25e421a10 Fix some [-Wunused-but-set-variable] warnings
(in some cases by changing proto_tree_add_item() to use
  what appears to be the correct 'tree' arg);
Do whitespace cleanup.

svn path=/trunk/; revision=39772
2011-11-09 02:48:51 +00:00
Anders Broman 28f7d63c58 Dissect RIM related IEs
svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier 67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
Bill Meier 94f36ca4ff 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
Bill Meier e6bd9d1a8c Whitespace cleanup:
Use consistent indentation;
 Convert "4 space tabs" to spaces;
 Remove trailing whitespace.

svn path=/trunk/; revision=39082
2011-09-21 18:55:03 +00:00
Bill Meier 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Anders Broman 5e31dc0f8c Make dissection of AVP: 3GPP-User-Location-Info(22) l=15 f=V-- vnd=TGPP val=303231 more robust.
svn path=/trunk/; revision=38739
2011-08-26 06:22:20 +00:00
Anders Broman 430cd6f730 Use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=38738
2011-08-26 05:54:00 +00:00
Stephen Fisher d69f85cb4e Mark length parameter as unused
svn path=/trunk/; revision=38714
2011-08-24 15:35:32 +00:00
Anders Broman 357767d835 Use elm_len for the length.
svn path=/trunk/; revision=38713
2011-08-24 15:22:29 +00:00
Anders Broman 1c9c62e1ca Mark length as U(nsused)
svn path=/trunk/; revision=38618
2011-08-19 12:15:54 +00:00
Anders Broman e56f077015 Fix MM Context for E-UTRAN SRVCC elment lengths
svn path=/trunk/; revision=38617
2011-08-19 12:02:49 +00:00
Bill Meier 3b627d04fd Convert "4 space tabs" to spaces + do other whitespace cleaup.
svn path=/trunk/; revision=38328
2011-08-03 21:14:04 +00:00
Bill Meier e6cb34fbac Minor cleanup
[benign] Remove _U_ from param arg when param is actually used;
[benign] Use 'item' (not 'tree') arg for proto_item_append_text()
Whitespace

svn path=/trunk/; revision=38327
2011-08-03 20:31:51 +00:00
Bill Meier a71d51d0d7 AFAICT, the item for 'hf_gtpv2_stn_sr' should be used as the parent tree-item in dissect_gtpv2_stn_sr().
This is a different fix for Coverity 1248 than that committed in SVN 38314.  

svn path=/trunk/; revision=38323
2011-08-03 18:38:23 +00:00
Chris Maynard e7928ce630 Fix Coverity CID 1248: unused value.
svn path=/trunk/; revision=38314
2011-08-02 19:29:51 +00:00
Anders Broman 00de9edf12 Add comment.
svn path=/trunk/; revision=38293
2011-07-31 20:20:30 +00:00
Anders Broman e1313c5756 Add 3GPP Sv interface.
svn path=/trunk/; revision=38270
2011-07-30 14:05:31 +00:00
Stig Bjørlykke ec2940333f Fix a typo.
svn path=/trunk/; revision=38269
2011-07-30 09:52:40 +00:00
Anders Broman 0146079da4 CCRSI is not included in 3GPP 29.274 R8.
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6183

svn path=/trunk/; revision=38268
2011-07-30 09:33:10 +00:00
Bill Meier 8504d231c7 Use (what appears to be) the correct tvb for a function call: Fixes Coverity 919 [UNUSED];
#include <stdlib.h> not req'd.

svn path=/trunk/; revision=37336
2011-05-20 20:10:41 +00:00
Anders Broman 2ad1c8df66 VALS(& -> VALS(
svn path=/trunk/; revision=37009
2011-05-06 12:28:11 +00:00
Jeff Morriss 14232048bc Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will core on that.

Also clean up indentation and white space.

svn path=/trunk/; revision=36775
2011-04-21 18:09:13 +00:00
Anders Broman 8d6ca293dc Change the signature of elem_fcn():ns to include pinfo.
svn path=/trunk/; revision=36443
2011-04-04 14:37:25 +00:00
Anders Broman 5fbe65d670 Update 8.12 Indication IE to 3GPP TS 29.274 version 9.4.0 Release 9
svn path=/trunk/; revision=35921
2011-02-11 21:21:45 +00:00
Jeff Morriss 947ca59731 Register a couple of ett_ variables.
Move the declaration of all the ett_ variables after the hf_ variables
(instead of in between some of them).

svn path=/trunk/; revision=35920
2011-02-11 21:15:41 +00:00
Anders Broman 6956ad46d5 CN-Id is two bytes.
svn path=/trunk/; revision=35606
2011-01-21 09:24:43 +00:00
Jeff Morriss 6cfdeed280 Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.

Replace some memcpy()+tvb_get_ptr() with tvb_memcpy().

svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
Anders Broman 46f62f1b49 Mark a parameter as unused.
svn path=/trunk/; revision=35507
2011-01-12 17:05:58 +00:00
Anders Broman 93cbda72dd Enhance IE dissection.
svn path=/trunk/; revision=35506
2011-01-12 16:43:59 +00:00
Anders Broman 852c75636e Improve dissection of UE Time Zone.
svn path=/trunk/; revision=35477
2011-01-11 17:06:38 +00:00
Anders Broman 275c3c8818 Shorten long winded strings.
svn path=/trunk/; revision=35456
2011-01-10 17:34:00 +00:00
Jeff Morriss dc22fbfc50 Give CSID an abbreviation.
svn path=/trunk/; revision=35446
2011-01-10 03:02:43 +00:00
Anders Broman 5c6ab22ff3 Get rid of check_col().
svn path=/trunk/; revision=35432
2011-01-09 13:50:03 +00:00
Anders Broman f23d884631 Try to fix:
packet-gtpv2.c:2648: warning: return type defaults to 'int'
packet-gtpv2.c: In function 'dissect_udp_s_port_nr':
packet-gtpv2.c:2690: warning: unused parameter 'length'
packet-gtpv2.c: In function 'dissect_gtpv2_fq_csid':
packet-gtpv2.c:2845: warning: unused parameter 'length'
packet-gtpv2.c: In function 'dissect_gtpv2_emlpp_pri':
packet-gtpv2.c:2927: warning: implicit declaration of function 'be_emlpp_prio'
packet-gtpv2.c: At top level:
packet-gtpv2.c:3056: warning: initialization from incompatible pointer type

svn path=/trunk/; revision=35431
2011-01-08 20:26:35 +00:00
Anders Broman b6427b53b5 Further IE dissection updates.
svn path=/trunk/; revision=35430
2011-01-08 20:09:29 +00:00
Jeff Morriss bf2796ab92 Don't try to display a string in BASE_DEC. Also delete duplicate registration of hf_gtpv2_pti.
svn path=/trunk/; revision=35422
2011-01-07 19:01:17 +00:00
Anders Broman f235eadf25 ** (process:23326): WARNING **: Field 'Reserved bit(s)' does not have an
abbreviation

** ERROR **: Field 'IPv4 Address' (gtpv2.ipv4_addr) is an FT_IPv4 but is being
displayed as BASE_DEC instead of BASE_NONE

svn path=/trunk/; revision=35420
2011-01-07 18:04:03 +00:00
Anders Broman 6d801a2052 Fix buildbot.
svn path=/trunk/; revision=35419
2011-01-07 16:12:01 +00:00
Anders Broman 863e3f80a6 Add dissection of more IE:s
svn path=/trunk/; revision=35417
2011-01-07 15:21:23 +00:00
Anders Broman 660d827706 Enhance IE dissection.
svn path=/trunk/; revision=35378
2011-01-05 16:46:40 +00:00
Jeff Morriss f94b75c658 Give a couple of fields abbreviations.
svn path=/trunk/; revision=35362
2011-01-04 18:41:25 +00:00
Anders Broman 95397594c9 Maeke use of dissect_e212_mcc_mnc_ep_str().
svn path=/trunk/; revision=35361
2011-01-04 16:58:55 +00:00
Anders Broman 9eb2d42bac Add more info to the tree.
svn path=/trunk/; revision=35354
2011-01-04 07:14:11 +00:00
Anders Broman da59924551 Prettify dissection of User Location Info (ULI). (Complete)
svn path=/trunk/; revision=35352
2011-01-03 23:21:49 +00:00
Anders Broman 5045d66232 Prettify dissection of User Location Info (ULI).
svn path=/trunk/; revision=35351
2011-01-03 22:13:11 +00:00
Anders Broman 24550de720 Mark unused parameters as such.
svn path=/trunk/; revision=35341
2011-01-03 17:32:15 +00:00
Anders Broman 288d47d1f2 Mark unused parameters as such.
svn path=/trunk/; revision=35340
2011-01-03 17:30:35 +00:00
Anders Broman 56c1d1569c Comment out a faulty line.
svn path=/trunk/; revision=35339
2011-01-03 17:26:12 +00:00
Anders Broman 9794ffb051 Enhance IE dissection and a number of bug fixes.
svn path=/trunk/; revision=35338
2011-01-03 17:22:02 +00:00
Anders Broman f27aa6297a Extend IE dissetcion.
svn path=/trunk/; revision=35307
2010-12-30 14:09:09 +00:00
Guy Harris a8bc4a0d13 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
Bill Meier 7219ee2a49 Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;

svn path=/trunk/; revision=34143
2010-09-17 04:51:21 +00:00
Anders Broman 187baa00fa GTPv2: IMSI is decoded improperly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5179

svn path=/trunk/; revision=34062
2010-09-03 17:10:52 +00:00
Martin Mathieson 21ec91d326 Fix warnings as seen in gcc 3.4.6
svn path=/trunk/; revision=33604
2010-07-21 12:29:32 +00:00
Stig Bjørlykke a731837323 From KATAOKA Toshihiro via bug 5033:
3GPP GTPv2 header Update:
- piggybacked flag
- sequence number

From me:
Updated the comments for sequence number.

svn path=/trunk/; revision=33603
2010-07-21 10:28:46 +00:00
Anders Broman 2903a17305 Dissect one F-container
svn path=/trunk/; revision=33372
2010-06-29 14:56:39 +00:00
Stig Bjørlykke 51ef439176 Mark an unused argument.
svn path=/trunk/; revision=33357
2010-06-28 21:05:31 +00:00
Anders Broman 7ba4ce1983 Dissect more GTPV2 IE's
svn path=/trunk/; revision=33351
2010-06-28 15:31:41 +00:00
Anders Broman 5cdc63be46 Remove C++ style comment.
svn path=/trunk/; revision=33159
2010-06-08 10:37:03 +00:00
Anders Broman 92c247bf70 Fix packet-gtpv2.c:945:1: error: "/*" within comment
svn path=/trunk/; revision=33158
2010-06-08 08:55:07 +00:00
Anders Broman 7f9a9231dd From Tamás Regõs:
Change dissection of  User Location Info (ULI) to show the spare bits
in the protocol tree and don't show ECI as a bitfield.

svn path=/trunk/; revision=33157
2010-06-08 08:36:22 +00:00
Anders Broman 6d64725ae5 ECI (E-UTRAN Cell Identifier) wrongly decoded.
Spotted by Tamás Regõs.

svn path=/trunk/; revision=33128
2010-06-07 14:29:03 +00:00
Anders Broman 2fdf04a43e Update value_strings with IE names.
svn path=/trunk/; revision=33043
2010-06-02 06:17:02 +00:00
Anders Broman c58a769956 Remove the now unused value_strings.
svn path=/trunk/; revision=33038
2010-06-01 22:23:22 +00:00
Anders Broman 875240d59e - Traffic flow template miss dissected, use de_sm_tflow_temp()
insted.
- Dissect vendor id of private message.

svn path=/trunk/; revision=33037
2010-06-01 22:22:09 +00:00
Bill Meier 10ffd14b8f Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Bill Meier 69df32fb11 #include <string.h> not needed.
svn path=/trunk/; revision=32411
2010-04-06 22:09:47 +00:00
Anders Broman b3607a98ae From Toshihiro KATAOKA:
The decoded MSISDN AVP in 3GPP diameter AVP and the decoded MSISDN IE in 3GPP
GTPv2 IE are not correct. 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4638

svn path=/trunk/; revision=32377
2010-04-05 07:37:04 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Gerasimos Dimitriadis dfde72f247 Fix for Bug 4588:
RANAP and friends want the MNC encoded in big endian form.

svn path=/trunk/; revision=32257
2010-03-20 23:53:22 +00:00
Gerasimos Dimitriadis b7261fe2e4 Expert info when E.212 MCC/MNC contain non-decimal digits
svn path=/trunk/; revision=31102
2009-11-27 22:57:50 +00:00
Anders Broman d9a86550c2 Remove debug printout.
svn path=/trunk/; revision=29968
2009-09-17 13:53:06 +00:00
Martin Mathieson 9467ccee2c Also mark tree as an unmarked parameter.
svn path=/trunk/; revision=29928
2009-09-15 17:07:54 +00:00
Anders Broman 70fabd5881 Remove now unused variables.
svn path=/trunk/; revision=29925
2009-09-15 16:46:30 +00:00
Anders Broman 6a5a9b2174 Bearer Context not dissected correctly.
Use the built in IE decoding by calling dissect_gtpv2_ie_common() for
the grouped IE:s.

svn path=/trunk/; revision=29924
2009-09-15 15:54:06 +00:00
Anders Broman eeb1f0df18 From swapnil:
Bug in Traffic Aggregate Description (TAD) IE in Packet-gtpv2.c fixed.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3940

svn path=/trunk/; revision=29556
2009-08-26 04:36:14 +00:00
Anders Broman 7945bf1bc9 From Harald Welte :
Connect RRLP to GSM A DTAP application info message.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3919

From me try to fix missuse of pinfo.

svn path=/trunk/; revision=29482
2009-08-20 07:26:16 +00:00
Jaap Keuter a4e174b7f8 From Swapnil Barai:
Minor Bug in Bearer Context in Packet-gtpv2.c fixed.

svn path=/trunk/; revision=29460
2009-08-18 06:41:12 +00:00
Kovarththanan Rajaratnam 5bd6d8eaaf From William Preston via. 3549:
A typo in 2 of the field names causes the apn not to be displayed.

svn path=/trunk/; revision=29394
2009-08-12 15:12:19 +00:00
Gerald Combs 1f3776bf8b Add some length checks.
svn path=/trunk/; revision=29388
2009-08-11 23:29:21 +00:00
Anders Broman 07900e7a1a From swapnil:
Small Bug in TFT (Flow label) and ULI.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3876

svn path=/trunk/; revision=29386
2009-08-11 21:27:36 +00:00
Anders Broman bae780d14b From swapnil:
Bugs Fixed in ULI in packet-gtpv2.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3860

svn path=/trunk/; revision=29376
2009-08-11 10:32:46 +00:00
Anders Broman a8fbd4577f From swapnil:
Another Minor Bug for ULI in Packet-gtpv2.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3862

svn path=/trunk/; revision=29374
2009-08-11 07:41:46 +00:00
Kovarththanan Rajaratnam 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Kovarththanan Rajaratnam e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Guy Harris 99bd70035d Completely remove an unused variable, don't just comment it out
(especially with a C++/C99-style comment that not all compilers used to
compile Wireshark accept).

svn path=/trunk/; revision=29255
2009-07-31 20:13:53 +00:00
Guy Harris db0698fd0a Fix warnings:
the behavior of x = x++ is undefined by the ANSI C standard -
	they obviously just meant x++;

	get rid of unused variables.

svn path=/trunk/; revision=29248
2009-07-30 21:40:22 +00:00
Anders Broman 532f424f33 From swapnil:
Packet-gtpv2.c dissector extended to support more IE's.

svn path=/trunk/; revision=29247
2009-07-30 21:11:26 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00