aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-diameter_3gpp.c
AgeCommit message (Collapse)AuthorFilesLines
2014-08-22Decode the 3GPP MSISDN AVP using the E.164 routines.Jeff Morriss1-27/+3
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-21Decode User-Name as an IMSI in S13/S13' and S7a/S7d.Jeff Morriss1-4/+0
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-21Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use itJeff Morriss1-1/+1
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-20Decode IMSIs found in Subscription-Id AVPs.Jeff Morriss1-30/+7
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-20Add a routine to dissect an UTF8-encoded IMSI (as you'd find in Diameter) ↵Jeff Morriss1-77/+101
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-05Eliminate proto_tree_add_text from some dissectors.Michael Mann1-2/+14
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-07-11Strip some trailing whitespace; Fix some indentation; Add editor-modelines ↵Bill Meier1-12/+25
as needed. Change-Id: I943153e28f468070d86535abad7be032e1386118 Reviewed-on: https://code.wireshark.org/review/2994 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-25convert to proto_tree_add_subtree[_format]Michael Mann1-3/+1
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-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-10/+10
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-10/+10
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-15diameter_3gpp: Dissect Feature-List flags in Gx messageMasayuki Takemura1-0/+111
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-04-22Fix display of AVP: 3GPP-MS-TimeZone(23), oct is owerwritten.AndersBroman1-4/+6
Change-Id: I12caa4b612bb98459899054841317361bf4af215 Reviewed-on: https://code.wireshark.org/review/1273 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-09Use tvb_strncaseeql() to check for XML.Guy Harris1-3/+1
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-03-17Mark tree as unused.AndersBroman1-1/+1
Change-Id: I57c201c0077144aace68bb51a6b0c7350dd8d5a8 Reviewed-on: https://code.wireshark.org/review/713 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17Inhance summary output for some 3GPP AVPsAndersBroman1-0/+49
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-16Make the avp_str available to sub dissectors and Let the subdissector haveAndersBroman1-0/+7
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-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(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>
2013-10-28Pass diam_sub_dis_t directly to the subdissectors instead of using ↵Michael Mann1-8/+6
pinfo->private_data. svn path=/trunk/; revision=52919
2013-10-13whitespace fixes; mostly: remove trailing blanksBill Meier1-3/+3
svn path=/trunk/; revision=52591
2013-09-053GPP-MS-TimeZone value is not decoded in RADIUS and DIAMETER messages.Anders Broman1-1/+45
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9099 svn path=/trunk/; revision=51765
2013-09-04From Katrina Zhang:Anders Broman1-4/+12
637 UAR-Flags dissection. svn path=/trunk/; revision=51749
2013-09-03Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=51731
2013-09-02Fix warning found by fix-encoding-args toolsAlexis La Goutte1-1/+1
svn path=/trunk/; revision=51683
2013-09-02Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=51654
2013-08-29From Johan Wåhl:Anders Broman1-0/+44
Dissect 3GPP AVP 637 UAR-Flags. svn path=/trunk/; revision=51575
2013-07-22Fix forJörg Mayer1-1/+1
[ 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-22Dissect S6 feature list.Anders Broman1-2/+307
svn path=/trunk/; revision=50796
2013-07-21Remove unused variable, fix comparison to use double-equals.Evan Huus1-2/+2
svn path=/trunk/; revision=50768
2013-07-21Interpretation of 3gpp_feature_list depends on Application Id.Anders Broman1-13/+20
svn path=/trunk/; revision=50766
2013-07-17Dissect new flagsAnders Broman1-6/+29
svn path=/trunk/; revision=50701
2013-06-19One of the unused hf's commented out in r47389 was not used due to aJeff Morriss1-4/+2
cut-n-pasteo. Fix that cut-n-pasteo and reinstate the hf. svn path=/trunk/; revision=50049
2013-05-14Don't try to decode an IPv6 address if it looks like we've been handed theJeff Morriss1-2/+17
(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-03-16[-Wmissing-prototypes]Anders Broman1-0/+3
Use explicit casts. svn path=/trunk/; revision=48341
2013-03-14from Katrina Zhang:Anders Broman1-2/+10
Adding Bit 5 support of AVP(IDR-Flags) svn path=/trunk/; revision=48300
2013-01-31Comment out unused hf[] entries & etc.Bill Meier1-727/+731
(found by checkhf) svn path=/trunk/; revision=47389
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-09-10Initial commit to support yet another method of passing data between dissectors.Jakub Zawadzki1-21/+21
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-08-24Adding period to proto filter name for being part of the "diameter" grouping.Michael Mann1-1/+1
svn path=/trunk/; revision=44652
2012-07-09Update AVP dissection.Anders Broman1-4/+36
svn path=/trunk/; revision=43625
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2012-04-27From David Wei:Anders Broman1-685/+714
Further additions and fixes to MBMS in GTPv2 and DIAMETER dissectors. svn path=/trunk/; revision=42289
2012-04-26Whitespace cleanup: Indentation, trailing, ...Bill Meier1-683/+683
svn path=/trunk/; revision=42266
2012-04-24From David Wei:Anders Broman1-0/+48
Bug fixes and improvements to Sm (GTPv2) and SGmb (DIAMETER) dissectors. svn path=/trunk/; revision=42220
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵Bill Meier1-5/+5
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-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵Bill Meier1-2/+2
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-08-08Remove unneeded #includes: proto.h,tvbuff.h,value_string.h,stdlib.h,...Bill Meier1-3/+0
svn path=/trunk/; revision=38413
2011-07-27Use tvb_length when adding MSISDN.Anders Broman1-1/+2
svn path=/trunk/; revision=38226
2011-05-20Prettify som 3GPP AVP:sAnders Broman1-1/+67
svn path=/trunk/; revision=37326
2011-05-19Fix a typo.Anders Broman1-1/+1
svn path=/trunk/; revision=37294
2011-05-19Subdissect 2 3GPP AVP:s that are actually text.Anders Broman1-78/+147
svn path=/trunk/; revision=37292