aboutsummaryrefslogtreecommitdiffstats
path: root/diameter
AgeCommit message (Collapse)AuthorFilesLines
2015-05-12Diameter: Add support for Sd interfaceMarius1-6/+52
Bug: 11186 Change-Id: I3aed8818dd021c72b2cb1fb51adc717613c501ea Reviewed-on: https://code.wireshark.org/review/8425 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-09Eliminate a couple of empty Diameter grouped AVP lists.Jeff Morriss3-4/+15
Use Session-ID as a place holder for grouped AVPs that can hold any AVP and look up the contents of a couple grouped AVPs whose contents wasn't specified. Also, update the DTD to allow vendors to not add any AVPs. Change-Id: Id2852e31cecbcfaf64efb46918101b3a81ed5bdb Reviewed-on: https://code.wireshark.org/review/8355 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08Use the correct AVP type in a couple of places: IPAddress instead of Address.Jeff Morriss1-2/+2
(For whatever reason the Diameter dictionary calls it IPAddress rather than Address--the latter is what's in the RFCs.) Change-Id: I5efcffc2a9bced6ba841b09fd83cb3dcd128d440 Reviewed-on: https://code.wireshark.org/review/8341 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08Fix several Starent enums that didn't have codes.Jeff Morriss1-22/+22
The codes were there but the strings got messed up somewhere along the way. Change-Id: I41cc581dba0c00936737ea77e789cac1aecadf0f Reviewed-on: https://code.wireshark.org/review/8340 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08Add Float32 and Float64 types to the Diameter dictionary.Jeff Morriss1-0/+14
Change-Id: I74f7c37fc9b62ae0b9f29e4da0b1b3d5037b8192 Reviewed-on: https://code.wireshark.org/review/8339 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08Update the Diameter DTD to reflect the fact that vendors are no longer definedJeff Morriss1-4/+4
in base or applications. (IOW update the DTD to reflect I5119f0dc7f8e3bbf59e2207046a8bb0f42ab0ca1.) Change-Id: I459b3aac50ce4dabb552e674145d9097920e0a5d Reviewed-on: https://code.wireshark.org/review/8338 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08Fix Starent vendor definition: it's not an empty element.Jeff Morriss1-1/+1
Change-Id: Ib61b9be817bcfd2fbdc0ec57f69edda9052b588c Reviewed-on: https://code.wireshark.org/review/8337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08Allow empty-element Diameter Applications and use that format.Jeff Morriss6-114/+114
This also fixes a couple of applications that weren't properly terminated (as a result of some of my recent changes). Change-Id: I9662017a81c63aceeb950d3b29cb17dde16d4f0c Reviewed-on: https://code.wireshark.org/review/8335 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07Update the 3GPP list of Experimental-Result-Code values.Jeff Morriss1-6/+68
Change-Id: I7223eaeb40f6590814cc1748f6aa457bbd92eddc Reviewed-on: https://code.wireshark.org/review/8320 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06Add/clarify some comments about how the Experimental-Result-Code AVP is handled.Jeff Morriss1-1/+12
Specifically we put Experimental-Result-Codes specified by 3GPP in the XML file and let other vendors' codes be handled through a dissector table. Change-Id: I2c3977fb959ad84faa5cb90aeb3d191c8b465ede Reviewed-on: https://code.wireshark.org/review/8319 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-29Finish removing VerizonWireless.xml and ChinaTelecom.xmlJeff Morriss1-4/+0
Change-Id: I7e64ed4a588ecc7ef72288e0fd3bf91f8b31e5e7 Reviewed-on: https://code.wireshark.org/review/8238 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-29Reorganize some of the Diameter XML files, taking advantage of the fact thatJeff Morriss18-2548/+2522
AVPs can be grouped by Vendor now (not just by Application). Move a bunch of vendor-specific Application IDs to the vendor's XML file. Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml files. Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx. Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f Reviewed-on: https://code.wireshark.org/review/8235 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>
2015-04-28[Diameter] Update Rx interface AVPsAndersBroman1-10/+32
Change-Id: I8f046fc75093501104b916da88a928c8a934a8ce Reviewed-on: https://code.wireshark.org/review/8216 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-22Add special handling of the (derived) AppId AVP type so that we can maintainJeff Morriss2-277/+147
one (and only one) Application ID list. This means we don't have to list all the Application IDs several times in the XML file. Collapse those lists into one (much more complete, now) list while also fixing URIs for several of the specifications (and making it clear for others that we don't have access to the specification--by declaring their URI to be "none"). Add a bunch more entries to the list of application IDs. Change-Id: Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e Reviewed-on: https://code.wireshark.org/review/8147 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-22Misc. Diameter XML cleanups.Jeff Morriss12-1928/+1684
Consistently used (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Use a uri of "none" when we don't have access to the specification. Update the URI of an Application or two. Clean up white space and formatting. Change-Id: Iad677db186469b7d8c4a23b7a7fca6c357dbc012 Reviewed-on: https://code.wireshark.org/review/8164 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-21Allow the definition of AVPs within vendor IDs.Jeff Morriss5-468/+470
This allows for a more natural organization of AVP definitions: they can now be grouped by application (including the base application) or vendor ID. This means we can stop using the "workaround" (for those vendors who define AVPs but don't have their own application ID) of finding some random application ID to put in a vendor-specific xml file just to satisfy the parser. Rework a couple of Vendor-specific xml files as an example. Note: this does mean that vendor IDs can no longer be defined inside of the base or other application. If that's a problem the parser could be made (through some duplication of code) to understand the old format too. Change-Id: I5119f0dc7f8e3bbf59e2207046a8bb0f42ab0ca1 Reviewed-on: https://code.wireshark.org/review/8141 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-20Add Tekelec (now Oracle) AVPs.Jeff Morriss2-26/+52
Untested; taken from the document 910-6828-001 Revision A (found on the web). Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2 Reviewed-on: https://code.wireshark.org/review/8110 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-17Consistently used (derived) type Enumerated (rather than Unsigned32 orJeff Morriss1-16/+16
Integer32) when the AVP is of type Enumerated. Just for correctness. Change-Id: Ia485d6e06ca16d6da82aa5d1b60025120e45242f Reviewed-on: https://code.wireshark.org/review/8109 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17Fix up some indentation/white space issues.Jeff Morriss1-111/+110
Change-Id: I73a1a1dd567970f99df769d5976cc82a7e5b9a60 Reviewed-on: https://code.wireshark.org/review/8108 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-03-12[Diameter] Add 3GPP AVPsAndersBroman1-0/+25
Change-Id: I1152114ff6b8ea103f0dee3cc9206aefc39db0bc Reviewed-on: https://code.wireshark.org/review/7653 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-25[Diameter] Add some AVPs and AVP values fromTibensky1-1/+11
3GPP TS 32.299 version 12.7.0 (2015-01) Ping-Bug:11008 Change-Id: Ib7f52c743f43d8a1c70c9fb100663292d7c4a87e Reviewed-on: https://code.wireshark.org/review/7387 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-03Fix nameless application in NokiaSolutionsAndNetworks.xml (fromJeff Morriss2-2/+2
I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35). (The nameless application was causing known applications to be reported as unknown.) Add code to the Diameter dissector to report such problems at startup (similar code exists for other entities). Tweak the parser debug slightly. Change-Id: I6b28cda8660e6eb96648c7b3697d7fd85151ac96 Reviewed-on: https://code.wireshark.org/review/6927 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>
2015-01-21Updated NSN dictionary with vendor-specific Sy application AVPs.Josip Medved1-0/+57
Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35 Reviewed-on: https://code.wireshark.org/review/6705 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19Updated company name from Nokia Siemens Networks to Nokia Solutions and ↵Josip Medved3-18/+18
Networks. Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a Reviewed-on: https://code.wireshark.org/review/6647 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14Add new Event-Trigger values.AndersBroman1-10/+13
Change-Id: Idd18a710fd8630d5b50c5ac180d7aa45a40596d7 Reviewed-on: https://code.wireshark.org/review/4680 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25Add 3 new 3GPP AVP:sAndersBroman1-1/+20
Change-Id: I47742f83a7e515f6fc449daf9492dcf8a5a68410 Reviewed-on: https://code.wireshark.org/review/4282 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-20Added Wx Application-Id.Josip Medved1-0/+1
Change-Id: I46152382be0a374019d51f18e7116aad8241e95a Reviewed-on: https://code.wireshark.org/review/4162 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-11Clarify that 16777229 is the AppID for 3GPP Rx Release 6.Jeff Morriss1-3/+3
(Later releases have a different AppID.) Change-Id: I41d4a498461e777f570641936db64d0551e36186 Reviewed-on: https://code.wireshark.org/review/4070 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-29Consolidate several 3GPP Diameter xml files into one.Jeff Morriss8-1248/+1193
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b Reviewed-on: https://code.wireshark.org/review/3911 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-29Remove AVPs that aren't really 3GPP2 (they are 3GPP).Jeff Morriss1-231/+1
(The 3GPP2 Ty trace in the menagerie wrongly marks several of these AVPs as being 3GPP2.) Change-Id: I27963fbf8e1da51e430c609784e0c8bb4575549d Reviewed-on: https://code.wireshark.org/review/3912 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-28Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.Jeff Morriss2-245/+380
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa Reviewed-on: https://code.wireshark.org/review/3908 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-26Added Authentication-Method and afew other AVPs that appear in the ↵Josip Medved2-3/+17
SIP-Auth-Data-Item grouped AVP. Change-Id: Ie90ec71d8d574d38f32a5ff3de6ad5433b9e5e9f Reviewed-on: https://code.wireshark.org/review/3823 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-23Add the 3GPP2 Ty Application ID and a bunch of Ty AVPs.Jeff Morriss1-32/+176
Change-Id: If36c8a22c34a88bbb43afbc932cd0b8193dd9c7b Reviewed-on: https://code.wireshark.org/review/3800 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22TGPPRx: Add AF-Signalling-Protocol AVP dissection supportMasayuki Takemura1-1/+5
The AVP is defined in 3GPP TS 29.214, Table 5.3.1: Rx specific Diameter AVPs. Change-Id: Ib0a525f97206ff61bb0d390df81e3d6ebbef59bb Reviewed-on: https://code.wireshark.org/review/3791 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-07Change the application Ids to avoid duplicates.AndersBroman8-14/+21
Change-Id: I127ac215b0b8ed1615e4d11c9a5a5952e3ea8d88 Reviewed-on: https://code.wireshark.org/review/3473 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-29Remove duplicated entry for AVP 258 Auth-Application-Id from HP.xmlAndersBroman2-8/+2
it was overiding the correct one from dictionary.xml Change-Id: Ic6073a550a15f56584e214eec8bd79057673c25c Reviewed-on: https://code.wireshark.org/review/3244 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Sort diameter.applicationId fix a typo.AndersBroman1-1/+1
Change-Id: Id585371df929cdff17f98dddbebf063fa000ff56 Reviewed-on: https://code.wireshark.org/review/3229 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Add a few mor application IdsAndersBroman1-10/+31
Change-Id: I98d9735e2b54818a23c9a6e4086692d76f0713d5 Reviewed-on: https://code.wireshark.org/review/3227 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-17Add an Application Id.AndersBroman1-0/+3
Change-Id: I239560637fb61a22cd4ef4700aeb28c82659a805 Reviewed-on: https://code.wireshark.org/review/3093 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-26New HP DTD dictionary fileBasil2-0/+51
Bug: 10206 Change-Id: Ibe056ed37d3619aabfb17d3c2c5e85e67deae4e5 Reviewed-on: https://code.wireshark.org/review/2617 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28Fix up indentation.Jeff Morriss1-212/+214
Change-Id: I9c217cfb0246c763ec7084bb928440d8aab88f99 Reviewed-on: https://code.wireshark.org/review/1416 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-28Fix Restoration-Priority's AVP code.Jeff Morriss1-3/+2
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10057 Bug: 10057 Change-Id: I88bb6825006b038065f8edff61066557445f1dc6 Reviewed-on: https://code.wireshark.org/review/1413 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+2
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte24-24/+0
(Using sed : sed -i '/^<!-- \$Id\$ -->/,+0 d') (XML Comments) Change-Id: Ifd03f70ae84dfbbbe04d91f10fd30857fd197014 Reviewed-on: https://code.wireshark.org/review/882 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06Add a few grouped AVP definitions for 3GPP-SlhJeff Morriss1-21/+27
... as suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793#c5 Also remove trailing white space. Change-Id: Ic83ad7e4c7792a78a9d11eef25f1edf92bd22ddb Reviewed-on: https://code.wireshark.org/review/521 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02Added Cisco Starent Diameter dictionary entries.Josip Medved2-0/+2233
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1 Reviewed-on: https://code.wireshark.org/review/438 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-28Add 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411.Jeff Morriss1-11/+23
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793 Change-Id: Ia104767d2c1b3c26da851887c08973485f99f58b Reviewed-on: https://code.wireshark.org/review/432 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-01-22Remove unused entity.Anders Broman1-1/+0
svn path=/trunk/; revision=54897
2014-01-20From Abdul Hannan Khan:Anders Broman1-48/+48
Correct AVP flags. svn path=/trunk/; revision=54851
2014-01-08Add vendor-id="Acision"Anders Broman1-0/+1
svn path=/trunk/; revision=54667