Commit graph

322 commits

Author SHA1 Message Date
AndersBroman
94559de849 [Diameter] Add 3GPP AVPs
Change-Id: I53c2298584b53943924da417ac407e13f7c23d40
Reviewed-on: https://code.wireshark.org/review/20206
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-20 14:52:37 +00:00
AndersBroman
ae0bdcc78c [Diameter AVPs] Add 3GPP AVP 1664 to 1680 from TS 29.272
Change-Id: Iccc98e4bb6f7923c9ed0720d6fc469f5c3f74d39
Reviewed-on: https://code.wireshark.org/review/20096
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-14 04:55:05 +00:00
Jan Spevak
d6d5168881 Diameter: decode Emergency-Indication AVP (1538)
Change-Id: Ie40d61944fd47eb532b759cb122367c18840feff
Reviewed-on: https://code.wireshark.org/review/19615
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-12 15:43:49 +00:00
Jan Spevak
dd5697b02e diameter: add values for AVP 2037
Change-Id: I7bddb48d1c6c88f9a6edfce2dd527603878c5ac4
Reviewed-on: https://code.wireshark.org/review/18931
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-25 20:41:31 +00:00
Jeff Morriss
963bd67901 Add a few more T6a/T6b and charging AVPs.
Fix a mistake in a comment.

Change-Id: Ibb12ff3036fb42fe5e3955c67c7c9989f8ffca63
Reviewed-on: https://code.wireshark.org/review/18610
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-02 04:40:02 +00:00
Jeff Morriss
446dbea4eb Fix a couple typos in the Diameter XML.
Also:
 - Move new T6a/T6b AVPs into TGPP.xml (to keep them all together).
 - Put back a comment that was (accidentally?) deleted; add some similar notes
   in other places.

Change-Id: I2a468aa3be0069cd8124dd9e5b0a27e333849059
Reviewed-on: https://code.wireshark.org/review/18433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-25 03:54:04 +00:00
Jan Spevak
def19eed53 Update several AVPs according to latest 3GPP TS
Change-Id: Iada3166c93801d3f693714ad8c08bd4f68a70d3e
Reviewed-on: https://code.wireshark.org/review/18425
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-24 12:51:15 +00:00
Jeff Morriss
20e2edca57 Add some Diameter AVPs referenced by (recently added) grouped AVPs.
... In order to make the Diameter XML valid again.

This includes adding T6a/T6b and most of the AVPs of that application.

Fix up some white space while at it.

Change-Id: Ie39b3e574065628fdba215cc9c045eebcbd3077e
Reviewed-on: https://code.wireshark.org/review/18422
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-24 04:26:33 +00:00
Joakim Karlsson
ed187592ae diameter: add new standardized QCI
Change-Id: If8c29934515b61081d0cbd44a0356144d5d3c466
Reviewed-on: https://code.wireshark.org/review/18407
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22 23:38:35 +00:00
Anders
25207d70bb [Diameter] Add some 3GPP AVPs fom TS 39.299 v 14.1.0
Change-Id: Ie3995e81de8faee844dbcb794796ecacb6bfe28e
Reviewed-on: https://code.wireshark.org/review/18353
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-21 10:24:17 +00:00
Jan Spevak
5cbdbecc35 GTPv2: Add support for NB-IoT features
Bug: 13026
Change-Id: I75de63bd58a35e234eef308fa592922e01ea3c18
Reviewed-on: https://code.wireshark.org/review/18300
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:42:37 +00:00
Jeff Morriss
25e7b63ea5 Fix a few typos in the Diameter XML to make it (mostly) valid XML again.
Fix up some white space while at it.

