Commit Graph

338 Commits

Author SHA1 Message Date
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 f92f16916a [Diameter] Add a couple of AVP:s
Change-Id: If7b6a1ba5e81ccb5395df33b7bbcb24a616727c9
Reviewed-on: https://code.wireshark.org/review/17112
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-17 13:53:03 +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 66d26d701f Remove a bunch of unassigned ETSI AVPs.
These were presumably there to allow indexed search of the AVP list but it
wasn't working anyway (binary search was used).  And the expert info for
"unknown" (to Wireshark) AVPs is a good thing.

Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440
Reviewed-on: https://code.wireshark.org/review/15956
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 02:23:15 +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 d74113fbfb Don't list "AVP" as a possible member of a grouped AVP.
There's no AVP named "AVP".  And there's no need to tell Wireshark that any AVP
may put in the group (the RFC lists "AVP" for that purpose).

Change-Id: I3591af725ebe089e13eae7b712ef4404cb7924a2
Reviewed-on: https://code.wireshark.org/review/15906
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 21:44:08 +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
Jeff Morriss da509947a8 Adjust the Diameter DTD to accept applications and vendors in any order.
Change-Id: I301a138b7f6db2d1a9ce1a20ebecf94e100bf831
Reviewed-on: https://code.wireshark.org/review/15887
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-14 00:16:43 +00:00
Jeff Morriss 49430824cb Fix Custom.xml so it can be (correctly) included into the main dictionary.
This file is included into dictionary.xml so it doesn't need all the DOCTYPE
stuff.

Change-Id: I8397b3babe45c28706867be3169ce6ed566930e6
Reviewed-on: https://code.wireshark.org/review/15885
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-13 23:40:45 +00:00
Jeff Morriss 1dcaeb33ca Cisco Diameter: move the XML declaration to the top of the file.
... That's where it's supposed to be.

Change-Id: I0ec68dc8757776bf757b52e75bc156acc7264ee5
Reviewed-on: https://code.wireshark.org/review/15877
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-13 18:34:59 +00:00
Jeff Morriss d06cac6092 Diameter (NSN): the attribute name is 'mandatory' not 'mandatory-flag'.
Change-Id: Ifa19b59e23278abf332d8ab06dd5ad2059f3e679
Reviewed-on: https://code.wireshark.org/review/15872
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-13 17:56:43 +00:00
Jeff Morriss 4e989c2c7d Diameter: close command elements.
... in order to make the XML (more) valid.

Change-Id: Iefffff3208c98d6ea55d509ed35b57abd268baf3
Reviewed-on: https://code.wireshark.org/review/15871
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-13 17:39:49 +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 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