- 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>
... 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>
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>
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>
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>
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>
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>
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>
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>
... 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>
... 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>
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>
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>
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>
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>
Follow gc7c33b0c8
Change-Id: I54d101f561d4f03dd6e972c8dda3cd6516128de5
Reviewed-on: https://code.wireshark.org/review/11553
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
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>
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>
(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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
(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>
(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>
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>
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>
(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>
Correct AVP codes 712 and 713, add 714-719.
Add and fix some enum codes.
Update specification version.
From me: Fix up indentation.
svn path=/trunk/; revision=50463
7.2.36 CG-Address AVP
The CG-Address AVP (AVP code 846) is of type Address and holds the IP-address of the charging gateway.
svn path=/trunk/; revision=47492
comment out the older, conflicting ETSI-specified values and use the more
modern ones.
Mark a couple of deprecated values as such (void).
svn path=/trunk/; revision=45251
Updated multiple enumerations (Event-Trigger, Reporting-Level, IP-CAN-Type,
Rule-Failure-Code and RAT-Type) to get them in sync with ETSI TS 129 212
V10.6.0 (2012-03).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7727
svn path=/trunk/; revision=44892