Change-Id: I41efa63ad33288046b56c2eee6a20e066ac6b334
Reviewed-on: https://code.wireshark.org/review/18190
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-10-13 20:17:21 +00:00
Marius Paliga
9934fff4c0 Add support for Enhanced-Diagnostics AVP
Bug: 13004
Change-Id: I20a3faec635a8c86e2d45eb17ce24e2a9db81b5e
Reviewed-on: https://code.wireshark.org/review/18154
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-12 11:16:37 +00:00
Jan Spevak
d78c5e0ac2 Diameter: Upadte AVPs 1003, 1094 and 1099
Bug: 13010
Change-Id: I8a3f8ea551ec959e1e5344f825c8bba7bd4ff866
Reviewed-on: https://code.wireshark.org/review/18160
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-12 11:14:10 +00:00
Marius Paliga
1e532f2f6f Diameter: Add support for DRMP AVP
Bug: 12961
Change-Id: I4d9abbae3893916fdd317263a74398d2242f53de
Reviewed-on: https://code.wireshark.org/review/17969
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-28 14:35:16 +00:00
Pascal Quantin
4528da9f01 Diameter: fix a typo in AVP TGPP 1656
Bug: 12927
Change-Id: I6a6507d7b3b0321d2d12d3d306003e480070e79e
Reviewed-on: https://code.wireshark.org/review/17833
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-21 12:21:30 +00:00
AndersBroman
c2c8dc38fe [Diameter AVPs] Correct 3GPP AVPs 1655. 1656 531 and 532
Bug: 12927
Change-Id: I545d5c54396431ab67f78fbc31111460d758f8b1
Reviewed-on: https://code.wireshark.org/review/17827
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-21 11:19:29 +00:00
Michael Sweet
35affe3be4 Changes to the IPP dissector:
- xxx-time values are not UNIX timestamps (that is a CUPS-ism - they are
      time since bootup in IPP itself)
    - Change all of the display strings to use the official IANA values
      (confusing otherwise)
    - Add support for newer value/group tags.
    - Add support for all enum attribute values.
    - Add request/response tracking so you can easily match things up.
    - Decode octetString, rangeOfInteger, textWithLanguage, nameWithLanguage,
      dateTime, and resolution values.
    - Don't treat integers and enums as interchangeable (they aren't).
    - Integers and enums are signed integers.
    - Put operation id or status code in info column.

Change-Id: I9fb5cd89d3c386a2b3932ef4c75967ce2547bc22
Reviewed-on: https://code.wireshark.org/review/17192
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Smith Kennedy <smith.kennedy@hp.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07 21:42:19 +00:00
Marius Paliga
693c745e36 Add support for TWAN-User-Location-Info
Bug: 12834
Change-Id: Ibb196a4e1e8d05b3f124409b18093623f3694af0
Reviewed-on: https://code.wireshark.org/review/17553
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07 10:15:14 +00:00
AndersBroman
e8ba606348 [Diameter] Add Command codes 8388718 - 8388722.
Bug: 12774
Change-Id: I413ba4a195ee1bd3d7de66399d1be714ef77d7e2
Reviewed-on: https://code.wireshark.org/review/17227
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-22 10:36:41 +00:00
AndersBroman
f52ce40459 [Diameter] Add stray AVP "Pseudonym-Indicator" code="2519"
Change-Id: I050c27b7118fb98fea20fec697279dc68820763d
Reviewed-on: https://code.wireshark.org/review/17176
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-19 13:12:16 +00:00
AndersBroman
1dfa478b9e [Diameter] Add two LCS AVPs
Change-Id: Ia649a3c88116745b77ae2ffeb243730d3dd13146
Reviewed-on: https://code.wireshark.org/review/17007
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 13:32:32 +00:00
Marius Paliga
52ed7d3b5c Add support for new AVPs defined in 29.273
Bug: 12643
Change-Id: Ic9c26dc864b2b016ba722620098caf44a800f0f4
Reviewed-on: https://code.wireshark.org/review/16581
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-22 14:01:37 +00:00
AndersBroman
cde7b03f59 [Diameter] Update with new AVPs
Change-Id: I6dfa43320ae3e02afb2b795dd352d492c75a0e60
Reviewed-on: https://code.wireshark.org/review/16526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-18 12:55:45 +00:00
Jeff Morriss
0e8fef5827 Finish getting making the Diameter XML valid XML.
... Except for the fact that many AVP names start with "3GPP".

Make the AVP names XML IDs again.

Fix all the grouped AVPs that reference AVPs (by name) or vice-versa.  This
includes:
 * Fixing a bunch of typos (including type mismatches).
 * Commenting out a number of references to vendor AVPs for which we don't have
   the specs.
 * Adding a few missing AVPs.

Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4
Reviewed-on: https://code.wireshark.org/review/15973
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 17:12:08 +00:00
Jeff Morriss
b223d649fe Make the rest of the Diameter AVP names unique.
In most cases this means prepending the application- or vendor-name to force
uniqueness.  A few vendors have duplicates within their namespace--append the
AVP code to these.

