Commit Graph

282 Commits

Author SHA1 Message Date
Umberto Corponi 9bca127430 Add support for MB2c Diameter interface.
Add decoding for MB2c specific AVPs according to 3GPP TS 29.468 Rel 12.1.0.

Change-Id: I0b50cacb5a3e7cb32de89b31da24e725361edf80
Reviewed-on: https://code.wireshark.org/review/9756
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23 17:03:19 +00:00
Marius b708c4a48c Diameter: Add support for Sd interface
Bug: 11186
Change-Id: I3aed8818dd021c72b2cb1fb51adc717613c501ea
Reviewed-on: https://code.wireshark.org/review/8425
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-12 13:09:19 +00:00
Jeff Morriss 2ad4bfedfb Eliminate a couple of empty Diameter grouped AVP lists.
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-09 07:20:48 +00:00
Jeff Morriss b644698bef Use the correct AVP type in a couple of places: IPAddress instead of Address.
(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-08 04:26:19 +00:00
Jeff Morriss 1244ee0394 Fix several Starent enums that didn't have codes.
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-08 04:25:47 +00:00
Jeff Morriss bc2605e1c9 Add Float32 and Float64 types to the Diameter dictionary.
Change-Id: I74f7c37fc9b62ae0b9f29e4da0b1b3d5037b8192
Reviewed-on: https://code.wireshark.org/review/8339
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:25:16 +00:00
Jeff Morriss 5b64a693f9 Update the Diameter DTD to reflect the fact that vendors are no longer defined
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-08 04:24:45 +00:00
Jeff Morriss f5c4dc7bd8 Fix Starent vendor definition: it's not an empty element.
Change-Id: Ib61b9be817bcfd2fbdc0ec57f69edda9052b588c
Reviewed-on: https://code.wireshark.org/review/8337
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:24:05 +00:00
Jeff Morriss 0b4e883803 Allow empty-element Diameter Applications and use that format.
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-08 04:23:10 +00:00
Jeff Morriss 12e0f0fa4f Update the 3GPP list of Experimental-Result-Code values.
Change-Id: I7223eaeb40f6590814cc1748f6aa457bbd92eddc
Reviewed-on: https://code.wireshark.org/review/8320
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07 06:02:32 +00:00
Jeff Morriss 80358079fe Add/clarify some comments about how the Experimental-Result-Code AVP is handled.
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-05-06 20:27:26 +00:00
Jeff Morriss 56c56d2682 Finish removing VerizonWireless.xml and ChinaTelecom.xml
Change-Id: I7e64ed4a588ecc7ef72288e0fd3bf91f8b31e5e7
Reviewed-on: https://code.wireshark.org/review/8238
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-29 13:13:19 +00:00
Jeff Morriss 7f6fe7a1fd Reorganize some of the Diameter XML files, taking advantage of the fact that
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-29 11:37:29 +00:00
AndersBroman 35f966ce38 [Diameter] Update Rx interface AVPs
Change-Id: I8f046fc75093501104b916da88a928c8a934a8ce
Reviewed-on: https://code.wireshark.org/review/8216
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-28 08:03:44 +00:00
Jeff Morriss 4461f7271d Add special handling of the (derived) AppId AVP type so that we can maintain
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-22 05:51:45 +00:00
Jeff Morriss ecc3369c05 Misc. Diameter XML cleanups.
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-22 01:50:23 +00:00
Jeff Morriss 847e5179dc Allow the definition of AVPs within vendor IDs.
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-21 01:55:50 +00:00
Jeff Morriss 9abd4a288e Add Tekelec (now Oracle) AVPs.
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-20 06:38:44 +00:00
Jeff Morriss f2070bdbf9 Consistently used (derived) type Enumerated (rather than Unsigned32 or
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-17 17:50:18 +00:00
Jeff Morriss e5e2465c6b Fix up some indentation/white space issues.
Change-Id: I73a1a1dd567970f99df769d5976cc82a7e5b9a60
Reviewed-on: https://code.wireshark.org/review/8108
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17 17:34:01 +00:00
AndersBroman dcb087fb20 [Diameter] Add 3GPP AVPs
Change-Id: I1152114ff6b8ea103f0dee3cc9206aefc39db0bc
Reviewed-on: https://code.wireshark.org/review/7653
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12 13:40:38 +00:00
Tibensky be68cdb018 [Diameter] Add some AVPs and AVP values from
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-25 15:04:23 +00:00
Jeff Morriss 33f1256e00 Fix nameless application in NokiaSolutionsAndNetworks.xml (from
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-02-03 05:58:57 +00:00
Josip Medved 17a1748ca9 Updated NSN dictionary with vendor-specific Sy application AVPs.
Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35
Reviewed-on: https://code.wireshark.org/review/6705
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21 09:08:00 +00:00
Josip Medved c8bca4fa9a Updated company name from Nokia Siemens Networks to Nokia Solutions and 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>
2015-01-19 16:53:04 +00:00
AndersBroman 0e2f12810c Add new Event-Trigger values.
Change-Id: Idd18a710fd8630d5b50c5ac180d7aa45a40596d7
Reviewed-on: https://code.wireshark.org/review/4680
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 08:56:51 +00:00
AndersBroman 0fa7b01a95 Add 3 new 3GPP AVP:s
Change-Id: I47742f83a7e515f6fc449daf9492dcf8a5a68410
Reviewed-on: https://code.wireshark.org/review/4282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25 15:05:35 +00:00
Josip Medved 3623fce79b Added Wx Application-Id.
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-20 18:15:53 +00:00
Jeff Morriss d5940f576c Clarify that 16777229 is the AppID for 3GPP Rx Release 6.
(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-09-11 06:32:12 +00:00
Jeff Morriss 8db01445c1 Consolidate several 3GPP Diameter xml files into one.
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b
Reviewed-on: https://code.wireshark.org/review/3911
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-29 01:39:01 +00:00
Jeff Morriss fcf67941af Remove AVPs that aren't really 3GPP2 (they are 3GPP).
(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-29 01:38:53 +00:00
Jeff Morriss e3cbc062c3 Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa
Reviewed-on: https://code.wireshark.org/review/3908
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-28 19:30:36 +00:00
Josip Medved 338f6aca64 Added Authentication-Method and afew other AVPs that appear in the 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-26 08:06:54 +00:00
Jeff Morriss 2068b31755 Add the 3GPP2 Ty Application ID and a bunch of Ty AVPs.
Change-Id: If36c8a22c34a88bbb43afbc932cd0b8193dd9c7b
Reviewed-on: https://code.wireshark.org/review/3800
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-23 01:18:20 +00:00
Masayuki Takemura 8b5ca59dca TGPPRx: Add AF-Signalling-Protocol AVP dissection support
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-22 07:12:05 +00:00
AndersBroman e44e407214 Change the application Ids to avoid duplicates.
Change-Id: I127ac215b0b8ed1615e4d11c9a5a5952e3ea8d88
Reviewed-on: https://code.wireshark.org/review/3473
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-07 15:44:26 +00:00
AndersBroman 3b11d2215b Remove duplicated entry for AVP 258 Auth-Application-Id from HP.xml
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-29 09:31:20 +00:00
AndersBroman ff01321da2 Sort diameter.applicationId fix a typo.
Change-Id: Id585371df929cdff17f98dddbebf063fa000ff56
Reviewed-on: https://code.wireshark.org/review/3229
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28 17:36:37 +00:00
AndersBroman 083d6e7c7d Add a few mor application Ids
Change-Id: I98d9735e2b54818a23c9a6e4086692d76f0713d5
Reviewed-on: https://code.wireshark.org/review/3227
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28 15:27:52 +00:00
AndersBroman b744f0ea6b Add an Application Id.
Change-Id: I239560637fb61a22cd4ef4700aeb28c82659a805
Reviewed-on: https://code.wireshark.org/review/3093
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-17 16:12:10 +00:00
Basil c63cd9f869 New HP DTD dictionary file
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-06-26 02:59:50 +00:00
Jeff Morriss 989f4ffd69 Fix up indentation.
Change-Id: I9c217cfb0246c763ec7084bb928440d8aab88f99
Reviewed-on: https://code.wireshark.org/review/1416
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-28 18:20:00 +00:00
Jeff Morriss ab87070956 Fix Restoration-Priority's AVP code.
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-04-28 15:56:46 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(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-31 18:48:06 +00:00
Alexis La Goutte 7287b58ff5 Continue to remove $Id$ from top of file
(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-31 18:46:03 +00:00
Jeff Morriss dc7d5f97eb Add a few grouped AVP definitions for 3GPP-Slh
... 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-06 05:50:11 +00:00
Josip Medved 988a184603 Added Cisco Starent Diameter dictionary entries.
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1
Reviewed-on: https://code.wireshark.org/review/438
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02 18:18:53 +00:00
Jeff Morriss d14abec1b9 Add 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411.
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-02-28 18:55:46 +00:00
Anders Broman 31116b5a6b Remove unused entity.
svn path=/trunk/; revision=54897
2014-01-22 06:09:42 +00:00
Anders Broman 072cce1ee1 From Abdul Hannan Khan:
Correct AVP flags.

svn path=/trunk/; revision=54851
2014-01-20 06:59:10 +00:00