Commit Graph

303 Commits

Author SHA1 Message Date
Marius Paliga 62ccbc994d Fixed value for experimental result code 5142
Bug: 12428
Change-Id: Idc46b4bc881fb2c5e83af7ac55b5cfd060d9b185
Reviewed-on: https://code.wireshark.org/review/15370
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-11 13:11:13 +00:00
AndersBroman e61ed67298 [Diameter AVPs] Add AVP 620 Redirect-Realm
Bug 12381

Change-Id: I8ba1306661b4b2c30c865761e1c2a90b5e4140b0
Reviewed-on: https://code.wireshark.org/review/15162
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-29 12:36:12 +00:00
Jeff Morriss 039b6ea41e Revert "Diameter: Add Redknee AVPs."
As requested by the supplier of the data.

This reverts commit ab754d6ba4.

Change-Id: I3f4e19a0a7f4c75da0e2e2b5a01b187692ebf0a9
Reviewed-on: https://code.wireshark.org/review/13468
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-21 17:16:29 +00:00
Anders Broman 5de7817315 Revert "[Diameter] Update Nokia Solutions and Networks vendor-specific AVPs"
As requested by the supplier of the data.

This reverts commit 19069dde80.

Change-Id: Ic5ed9df94a1a78d8fd861cb542828c60f104ac24
Reviewed-on: https://code.wireshark.org/review/13433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-20 10:00:55 +00:00
Anders Broman 89fe741108 Revert "[Diameter AVPs] Add Vodafone AVPs"
This reverts commit 0e4a7429db.

as requested by the supplier of the data.

Change-Id: I70d6c48d3ce830bcb2a23cd130d28c04123c1377
Reviewed-on: https://code.wireshark.org/review/13431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-20 09:59:13 +00:00
AndersBroman f3ae6c9c5c [Diameter] Add Data from 3GPP TS 29.344 V13.0.0 (2015-12)
Update resultcodes from IANA.

Change-Id: Ib71cc01a772d651d734039344c0feff394a61351
Reviewed-on: https://code.wireshark.org/review/13106
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-07 12:35:42 +00:00
AndersBroman 19069dde80 [Diameter] Update Nokia Solutions and Networks vendor-specific AVPs
Change-Id: I42e1243bd5563bd5296a8430544a317bb4caac06
Reviewed-on: https://code.wireshark.org/review/12840
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-23 09:05:06 +00:00
Jeff Morriss ab754d6ba4 Diameter: Add Redknee AVPs.
Also add a couple Verizon Wireless and Wimax AVPs.

All taken from the attachments to bug 11907.

Change-Id: Ie45935f421c4797783f616a75ef35486447ff950
Reviewed-on: https://code.wireshark.org/review/12833
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-23 08:30:08 +00:00
AndersBroman 0e4a7429db [Diameter AVPs] Add Vodafone AVPs
Change-Id: I32f0549852c2da99c8217ab406a019e441d4beb7
Reviewed-on: https://code.wireshark.org/review/12823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-22 11:36:55 +00:00
AndersBroman 830f30a705 Add AVP 100 amd 223
Change-Id: Ifccb111a8139b7c41cf6fec3fa6bc8e201e2e2ea
Reviewed-on: https://code.wireshark.org/review/12800
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-21 15:52:37 +00:00
Branislav Makan 9b7aab935c Rule-Failure-Code enum value 14 added.
Change-Id: If17ceba9d6e84bdb3b8d7e030fd7eccc45f9ff69
Reviewed-on: https://code.wireshark.org/review/11987
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-20 12:48:44 +00:00
AndersBroman 04f3f65ebd [Diameter] Add Diameter Overload Indication AVPs [RFC 7683]
Change-Id: I003e5a9f770f14d6e18cc8df970d35a7ed4f03bb
Reviewed-on: https://code.wireshark.org/review/11914
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-17 17:30:04 +00:00
Pascal Quantin b776707af5 Diameter: fix typo in dictionary
Change-Id: I164ce634536ec1a3de650d815e23cdd6102e2fde
Reviewed-on: https://code.wireshark.org/review/11809
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-13 15:44:50 +00:00
Branislav Makan f104333510 Diameter dictionary updated.
Added values for diameter AVP codes:
1085 Redirect-Information Grouped
1086 Redirect- Support Enumerated
1087 TDF-Information Grouped
1088 TDF-Application-Identifier OctetString
1089 TDF-Destination-Host DiameterIdentity
1090 TDF-Destination-Realm DiameterIdentity

Change-Id: I8ba7a56a5a51b32a21a602751275e9ab254adbae
Reviewed-on: https://code.wireshark.org/review/11801
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13 10:01:11 +00:00
Pascal Quantin bd44ceebd5 Diameter: fix a typo in dictionary.xml
Change-Id: I8a91c9303e9b650380d188be5028e238fc7f2890
Reviewed-on: https://code.wireshark.org/review/11561
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-04 14:42:53 +00:00
Alexis La Goutte 0ccab3c0b5 Dictionary (diameter): fix indent (use tabs)
Follow gc7c33b0c8

Change-Id: I54d101f561d4f03dd6e972c8dda3cd6516128de5
Reviewed-on: https://code.wireshark.org/review/11553
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:37:06 +00:00
Branislav Makan c7c33b0c85 Updated Diameter dictionary.xml with AVP values.
Diameter dictionary has been updated with the following AVP values:
1031 Rule-Failure-Code: adden new enum codes.
1082 Credit-Management-Status
1091 TDF-IP-Address
1098 Application-Detection-Information

Change-Id: I2c5c438fa48b9deda4bdc2a046c19b583b5c7763
Reviewed-on: https://code.wireshark.org/review/11524
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 11:32:33 +00:00
AndersBroman 778feded84 [Diameter] Add 3GPP AVP 652-655
Change-Id: I4db21e3e095f7cb466759a96706ec17c8429386e
Reviewed-on: https://code.wireshark.org/review/10714
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-01 10:42:38 +00:00
AndersBroman a225908574 [Diameter] Add command code 8388717 Ericsson Trace-Report
Change-Id: Ifabb920eb4ddb1a46f2dbf7e03478d0abe10305a
Reviewed-on: https://code.wireshark.org/review/10687
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-29 14:02:31 +00:00
AndersBroman 022a7ddbe2 [Diameter] Add enum value to 3GPP AVP PDN-Type" code="1456"
<enum name="IPv4_OR_IPv6" code="3"/>

Change-Id: I8fa328c0c6915cda835754d12bc4d48608608500
Reviewed-on: https://code.wireshark.org/review/10686
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-29 13:11:31 +00:00
Jeff Morriss dc4e9605c9 Add some Gx AVPs from 3GPP 29.212.
Change-Id: Iaf2cc67d4d235193b25045895441742bc6531370
Reviewed-on: https://code.wireshark.org/review/10150
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21 04:52:27 +00:00
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