Also fix a few other invalid names (with spaces or parentheses in the names).

Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
Reviewed-on: https://code.wireshark.org/review/15960
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 04:38:32 +00:00
Jeff Morriss
c5528d0b06 Make some more Diameter AVP names unique.
In some cases this means using the correct (updated?) name from the
specification. In others it means prepending the application- or vendor-name
to force uniqueness.

Remove a few more "Unassigned" AVPs from the XML files.

Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a
Reviewed-on: https://code.wireshark.org/review/15949
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15 23:41:04 +00:00
Jeff Morriss
66efbdbc01 Make some Diameter AVP names unique.
In some cases this means using the correct (updated?) name from the
specification. In others it means prepending the application name to force
uniqueness.

Change-Id: I8301c769af2b2279c0be7c1bc65e99fe25c1cc80
Reviewed-on: https://code.wireshark.org/review/15935
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15 20:54:48 +00:00
Jeff Morriss
c0c00f4f31 Give unique names to a bunch of reserved, experimental, etc., AVPs.
Also remove a bunch of AVPs that are unassigned/unallocated--there's no
real benefit to telling users that...

Change-Id: I1b18a11a1b65189d21520c74aae3dde77688e592
Reviewed-on: https://code.wireshark.org/review/15895
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 20:32:40 +00:00
AndersBroman
9cd10f0805 Add CiscoSystems, vendor id 9 AVPs
Bug 12459
Change-Id: I9ebe7f4a9e6ae03539bd74e535c95c85a8efa55b
Reviewed-on: https://code.wireshark.org/review/15506
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-20 17:18:01 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Anders Broman
9f664e5bdf Add vendor-id="Acision"
svn path=/trunk/; revision=54667
2014-01-08 20:03:16 +00:00
Anders Broman
f60aba38a4 Add an application id.
svn path=/trunk/; revision=53637
2013-11-29 07:14:13 +00:00
Anders Broman
730bd9ca9d Correct one AVP, some flags and add comments with new AVP:s
svn path=/trunk/; revision=53599
2013-11-26 19:54:02 +00:00
Anders Broman
fd429a6ed3 From Katrina Zhang:
3GPP AVP updates.

svn path=/trunk/; revision=53162
2013-11-08 05:57:00 +00:00
Anders Broman
86790a6471 Add a command code.
svn path=/trunk/; revision=52817
2013-10-24 16:50:14 +00:00
Anders Broman
976d1fc4f8 Add a few command codes.
svn path=/trunk/; revision=52795
2013-10-23 15:55:06 +00:00
Anders Broman
5b3f870236 Add 3GPP AVP 533 - 537
svn path=/trunk/; revision=52451
2013-10-08 18:17:45 +00:00
Anders Broman
179b14827b Add a few AVP:s
svn path=/trunk/; revision=52222
2013-09-26 21:04:10 +00:00
Pascal Quantin
84069ac0eb From Philippe Rosenfeld via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 :
Fix the value of 'SEND_TO_UE' in the DIAMETER Gx dictionary for Packet-Filter-Usage AVP

svn path=/trunk/; revision=51942
2013-09-10 21:18:28 +00:00
Anders Broman
3813c0b72d From Katrina Zhang:
Add Grouped AVP:s

svn path=/trunk/; revision=51751
2013-09-04 18:10:33 +00:00
Anders Broman
af49292ae2 From Tommy Wu:
-         AppId is unsigned.
-         Add Relay application.

svn path=/trunk/; revision=51318
2013-08-12 18:29:42 +00:00
Anders Broman
a46f373c54 Add an application Id.
svn path=/trunk/; revision=51205
2013-08-08 04:30:16 +00:00
Jeff Morriss
35e220513c Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
Pascal Quantin
d64dbd371b From Anders: add Verizon Wireless dictionary
svn path=/trunk/; revision=50726
2013-07-18 09:27:10 +00:00
Anders Broman
066e0121c1 Update 3GPP AVP:s
svn path=/trunk/; revision=50700
2013-07-17 18:18:52 +00:00