Commit graph

189 commits

Author SHA1 Message Date
AndersBroman
168f241962 Expand gtpv2_srvcc_cause_vals with new values from TS 29.280 V11.5.0
and fix up the msg names.

Change-Id: If2cc51a99bc236e840fea274d32989a5fe96aa29
Reviewed-on: https://code.wireshark.org/review/199
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-13 19:33:25 +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
Anders Broman
a1f179c4f5 Make local functions static. Include *.h when needed.
svn path=/trunk/; revision=54164
2013-12-17 06:10:41 +00:00
Jakub Zawadzki
c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Bill Meier
ebaeed5a1f (Trivial)
- Fix indentation to match editor modelines (tabs-->spaces);
 - Rework/add some whitespace;

svn path=/trunk/; revision=53978
2013-12-12 20:16:30 +00:00
Jakub Zawadzki
1899903f69 Include <epan/to_str.h> only when needed.
svn path=/trunk/; revision=53189
2013-11-09 13:41:10 +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
Michael Mann
e15afadb11 Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data. There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins. They must now update their dissectors to get the "instance ID" from the dissector data parameter.
svn path=/trunk/; revision=52938
2013-10-29 00:25:57 +00:00
Bill Meier
9874da2fcb #if 0 numerous "unused const variables" (mostly value-string-arrays);
Also; fix a few "set but not used" warnings.

svn path=/trunk/; revision=52780
2013-10-23 06:29:11 +00:00
Michael Mann
cf80442912 Convert some proto_tree_add_string_format calls to something more appropriate.
There seem to be several cases of proto_tree_add_string_format where a "string" value/filter doesn't really make sense because it's always empty, and is just being used as a "filterable subtree header (placeholder)".  They appear to be more for "presense" than "value" and should probably be FT_NONE, although I'd almost argue for removing the filter in favor of  proto_tree_add_text.

svn path=/trunk/; revision=52296
2013-09-30 15:21:09 +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
Pascal Quantin
514b38fbdd Make it more obvious that the function is using wmem memory
svn path=/trunk/; revision=52162
2013-09-21 11:08:35 +00:00
Michael Mann
346f803d42 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 all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string

There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.

svn path=/trunk/; revision=52098
2013-09-16 10:39:06 +00:00
Evan Huus
e746a01ce8 Display GTPv2 Area Code fields (which show up in some DIAMETER AVPs) as
BASE_HEX_DEC instead of just BASE_DEC.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9118

svn path=/trunk/; revision=51822
2013-09-07 13:56:25 +00:00
Chris Maynard
f6eb619d87 Display "TEID/GRE Key" field consistently as hexadecimal since 3GPP TS 36.444 says this field is of type, "octet string".
Ref: http://ask.wireshark.org/questions/24221/decode-gtpv2-teid-as-decimal-or-hex

#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=51789
2013-09-05 18:51:46 +00:00
Anders Broman
a53b483969 From Katrina Zhang:
Change to tfs_enabled_disabled.

svn path=/trunk/; revision=51750
2013-09-04 18:10:00 +00:00
Pascal Quantin
84bf0acc00 Convert a few dissectors from EMEM to WMEM API
svn path=/trunk/; revision=51597
2013-08-30 14:49:55 +00:00
Anders Broman
ce6a604f07 From Tommy Wu:
Update Octet 7 of Indication IE.

svn path=/trunk/; revision=51435
2013-08-20 05:04:45 +00:00
Michael Mann
7878e93cad expert_add_info_format_text + proto_tree_add_text = proto_tree_add_expert_format, where applicable.
svn path=/trunk/; revision=50377
2013-07-03 23:43:26 +00:00
Michael Mann
98492c5619 expert_add_info + proto_tree_add_text = proto_tree_add_expert, where applicable
svn path=/trunk/; revision=50337
2013-07-03 02:59:31 +00:00
Jeff Morriss
e9a5b16a09 From Katrina Zhang via Anders (manually applied by me): dissect node features.
From me: remove some tabs and trailing white space.

svn path=/trunk/; revision=49922
2013-06-14 02:44:15 +00:00
Michael Mann
2d37ec3cb0 Batch of filterable expert infos.
svn path=/trunk/; revision=49853
2013-06-09 03:28:05 +00:00
Anders Broman
fdf00ccc4e Dissect new element in GTPv2 MM Context.
svn path=/trunk/; revision=48977
2013-04-22 19:03:12 +00:00
Anders Broman
29734bf7b3 Fix GTPv2 MM Context (UMTS Key, Quad, and Quint Decoded) incorrectly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8596

svn path=/trunk/; revision=48928
2013-04-19 16:06:55 +00:00
Pascal Quantin
847fb4ef0a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8493 :
Use proto_tree_add_item instead of proto_tree_add_bits_item to display Used Cipher

