Commit graph

267 commits

Author SHA1 Message Date
Michael Mann
7ff40ceeb5 Remove proto_tree_add_text from packet-gtp.c
Change-Id: I53dcee56565e2a82bf0789199ce1c552f622840b
Reviewed-on: https://code.wireshark.org/review/7730
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18 05:26:44 +00:00
Mato
8eab7c611c Support gtpp data record format version older than 6
Bug: 11051
Change-Id: I04b1f1c852b60182ef7f5405716c0b6733d0f44a
Reviewed-on: https://code.wireshark.org/review/7679
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-14 16:22:34 +00:00
Bastien Bailly
39a984e649 GTP: Bad bytes read for extended rnc id value
offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.

Bug:10877
Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-22 09:56:25 +00:00
AndersBroman
20e2c05d9b [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs

Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 13:37:14 +00:00
Michael Mann
64a7bac641 tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:16:23 +00:00
Alexis La Goutte
11212887a1 GTP: fix Copy-paste error (CID 1158594 & 1158595)
Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff
Reviewed-on: https://code.wireshark.org/review/6166
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 15:50:23 +00:00
Michael Mann
1d598bbff7 Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 14:09:27 +00:00
Michael Mann
3d3f97320b Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 21:17:10 +00:00
Martin Mathieson
48db2548a9 Deleting unneccessary #includes from dissectors.
Second batch (packet-eth.c -> packet-icmpv6.d).

Will look at cleaning up and committing script afterwards.

Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594
Reviewed-on: https://code.wireshark.org/review/6013
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:22:54 +00:00
Bill Meier
b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
AndersBroman
d99fe210af Update to V12.5.0
Bug: 10782

Change-Id: I5fd4ec14279411682d8a23f5e0f503180113f093
Reviewed-on: https://code.wireshark.org/review/5790
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17 12:25:53 +00:00
Bill Meier
f412c9a01a Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_BIG_ENDIAN).

Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:45:56 +00:00
Jeff Morriss
cfd71d7c2a 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:49:51 +00:00
Jeff Morriss
ea5b2343c6 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:38:09 +00:00
AndersBroman
2f3e577748 [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:26:15 +00:00
Michael Mann
0744558a35 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 21:09:57 +00:00
Pascal Quantin
82d1a85ad2 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-26 04:14:18 +00:00
Bill Meier
b14bf98c06 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:51:51 +00:00
Bill Meier
93cc6f004f 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 19:43:27 +00:00
Jeff Morriss
863b6646d6 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 20:24:47 +00:00
Martin Kaiser
5c554c9c41 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:06:23 +00:00
AndersBroman
88e802516b 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 15:01:41 +00:00
Pascal Quantin
826bca0918 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:55:03 +00:00
Pascal Quantin
2dbab6df18 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-03 07:30:20 +00:00
Michael Mann
fe4b7ee625 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-29 13:10:02 +00:00
Evan Huus
3fc441e7a5 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:54:28 +00:00
Michael Mann
14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo
246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Dario Lombardo
971ffd683e 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-18 14:13:58 +00:00
Michael Mann
73217d9f3f 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-07 15:41:07 +00:00
Alexis La Goutte
296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Guy Harris
1b046b76f3 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 19:00:03 +00:00
Bill Meier
93fe4d53e2 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:36:38 +00:00
Pascal Quantin
92a369eaf4 Remove a few wrong use of tvb_get_string()
Change-Id: I7095e12439fd8c0c5cd3ce14d19662efa3fd841f
Reviewed-on: https://code.wireshark.org/review/339
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-25 07:47:57 +00:00
Evan Huus
953c3ef517 Fix dissection of GTP MM Context RAND field.
As suggested by Lükő Bálint to fix bug #9722.

Change-Id: I177f7632a0936f105b1acff5e7c20bcce2328957
Reviewed-on: https://code.wireshark.org/review/109
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-04 15:42:01 +00:00
Jakub Zawadzki
d28084d183 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
Jakub Zawadzki
deb2b236f2 Add missing includes
svn path=/trunk/; revision=54332
2013-12-21 17:23:17 +00:00
Evan Huus
a6415ece0a 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
Jakub Zawadzki
c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Guy Harris
ce7b83123c 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
Martin Mathieson
a9bd097e71 Start teid_data field from the correct offset
svn path=/trunk/; revision=53688
2013-12-01 08:52:06 +00:00
Martin Mathieson
73f042aa35 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
Anders Broman
88d0e909a2 From Katrina Zhang:
Add/fix RFSP dissection.

svn path=/trunk/; revision=53163
2013-11-08 05:58:13 +00:00
Bill Meier
0ad98563a2 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
Bill Meier
fbba4415a6 FIX compiler warning:
packet-gtp.c: In function 'dissect_gtp_common':
  packet-gtp.c:7838: warning: unused variable 'pd_save'

svn path=/trunk/; revision=52932
2013-10-28 20:37:58 +00:00
Michael Mann
e68d15514b 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
Bill Meier
a3a15ff90b Remove instances of unused 'data_handle' (and of one other handle).
svn path=/trunk/; revision=52767
2013-10-22 16:13:32 +00:00
Bill Meier
2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Pascal Quantin
102c452bcb More emem -> wmem conversion:
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly

svn path=/trunk/; revision=52180
2013-09-22 20:04:35 +00:00
Pascal Quantin
a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00