From ecc3369c0545ba566526acf36451cccd3bbf2f16 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Tue, 21 Apr 2015 21:20:59 -0400 Subject: 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 --- diameter/AlcatelLucent.xml | 2 +- diameter/Cisco.xml | 2698 +++++++++++++++----------------- diameter/HP.xml | 2 +- diameter/Nokia.xml | 2 +- diameter/NokiaSolutionsAndNetworks.xml | 3 +- diameter/VerizonWireless.xml | 3 +- diameter/Vodafone.xml | 8 +- diameter/eap.xml | 29 +- diameter/mobileipv4.xml | 351 +++-- diameter/mobileipv6.xml | 140 +- diameter/nasreq.xml | 56 +- diameter/sip.xml | 318 ++-- 12 files changed, 1684 insertions(+), 1928 deletions(-) (limited to 'diameter') diff --git a/diameter/AlcatelLucent.xml b/diameter/AlcatelLucent.xml index ade35128ed..9d2202480d 100644 --- a/diameter/AlcatelLucent.xml +++ b/diameter/AlcatelLucent.xml @@ -1,7 +1,7 @@ - + diff --git a/diameter/Cisco.xml b/diameter/Cisco.xml index 23a8ba4941..317086ec23 100644 --- a/diameter/Cisco.xml +++ b/diameter/Cisco.xml @@ -2,1477 +2,1239 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/diameter/HP.xml b/diameter/HP.xml index 29bee52751..17f03fd8f4 100644 --- a/diameter/HP.xml +++ b/diameter/HP.xml @@ -1,6 +1,6 @@ - + diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml index d569287dfe..55954d6968 100644 --- a/diameter/Nokia.xml +++ b/diameter/Nokia.xml @@ -2,7 +2,7 @@ - + diff --git a/diameter/NokiaSolutionsAndNetworks.xml b/diameter/NokiaSolutionsAndNetworks.xml index ee11095ab0..0afb3d469c 100644 --- a/diameter/NokiaSolutionsAndNetworks.xml +++ b/diameter/NokiaSolutionsAndNetworks.xml @@ -2,14 +2,13 @@ - + - diff --git a/diameter/VerizonWireless.xml b/diameter/VerizonWireless.xml index 9b05483613..29a05521a9 100644 --- a/diameter/VerizonWireless.xml +++ b/diameter/VerizonWireless.xml @@ -1,7 +1,8 @@ + - + diff --git a/diameter/Vodafone.xml b/diameter/Vodafone.xml index 8630f8688b..6733cc537f 100644 --- a/diameter/Vodafone.xml +++ b/diameter/Vodafone.xml @@ -5,7 +5,7 @@ - + @@ -19,13 +19,13 @@ - + - + @@ -50,7 +50,7 @@ - + diff --git a/diameter/eap.xml b/diameter/eap.xml index 2ca5d65ec2..f5711dbb86 100644 --- a/diameter/eap.xml +++ b/diameter/eap.xml @@ -1,18 +1,19 @@ + - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/diameter/mobileipv4.xml b/diameter/mobileipv4.xml index 91b566d5ed..acafca34c9 100644 --- a/diameter/mobileipv4.xml +++ b/diameter/mobileipv4.xml @@ -1,183 +1,182 @@ - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/diameter/mobileipv6.xml b/diameter/mobileipv6.xml index 13b28cfc91..9556e1d3f4 100644 --- a/diameter/mobileipv6.xml +++ b/diameter/mobileipv6.xml @@ -1,84 +1,78 @@ - - - + + - - + + - + - + - + + + + + + + + - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/diameter/nasreq.xml b/diameter/nasreq.xml index 4f431e7c34..5586ca6a53 100644 --- a/diameter/nasreq.xml +++ b/diameter/nasreq.xml @@ -19,34 +19,34 @@ + 368 SIP-Accounting-Information [RFC4740] + 369 SIP-Accounting-Server-URI [RFC4740] + 370 SIP-Credit-Control-Server-URI [RFC4740] + 371 SIP-Server-URI [RFC4740] + 372 SIP-Server-Capabilities [RFC4740] + 373 SIP-Mandatory-Capability [RFC4740] + 374 SIP-Optional-Capability [RFC4740] + 375 SIP-Server-Assignment-Type [RFC4740] + 376 SIP-Auth-Data-Item [RFC4740] + 377 SIP-Authentication-Scheme [RFC4740] + 378 SIP-Item-Number [RFC4740] + 379 SIP-Authenticate [RFC4740] + 380 SIP-Authorization [RFC4740] + 381 SIP-Authentication-Info [RFC4740] + 382 SIP-Number-Auth-Items [RFC4740] + 383 SIP-Deregistration-Reason [RFC4740] + 384 SIP-Reason-Code [RFC4740] + 385 SIP-Reason-Info [RFC4740] + 386 SIP-Visited-Network-Id [RFC4740] + 387 SIP-User-Authorization-Type [RFC4740] + 388 SIP-Supported-User-Data-Type [RFC4740] + 389 SIP-User-Data [RFC4740] + 390 SIP-User-Data-Type [RFC4740] + 391 SIP-User-Data-Contents [RFC4740] + 392 SIP-User-Data-Already-Available [RFC4740] + 393 SIP-Method [RFC4740] + 394-399 Unassigned + --> diff --git a/diameter/sip.xml b/diameter/sip.xml index ccfe71c4b7..c6bcf51139 100644 --- a/diameter/sip.xml +++ b/diameter/sip.xml @@ -1,164 +1,164 @@ + - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + -- cgit v1.2.1