Commit graph

82 commits

Author SHA1 Message Date
AndersBroman
91addef79c [Diameter] Pretify a couple of AVPs that might be text eventhough they are
specified as octet strings.

Change-Id: Ib3dd1fe18b64c9defdcd6e0434dd9937fbd4dfea
Reviewed-on: https://code.wireshark.org/review/7828
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-26 18:32:34 +00:00
AndersBroman
bccb7f73c7 [Diameter] It's MCC first in 3GPP AVP 909 RAI
Change-Id: If4dd0d64d5a8d313ae9e62d2fcce3606ef8eb4f4
Reviewed-on: https://code.wireshark.org/review/7274
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-20 14:06:07 +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
Martin Mathieson
596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +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
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
AndersBroman
73096642fd [SIP/DIAMETER] Reinstate the lost dfilter_store_sip_from_addr() and use it
for 3GPP AVP 601 Public-Identity.

Change-Id: I5ef6608e7821779b00f79486860ee5f578828dfc
Reviewed-on: https://code.wireshark.org/review/5467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24 16:35:11 +00:00
Jeff Morriss
2d74838e47 Decode the 3GPP MSISDN AVP using the E.164 routines.
Rename dissect_e164_utf8_number() to dissect_e164_msisdn() and give it an
'encoding' argument.

Change-Id: I49cf5d2b24b44a0e69427ceae331f378024391c5
Reviewed-on: https://code.wireshark.org/review/3796
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 19:17:25 +00:00
Jeff Morriss
6edc166c14 Decode User-Name as an IMSI in S13/S13' and S7a/S7d.
Also move the application ID macros into the diameter header file.

Change-Id: Iaca5707c8476d81f50ecdb3aab76be293b5ccfe7
Reviewed-on: https://code.wireshark.org/review/3786
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 21:41:47 +00:00
Jeff Morriss
a3d8f31ad0 Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use it
in the Diameter dissector.

This new API adds a filter for the MSISDN as well as a subtree and filter for
the Country Code.

Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7
Reviewed-on: https://code.wireshark.org/review/3760
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 13:01:22 +00:00
Jeff Morriss
8fc0ee4c89 Decode IMSIs found in Subscription-Id AVPs.
Move decode of the User-Name AVP out of the 3GPP-specific file.
Add a couple of macros for 3GPP AppIDs (rather than using the number directly)
in both files.

Change-Id: I496b4ae86b05264462167b6e41ce1451392de11b
Reviewed-on: https://code.wireshark.org/review/3753
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 19:11:58 +00:00
Jeff Morriss
b9a94f009e Add a routine to dissect an UTF8-encoded IMSI (as you'd find in Diameter) and use it to decode the User-Name AVP of S6a/S6d messages.
Also clean up some white space/formatting.

Change-Id: Idf2d4cad2af1826b24de7d59407ffeb36100c19b
Reviewed-on: https://code.wireshark.org/review/3742
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 02:55:09 +00:00
Michael Mann
9d5f9141af Eliminate proto_tree_add_text from some dissectors.
Other minor cleanup while in the area.

Change-Id: Id8d957d3d68a2e3dd5089f490bd59d773e1be967
Reviewed-on: https://code.wireshark.org/review/3427
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-08-05 07:36:26 +00:00
Bill Meier
9ed99d5c4e Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.
Change-Id: I943153e28f468070d86535abad7be032e1386118
Reviewed-on: https://code.wireshark.org/review/2994
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11 03:20:54 +00:00
Michael Mann
888f22de16 convert to proto_tree_add_subtree[_format]
Change-Id: I2ea1892b5963cc5578cbdd2b03029ca8424f2267
Reviewed-on: https://code.wireshark.org/review/2640
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-25 16:35:14 +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
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