Commit graph

67 commits

Author SHA1 Message Date
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
Masayuki Takemura
773c02da8f diameter_3gpp: Dissect Feature-List flags in Gx message
With this patch, wireshark dissects the Feature-List flags field in Gx message
and displays the name and value of each of Feature bit.

Change-Id: I18af8a133ae7db4da5a126a81521c474d1553719
Reference: 3GPP TS 29.212 V11.7.0, Section 5.4.1.
Reviewed-on: https://code.wireshark.org/review/1652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-15 14:32:45 +00:00
AndersBroman
c0b7e19e1e Fix display of AVP: 3GPP-MS-TimeZone(23), oct is owerwritten.
Change-Id: I12caa4b612bb98459899054841317361bf4af215
Reviewed-on: https://code.wireshark.org/review/1273
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-22 08:38:49 +00:00
Guy Harris
4e8d739609 Use tvb_strncaseeql() to check for XML.
This avoids using tvb_get_nstringz0(), and simplifies the check.

Change-Id: Ib33cf22bf79d4fac8896c25a8b879eeb6e506831
Reviewed-on: https://code.wireshark.org/review/1044
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 21:32:42 +00:00
AndersBroman
aea1edfe0d Mark tree as unused.
Change-Id: I57c201c0077144aace68bb51a6b0c7350dd8d5a8
Reviewed-on: https://code.wireshark.org/review/713
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 15:27:53 +00:00
AndersBroman
e839a4abb9 Inhance summary output for some 3GPP AVPs
Change-Id: I3657cef87070b91ae17a438140f1fb77edae8622
Reviewed-on: https://code.wireshark.org/review/709
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 15:08:59 +00:00
AndersBroman
fcf1c44b50 Make the avp_str available to sub dissectors and Let the subdissector have
precedence filling in the avp_item string. Use that in a couple of places.

Change-Id: I1af7a1ca4c14fb56ddeaab336202e6c2a18e556b
Reviewed-on: https://code.wireshark.org/review/699
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16 19:15:54 +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
Michael Mann
5de5fe6cb1 Pass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=52919
2013-10-28 15:59:26 +00:00
Bill Meier
2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Anders Broman
edbade8458 3GPP-MS-TimeZone value is not decoded in RADIUS and DIAMETER messages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9099

svn path=/trunk/; revision=51765
2013-09-05 05:03:42 +00:00
Anders Broman
10f7f95d09 From Katrina Zhang:
637 UAR-Flags dissection.

svn path=/trunk/; revision=51749
2013-09-04 18:08:08 +00:00
Alexis La Goutte
7ecb6b1d7d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51731
2013-09-03 18:42:01 +00:00
Alexis La Goutte
7ac4759b0c Fix warning found by fix-encoding-args tools
svn path=/trunk/; revision=51683
2013-09-02 23:15:59 +00:00
Alexis La Goutte
010c63358c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51654
2013-09-02 23:10:51 +00:00
Anders Broman
894ca4e904 From Johan Wåhl:
Dissect 3GPP AVP 637 UAR-Flags.

svn path=/trunk/; revision=51575
2013-08-29 17:09:14 +00:00
Jörg Mayer
545a84185e Fix for
[ 28%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-diameter_3gpp.c.o
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-diameter_3gpp.c:232:90: error: 
      unused parameter 'tree' [-Werror,-Wunused-parameter]
  ...*tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) 
                                               ^
1 error generated.
make[2]: *** [epan/CMakeFiles/epan.dir/dissectors/packet-diameter_3gpp.c.o] Error 1


svn path=/trunk/; revision=50799
2013-07-22 21:25:04 +00:00
Anders Broman
5e56e72953 Dissect S6 feature list.
svn path=/trunk/; revision=50796
2013-07-22 20:44:01 +00:00
Evan Huus
9e1b53539a Remove unused variable, fix comparison to use double-equals.
svn path=/trunk/; revision=50768
2013-07-21 21:10:13 +00:00
Anders Broman
df9bbb93a3 Interpretation of 3gpp_feature_list depends on Application Id.
svn path=/trunk/; revision=50766
2013-07-21 20:58:37 +00:00
Anders Broman
2ee4339b9e Dissect new flags
svn path=/trunk/; revision=50701
2013-07-17 18:19:23 +00:00
Jeff Morriss
f3dfe6b4df One of the unused hf's commented out in r47389 was not used due to a
cut-n-pasteo.  Fix that cut-n-pasteo and reinstate the hf.