svn path=/trunk/; revision=48393
2013-03-18 16:11:00 +00:00
Anders Broman
ffaf67b615 from Katrina Zhang:
According to the latest TS29.274 -- adding 4 IE support: H(e)NB Information Reporting[165]; IPv4 Configuration Parameters (IP4CP)[166]; Change to Report Flags[167]; Action Indication[168]

 -- cause values of IE(Cause)

svn path=/trunk/; revision=48301
2013-03-14 19:00:40 +00:00
Bill Meier
6549fbbad7 #if 0 unused hf[] entries & etc.
Note: All (or almost all) unused hf[] entries
       in non-generated Wireshark dissectors
       have been #if 0'd (or commented) out.
       (This applies only to 'static hf_...' vars).
      A number of (non-generated) dissector
       files with *missing* hf[] entries
       still need to be fixed.


svn path=/trunk/; revision=47459
2013-02-03 22:29:48 +00:00
Bill Meier
c268f2c153 Add missing '&hf_gtpv2_bss_con_xid' entry to hf[].
(Found by checkhf)

Fix apparent issues with two hf[] entries.

Also: Do minor whitespace cleanup.

##Baclport 1.8

svn path=/trunk/; revision=47344
2013-01-29 14:31:21 +00:00
Pascal Quantin
f857265011 Fix some dead increment warnings found by Clang
svn path=/trunk/; revision=47319
2013-01-27 18:58:52 +00:00
Pascal Quantin
40efff2019 Fix warning: cast to pointer from integer of different size
While we are at it, restore the private data if no private extension dissector is not found (seems to be the right thing to do)

svn path=/trunk/; revision=47255
2013-01-24 10:36:51 +00:00
Anders Broman
7140161402 From Katrina Zhang sligtly modified.
- Correct dissection of 8.50 Selected PLMN ID.
- Pass Instance to private extension dissectors.

svn path=/trunk/; revision=47251
2013-01-24 09:56:28 +00:00
Anders Broman
d59e9cf574 mm_context_used_cipher is 3 bits.
svn path=/trunk/; revision=47230
2013-01-23 15:56:29 +00:00
Pascal Quantin
1891adc28e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8208 :
Display ECI and LAC in decimal and fix highlighting of CGI, SAI, RAI, TAI, ECGI and LAI fields

svn path=/trunk/; revision=47071
2013-01-14 18:29:27 +00:00
Pascal Quantin
9a2fbb1978 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8098 :
Incorrect dissection of SAC and RAC in 3GPP ULI AVP

svn path=/trunk/; revision=46556
2012-12-16 08:58:46 +00:00
Anders Broman
1ecfc445b8 From zhang lei:
Cause、RAB Context、PDU Numbers in packet-gtpv2.c are not dissected correctly. fixed in the patch.

The patch did not apply cleanly to trunk, applied by hand.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8079

svn path=/trunk/; revision=46497
2012-12-11 09:39:15 +00:00
Anders Broman
0c348dbb6b Copy paste error - RAC is one byte.
svn path=/trunk/; revision=46485
2012-12-09 18:22:09 +00:00
Anders Broman
799983a565 Fix dissection of Target Identification.
svn path=/trunk/; revision=46484
2012-12-09 18:17:47 +00:00
Anders Broman
6e0208c98e Correct dissection of RNC ID in two places.
svn path=/trunk/; revision=46443
2012-12-07 14:41:05 +00:00
Anders Broman
11c4c6d4f3 Use qui_tree.
svn path=/trunk/; revision=46275
2012-11-29 12:04:11 +00:00
Anders Broman
2b8b65ee68 - Fix a typo; Authentication Quadruplets not dissected correctly.
- Add RSFP index IE dissection.

svn path=/trunk/; revision=46274
2012-11-29 10:57:33 +00:00
Bill Meier
044514edbd Fix several [-Wshadow] warnings;
Also:
- Create/use several extended value strings;
- Do various whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46205
2012-11-26 16:50:13 +00:00
Anders Broman
0fa05b7d2d Cell Identity (CI) is 2 octets.
svn path=/trunk/; revision=46152
2012-11-23 12:00:21 +00:00
Anders Broman
66989ad3d4 f_teid_interface_type is 6 bits from Rel 10
svn path=/trunk/; revision=46031
2012-11-14 19:41:35 +00:00
Stig Bjørlykke
192372726b Corrected a (guint32) cast
svn path=/trunk/; revision=45944
2012-11-06 08:42:48 +00:00
Anders Broman
3d194979d6 Add IE/Options dissection.
svn path=/trunk/; revision=45829
2012-10-29 16:02:51 +00:00
Jeff Morriss
2552c750e5 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
Anders Broman
f218d66053 Only provide the parameter data in the tvb used when calling subdissector for private extensions.
Add vendor ID to item.
Show flags in hex.

svn path=/trunk/; revision=44967
2012-09-18 07:39:14 +00:00
Anders Broman
9ec55f59d7 From Claude LeFrancois:
Cosmetic changes to GTPv2(Add text to itenms)
Minor code changes by me.

svn path=/trunk/; revision=44891
2012-09-14 08:24:35 +00:00