svn path=/trunk/; revision=50049
2013-06-19 18:38:41 +00:00
Jeff Morriss
a53776288f Don't try to decode an IPv6 address if it looks like we've been handed the
(obsolete) Server-Assignment-Type AVP (which conflicts with the newer
3GPP-SGSN-IPv6-Address AVP).

This allows users to not see malformed packets (which look completely correct)
if they choose to use the AVP values from imscxdx.xml instead of those from
TGPPGmb.xml.

svn path=/trunk/; revision=49296
2013-05-14 19:26:33 +00:00
Anders Broman
263a9d0683 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48341
2013-03-16 16:25:41 +00:00
Anders Broman
fe5848271f from Katrina Zhang:
Adding Bit 5 support of AVP(IDR-Flags)

svn path=/trunk/; revision=48300
2013-03-14 18:59:56 +00:00
Bill Meier
c439b805e2 Comment out unused hf[] entries & etc.
(found by checkhf)

svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +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
Jakub Zawadzki
5a8783f5b1 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
Michael Mann
49ae61370e Adding period to proto filter name for being part of the "diameter" grouping.
svn path=/trunk/; revision=44652
2012-08-24 02:17:42 +00:00
Anders Broman
3dc1e2df63 Update AVP dissection.
svn path=/trunk/; revision=43625
2012-07-09 14:10:40 +00:00
Jakub Zawadzki
b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Anders Broman
a72f9abfc0 From David Wei:
Further additions and fixes to MBMS in GTPv2 and DIAMETER dissectors.

svn path=/trunk/; revision=42289
2012-04-27 10:48:03 +00:00
Bill Meier
f0c3ee5c4a Whitespace cleanup: Indentation, trailing, ...
svn path=/trunk/; revision=42266
2012-04-26 16:05:05 +00:00
Anders Broman
949079e2b4 From David Wei:
Bug fixes and improvements to Sm (GTPv2) and SGmb (DIAMETER) dissectors.

svn path=/trunk/; revision=42220
2012-04-24 12:33:00 +00:00
Bill Meier
126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +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
2bf572bc41 Remove unneeded #includes: proto.h,tvbuff.h,value_string.h,stdlib.h,...
svn path=/trunk/; revision=38413
2011-08-08 17:59:32 +00:00
Anders Broman
36e5bc35c4 Use tvb_length when adding MSISDN.
svn path=/trunk/; revision=38226
2011-07-27 13:17:58 +00:00
Anders Broman
b0997749ea Prettify som 3GPP AVP:s
svn path=/trunk/; revision=37326
2011-05-20 13:55:21 +00:00
Anders Broman
d7457be727 Fix a typo.
svn path=/trunk/; revision=37294
2011-05-19 15:23:19 +00:00
Anders Broman
48060f2587 Subdissect 2 3GPP AVP:s that are actually text.
svn path=/trunk/; revision=37292
2011-05-19 14:41:58 +00:00
Anders Broman
2251b8d331 From Johan Wåhl:
Add dissection of feature list flags.

svn path=/trunk/; revision=36497
2011-04-06 15:01:42 +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
285513860c Add sub dissection of AVP MBMS Service Area.
svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +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
Anders Broman
7dd3704e0c Fix a comment.
svn path=/trunk/; revision=35198
2010-12-16 12:26:01 +00:00
Anders Broman
68fba79bed Dissect AVP Code: 606 User-Data if it's xml.
svn path=/trunk/; revision=35197
2010-12-16 10:04:00 +00:00
Anders Broman
2031cda3df From KATAOKA Toshihiro:
3GPP Diameter S6a flags.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4893
Modified to use tfs_set_notset.

svn path=/trunk/; revision=33257
2010-06-20 10:25:26 +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