From 2e782725d6ed4635246a182e687ea4c9d3c1e1d6 Mon Sep 17 00:00:00 2001 From: Sebastian Weddmark Olsson Date: Mon, 2 Dec 2024 19:22:25 +0100 Subject: [PATCH] [diameter] prefix and result-codes of dia files (#31) --- dia/dia_3gpp.dia | 2 +- dia/dia_3gpp_ts_29061_Gi_Sgi.dia | 3 + dia/dia_3gpp_ts_29061_Gmb.dia | 4 +- dia/dia_3gpp_ts_29061_Mz.dia | 109 +++++++ dia/dia_3gpp_ts_29061_SGmb.dia | 2 +- dia/dia_3gpp_ts_29109_Zh.dia | 6 +- dia/dia_3gpp_ts_29109_Zn.dia | 5 + dia/dia_3gpp_ts_29109_Zpn.dia | 5 + dia/dia_3gpp_ts_29128_T6a_T6b.dia | 3 +- dia/dia_3gpp_ts_29140_MM10.dia | 3 +- dia/dia_3gpp_ts_29153_Ns.dia | 1 + dia/dia_3gpp_ts_29154_Nt.dia | 2 +- dia/dia_3gpp_ts_29154_Nta.dia | 2 +- ..._SLg.dia => dia_3gpp_ts_29172_SLg_Lgd.dia} | 14 +- dia/dia_3gpp_ts_29173_SLh.dia | 1 + dia/dia_3gpp_ts_29209_Gq.dia | 1 + dia/dia_3gpp_ts_29211_Rx.dia | 5 + dia/dia_3gpp_ts_29212_Gx.dia | 1 + dia/dia_3gpp_ts_29212_Gxx.dia | 1 + dia/dia_3gpp_ts_29212_S15.dia | 1 + dia/dia_3gpp_ts_29212_Sd.dia | 1 + dia/dia_3gpp_ts_29212_St.dia | 1 + dia/dia_3gpp_ts_29214_Rx.dia | 1 + dia/dia_3gpp_ts_29215_S9.dia | 2 +- dia/dia_3gpp_ts_29215_S9a.dia | 1 + dia/dia_3gpp_ts_29215_S9a_star.dia | 1 + dia/dia_3gpp_ts_29217_Np.dia | 4 + dia/dia_3gpp_ts_29219_Sy.dia | 1 + dia/dia_3gpp_ts_29229_Cx.dia | 17 ++ dia/dia_3gpp_ts_29234_Pr.dia | 6 + dia/dia_3gpp_ts_29234_Wx.dia | 6 + dia/dia_3gpp_ts_29272_S13_S13prim.dia | 11 +- dia/dia_3gpp_ts_29272_S6a_S6d.dia | 10 + dia/dia_3gpp_ts_29272_S7a_S7d.dia | 10 + dia/dia_3gpp_ts_29273_S6b.dia | 32 +- dia/dia_3gpp_ts_29273_STa.dia | 13 + dia/dia_3gpp_ts_29273_SWm.dia | 13 + dia/dia_3gpp_ts_29273_SWx.dia | 13 + ...3gpp_ts_29283_Diameter_Data_Management.dia | 1 + dia/dia_3gpp_ts_29329_Sh.dia | 1 + dia/dia_3gpp_ts_29336_S6m_S6n.dia | 1 + dia/dia_3gpp_ts_29336_S6t.dia | 2 +- dia/dia_3gpp_ts_29337_T4.dia | 3 +- dia/dia_3gpp_ts_29338_S6c.dia | 13 +- dia/dia_3gpp_ts_29338_SGd_Gdd.dia | 12 + dia/dia_3gpp_ts_29344_PC4a.dia | 2 +- dia/dia_3gpp_ts_29345_PC6_PC7.dia | 2 +- dia/dia_3gpp_ts_29368_Tsp.dia | 3 +- dia/dia_3gpp_ts_29388_V4.dia | 2 +- dia/dia_3gpp_ts_29389_V6.dia | 3 +- dia/dia_3gpp_ts_29468_MB2-C.dia | 1 + dia/dia_3gpp_ts_32299_Rf.dia | 63 ++++ dia/dia_3gpp_ts_32299_Ro.dia | 111 +++++++ dia/dia_etsi.dia | 277 ++++++++++++------ dia/dia_etsi_es_283035_e2.dia | 3 +- dia/dia_etsi_ts_183060_Re.dia | 2 + dia/dia_itu.dia | 1 + 57 files changed, 709 insertions(+), 108 deletions(-) create mode 100644 dia/dia_3gpp_ts_29061_Mz.dia rename dia/{dia_3gpp_ts_29172_SLg.dia => dia_3gpp_ts_29172_SLg_Lgd.dia} (87%) create mode 100644 dia/dia_3gpp_ts_32299_Rf.dia create mode 100644 dia/dia_3gpp_ts_32299_Ro.dia diff --git a/dia/dia_3gpp.dia b/dia/dia_3gpp.dia index 976d73a..2fc2b31 100644 --- a/dia/dia_3gpp.dia +++ b/dia/dia_3gpp.dia @@ -25,7 +25,7 @@ ;; 16777250 ;; 3GPP STa 29.273 ;; ;; 16777251 ;; 3GPP S6a 29.272 ;; ;; 16777252 ;; 3GPP S13/S13' 29.272 ;; -;; 16777255 ;; 3GPP SLg 29.172 ;; +;; 16777255 ;; 3GPP SLg/Lgd 29.172 ;; ;; 16777264 ;; 3GPP SWm 29.273 ;; ;; 16777265 ;; 3GPP SWx 29.273 ;; ;; 16777266 ;; 3GPP Gxx 29.212 ;; diff --git a/dia/dia_3gpp_ts_29061_Gi_Sgi.dia b/dia/dia_3gpp_ts_29061_Gi_Sgi.dia index b476899..f5c92ed 100644 --- a/dia/dia_3gpp_ts_29061_Gi_Sgi.dia +++ b/dia/dia_3gpp_ts_29061_Gi_Sgi.dia @@ -3,6 +3,7 @@ @id 1 @name dia_3gpp_ts_29061_Gi_Sgi @vendor 10415 3gpp +@prefix Gi_Sgi @inherits diameter_gen_base_rfc6733 @@ -333,3 +334,5 @@ ASA ::= * [ Proxy-Info ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_PDP_CONTEXT_DELETION_INDICATION 2021 \ No newline at end of file diff --git a/dia/dia_3gpp_ts_29061_Gmb.dia b/dia/dia_3gpp_ts_29061_Gmb.dia index 95f0e2e..5c00fa7 100644 --- a/dia/dia_3gpp_ts_29061_Gmb.dia +++ b/dia/dia_3gpp_ts_29061_Gmb.dia @@ -3,6 +3,7 @@ @id 16777223 @name dia_3gpp_ts_29061_Gmb @vendor 10415 3gpp +@prefix Gmb @inherits diameter_gen_base_rfc6733 @@ -64,7 +65,6 @@ ST-Request ::= * [ Route-Record ] [ Additional-MBMS-Trace-Info ] - ST-Answer ::= < Session-Id > { Result-Code } @@ -80,7 +80,6 @@ ST-Answer ::= [ Redirect-Max-Cache-Time ] * [ Proxy-Info ] - RAR ::= < Session-Id > { Origin-Host } @@ -167,4 +166,3 @@ DIAMETER_ERROR_STOP_INDICATION 5121 DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE 5122 DIAMETER_ERROR_SERVICE_AREA 5123 DIAMETER_ERROR_OUT_OF_RESOURCES 4121 - diff --git a/dia/dia_3gpp_ts_29061_Mz.dia b/dia/dia_3gpp_ts_29061_Mz.dia new file mode 100644 index 0000000..3a653fa --- /dev/null +++ b/dia/dia_3gpp_ts_29061_Mz.dia @@ -0,0 +1,109 @@ +;; 3GPP TS 29.061 v17.6.0 Gmb + +@id 16777223 +@name dia_3gpp_ts_29061_Mz +@vendor 10415 3gpp +@prefix Mz + +@inherits diameter_gen_base_rfc6733 + +@inherits dia_3gpp + +@inherits dia_ietf + +@messages +AA-Request ::= + < Session-Id > + { Auth-Application-Id } + { Origin-Host } + { Origin-Realm } + { Destination-Realm } + { Auth-Request-Type } + [ Destination-Host ] + [ Called-Station-Id ] + [ Calling-Station-Id ] + [ Framed-IP-Address ] + [ Framed-IPv6-Prefix ] + [ Framed-Interface-Id ] + * [ Proxy-Info ] + * [ Route-Record ] + [ 3GPP-IMSI ] + [ RAI ] + [ 3GPP-IMEISV ] + [ 3GPP-RAT-Type ] + [ 3GPP-User-Location-Info ] + [ 3GPP-MS-TimeZone ] + [ Additional-MBMS-Trace-Info ] + +AA-Answer ::= + < Session-Id > + { Auth-Application-Id } + { Origin-Host } + { Origin-Realm } + [ Result-Code ] + [ Experimental-Result ] + [ Error-Message ] + [ Error-Reporting-Host ] + [ Failed-AVP ] + * [ Proxy-Info ] + [ Alternative-APN ] + [ 3GPP-IMSI ] + [ TMGI ] + [ Required-MBMS-Bearer-Capabilities ] + +ST-Request ::= + < Session-Id > + { Origin-Host } + { Origin-Realm } + { Destination-Realm } + { Auth-Application-Id } + { Termination-Cause } + [ Destination-Host ] + * [ Class ] + [ Origin-State-Id ] + * [ Proxy-Info ] + * [ Route-Record ] + [ Additional-MBMS-Trace-Info ] + +ST-Answer ::= + < Session-Id > + { Result-Code } + { Origin-Host } + { Origin-Realm } + * [ Class ] + [ Error-Message ] + [ Error-Reporting-Host ] + [ Failed-AVP ] + [ Origin-State-Id ] + * [ Redirect-Host ] + [ Redirect-Host-Usage ] + [ Redirect-Max-Cache-Time ] + * [ Proxy-Info ] + +ASR ::= + < Session-Id > + { Origin-Host } + { Origin-Realm } + { Destination-Realm } + { Destination-Host } + { Auth-Application-Id } + [ Origin-State-Id ] + * [ Proxy-Info ] + * [ Route-Record ] + +ASA ::= + < Session-Id > + { Result-Code } + { Origin-Host } + { Origin-Realm } + [ Origin-State-Id ] + [ Error-Message ] + [ Error-Reporting-Host ] + [ Failed-AVP ] + * [ Redirect-Host ] + [ Redirect-Host-Usage ] + [ Redirect-Max-Cache-Time ] + * [ Proxy-Info ] + +@define Experimental-Result-Code +DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE 5122 diff --git a/dia/dia_3gpp_ts_29061_SGmb.dia b/dia/dia_3gpp_ts_29061_SGmb.dia index 49e2a4d..967085c 100644 --- a/dia/dia_3gpp_ts_29061_SGmb.dia +++ b/dia/dia_3gpp_ts_29061_SGmb.dia @@ -3,6 +3,7 @@ @id 16777292 @name dia_3gpp_ts_29061_Gmb @vendor 10415 3gpp +@prefix SGmb @inherits diameter_gen_base_rfc6733 @@ -137,4 +138,3 @@ ASA ::= @define Experimental-Result-Code DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE 5122 - diff --git a/dia/dia_3gpp_ts_29109_Zh.dia b/dia/dia_3gpp_ts_29109_Zh.dia index 04f41b6..c02375b 100644 --- a/dia/dia_3gpp_ts_29109_Zh.dia +++ b/dia/dia_3gpp_ts_29109_Zh.dia @@ -3,6 +3,7 @@ @id 16777221 @name dia_3gpp_ts_29109_Zh @vendor 10415 3GPP +@prefix Zh @inherits diameter_gen_base_rfc6733 @@ -25,7 +26,6 @@ Multimedia-Auth-Request ::= * [ Proxy-Info ] * [ Route-Record ] - Multimedia-Auth-Answer ::= < Session-Id > { Vendor-Specific-Application-Id } @@ -42,3 +42,7 @@ Multimedia-Auth-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_IDENTITY_UNKNOWN 5401 +DIAMETER_ERROR_NOT_AUTHORIZED 5402 +DIAMETER_ERROR_TRANSACTION_IDENTIFIER_INVALID 5403 \ No newline at end of file diff --git a/dia/dia_3gpp_ts_29109_Zn.dia b/dia/dia_3gpp_ts_29109_Zn.dia index 3cd0e70..2e94dac 100644 --- a/dia/dia_3gpp_ts_29109_Zn.dia +++ b/dia/dia_3gpp_ts_29109_Zn.dia @@ -3,6 +3,7 @@ @id 16777220 @name dia_3gpp_ts_29109_Zn @vendor 10415 3GPP +@prefix Zn @inherits diameter_gen_base_rfc6733 @@ -44,3 +45,7 @@ Boostrapping-Info-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_IDENTITY_UNKNOWN 5401 +DIAMETER_ERROR_NOT_AUTHORIZED 5402 +DIAMETER_ERROR_TRANSACTION_IDENTIFIER_INVALID 5403 diff --git a/dia/dia_3gpp_ts_29109_Zpn.dia b/dia/dia_3gpp_ts_29109_Zpn.dia index 9a9c5d0..0e56f62 100644 --- a/dia/dia_3gpp_ts_29109_Zpn.dia +++ b/dia/dia_3gpp_ts_29109_Zpn.dia @@ -3,6 +3,7 @@ @id 16777268 @name dia_3gpp_ts_29109_Zpn @vendor 10415 3GPP +@prefix Zpn @inherits diameter_gen_base_rfc6733 @@ -51,3 +52,7 @@ GBA-Push-Info-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_IDENTITY_UNKNOWN 5401 +DIAMETER_ERROR_NOT_AUTHORIZED 5402 +DIAMETER_ERROR_TRANSACTION_IDENTIFIER_INVALID 5403 diff --git a/dia/dia_3gpp_ts_29128_T6a_T6b.dia b/dia/dia_3gpp_ts_29128_T6a_T6b.dia index a4f6bba..1456597 100644 --- a/dia/dia_3gpp_ts_29128_T6a_T6b.dia +++ b/dia/dia_3gpp_ts_29128_T6a_T6b.dia @@ -1,8 +1,9 @@ ;; 3GPP TS 29.128 v17.1.0 T6a/T6b @id 16777346 -@name dia_3gpp_ts_29128 +@name dia_3gpp_ts_29128_T6a_T6b @vendor 10415 3gpp +@prefix T6a_T6b @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29140_MM10.dia b/dia/dia_3gpp_ts_29140_MM10.dia index d5b1dac..0ca2bc5 100644 --- a/dia/dia_3gpp_ts_29140_MM10.dia +++ b/dia/dia_3gpp_ts_29140_MM10.dia @@ -1,8 +1,9 @@ ;; 3GPP TS 29.140 v7.0.0 MM10 @id 16777226 -@name dia_3gpp_ts_29140 +@name dia_3gpp_ts_29140_MM10 @vendor 10415 3gpp +@prefix MM10 @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29153_Ns.dia b/dia/dia_3gpp_ts_29153_Ns.dia index 329eeda..425f1d8 100644 --- a/dia/dia_3gpp_ts_29153_Ns.dia +++ b/dia/dia_3gpp_ts_29153_Ns.dia @@ -3,6 +3,7 @@ @id 16777347 @name dia_3gpp_ts_29153_Ns @vendor 10415 3gpp +@prefix Ns @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29154_Nt.dia b/dia/dia_3gpp_ts_29154_Nt.dia index d0c45a3..b5a4065 100644 --- a/dia/dia_3gpp_ts_29154_Nt.dia +++ b/dia/dia_3gpp_ts_29154_Nt.dia @@ -3,6 +3,7 @@ @id 16777348 @name dia_3gpp_ts_29154_Nt @vendor 10415 3gpp +@prefix Nt @inherits diameter_gen_base_rfc6733 @@ -61,4 +62,3 @@ BT-Answer ::= * [ Supported-Features ] * [ Load ] * [ AVP ] - diff --git a/dia/dia_3gpp_ts_29154_Nta.dia b/dia/dia_3gpp_ts_29154_Nta.dia index e9c8115..a08ec55 100644 --- a/dia/dia_3gpp_ts_29154_Nta.dia +++ b/dia/dia_3gpp_ts_29154_Nta.dia @@ -3,6 +3,7 @@ @id 16777358 @name dia_3gpp_ts_29154_Nta @vendor 10415 3gpp +@prefix Nta @inherits diameter_gen_base_rfc6733 @@ -86,4 +87,3 @@ ER-Answer ::= * [ Route-Record ] * [ Load ] * [ AVP ] - diff --git a/dia/dia_3gpp_ts_29172_SLg.dia b/dia/dia_3gpp_ts_29172_SLg_Lgd.dia similarity index 87% rename from dia/dia_3gpp_ts_29172_SLg.dia rename to dia/dia_3gpp_ts_29172_SLg_Lgd.dia index dd394b9..f7489fe 100644 --- a/dia/dia_3gpp_ts_29172_SLg.dia +++ b/dia/dia_3gpp_ts_29172_SLg_Lgd.dia @@ -1,8 +1,9 @@ -;; 3GPP TS 29.172 v17.0.0 SLg +;; 3GPP TS 29.172 v17.0.0 SLg/Lgd @id 16777255 -@name dia_3gpp_ts_29172_SLg +@name dia_3gpp_ts_29172_SLg_Lgd @vendor 10415 3gpp +@prefix SLg_Lgd @inherits diameter_gen_base_rfc6733 @@ -138,3 +139,12 @@ Location-Report-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_UNAUTHORIZED_REQUESTING_NETWORK 5490 +DIAMETER_ERROR_UNREACHABLE_USER 4221 +DIAMETER_ERROR_SUSPENDED_USER 4222 +DIAMETER_ERROR_DETACHED_USER 4223 +DIAMETER_ERROR_POSITIONING_DENIED 4224 +DIAMETER_ERROR_POSITIONING_FAILED 4225 +DIAMETER_ERROR_UNKNOWN_UNREACHABLE_LCS_CLIENT 4226 diff --git a/dia/dia_3gpp_ts_29173_SLh.dia b/dia/dia_3gpp_ts_29173_SLh.dia index d985089..f7280b4 100644 --- a/dia/dia_3gpp_ts_29173_SLh.dia +++ b/dia/dia_3gpp_ts_29173_SLh.dia @@ -3,6 +3,7 @@ @id 16777291 @name dia_3gpp_ts_29173_SLh @vendor 10415 3gpp +@prefix SLh @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29209_Gq.dia b/dia/dia_3gpp_ts_29209_Gq.dia index 188ab6d..9976a13 100644 --- a/dia/dia_3gpp_ts_29209_Gq.dia +++ b/dia/dia_3gpp_ts_29209_Gq.dia @@ -3,6 +3,7 @@ @id 16777222 @name dia_3gpp_ts_29209_Gq @vendor 10415 3GPP +@prefix Gq @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29211_Rx.dia b/dia/dia_3gpp_ts_29211_Rx.dia index c4fc26a..048dd2b 100644 --- a/dia/dia_3gpp_ts_29211_Rx.dia +++ b/dia/dia_3gpp_ts_29211_Rx.dia @@ -3,6 +3,7 @@ @id 16777229 @name dia_3gpp_ts_29211_Rx @vendor 10415 3GPP +@prefix Rx @inherits diameter_gen_base_rfc6733 @@ -131,3 +132,7 @@ AS-Answer ::= @enum Specific-Action INDICATION_OF_RELEASE_OF_BEARER 4 INDICATION_OF_ESTABLISHMENT_OF_BEARER 5 + +@define Experimental-Result-Code +INVALID_SERVICE_INFORMATION 5061 +FILTER_RESTRICTIONS 5062 diff --git a/dia/dia_3gpp_ts_29212_Gx.dia b/dia/dia_3gpp_ts_29212_Gx.dia index 24fdaba..850101c 100644 --- a/dia/dia_3gpp_ts_29212_Gx.dia +++ b/dia/dia_3gpp_ts_29212_Gx.dia @@ -3,6 +3,7 @@ @id 16777238 @name dia_3gpp_ts_29212_Gx @vendor 10415 3gpp +@prefix Gx @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29212_Gxx.dia b/dia/dia_3gpp_ts_29212_Gxx.dia index 25b901b..2b96a7b 100644 --- a/dia/dia_3gpp_ts_29212_Gxx.dia +++ b/dia/dia_3gpp_ts_29212_Gxx.dia @@ -3,6 +3,7 @@ @id 16777266 @name dia_3gpp_ts_29212_Gxx @vendor 10415 3gpp +@prefix Gxx @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29212_S15.dia b/dia/dia_3gpp_ts_29212_S15.dia index 7179f0b..33ccec1 100644 --- a/dia/dia_3gpp_ts_29212_S15.dia +++ b/dia/dia_3gpp_ts_29212_S15.dia @@ -3,6 +3,7 @@ @id 16777318 @name dia_3gpp_ts_29212_S15 @vendor 10415 3gpp +@prefix S15 @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29212_Sd.dia b/dia/dia_3gpp_ts_29212_Sd.dia index 0a08a59..a81edf1 100644 --- a/dia/dia_3gpp_ts_29212_Sd.dia +++ b/dia/dia_3gpp_ts_29212_Sd.dia @@ -3,6 +3,7 @@ @id 16777303 @name dia_3gpp_ts_29212_Sd @vendor 10415 3gpp +@prefix Sd @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29212_St.dia b/dia/dia_3gpp_ts_29212_St.dia index 61f2206..7280150 100644 --- a/dia/dia_3gpp_ts_29212_St.dia +++ b/dia/dia_3gpp_ts_29212_St.dia @@ -3,6 +3,7 @@ @id 16777349 @name dia_3gpp_ts_29212_St @vendor 10415 3gpp +@prefix St @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29214_Rx.dia b/dia/dia_3gpp_ts_29214_Rx.dia index 0a2fce7..7a457b0 100644 --- a/dia/dia_3gpp_ts_29214_Rx.dia +++ b/dia/dia_3gpp_ts_29214_Rx.dia @@ -3,6 +3,7 @@ @id 16777236 @name dia_3gpp_ts_29214_Rx @vendor 10415 3gpp +@prefix Rx @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29215_S9.dia b/dia/dia_3gpp_ts_29215_S9.dia index d606ed9..1a5b7f5 100644 --- a/dia/dia_3gpp_ts_29215_S9.dia +++ b/dia/dia_3gpp_ts_29215_S9.dia @@ -3,6 +3,7 @@ @id 16777267 @name dia_3gpp_ts_29215_S9 @vendor 10415 3GPP +@prefix S9 @inherits diameter_gen_base_rfc6733 @@ -189,4 +190,3 @@ TE-Answer ::= DIAMETER_ERROR_SUBSESSION 5470 DIAMETER_ERROR_ONGOING_SESSION_ESTABLISHMENT 5471 DIAMETER_PENDING_TRANSACTION 4144 - diff --git a/dia/dia_3gpp_ts_29215_S9a.dia b/dia/dia_3gpp_ts_29215_S9a.dia index de2868b..87744d3 100644 --- a/dia/dia_3gpp_ts_29215_S9a.dia +++ b/dia/dia_3gpp_ts_29215_S9a.dia @@ -3,6 +3,7 @@ @id 16777319 @name dia_3gpp_ts_29215_S9a @vendor 10415 3GPP +@prefix S9a @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29215_S9a_star.dia b/dia/dia_3gpp_ts_29215_S9a_star.dia index be5a1fb..858711e 100644 --- a/dia/dia_3gpp_ts_29215_S9a_star.dia +++ b/dia/dia_3gpp_ts_29215_S9a_star.dia @@ -3,6 +3,7 @@ @id 16777320 @name dia_3gpp_ts_29215_S9a_star @vendor 10415 3GPP +@prefix S9a_star @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29217_Np.dia b/dia/dia_3gpp_ts_29217_Np.dia index 7ce7c06..ca520e2 100644 --- a/dia/dia_3gpp_ts_29217_Np.dia +++ b/dia/dia_3gpp_ts_29217_Np.dia @@ -3,6 +3,7 @@ @id 16777342 @name dia_3gpp_ts_29217_Np @vendor 10415 3gpp +@prefix Np @inherits diameter_gen_base_rfc6733 @@ -141,3 +142,6 @@ Modify-Uecontext-Answer ::= * [ Proxy-Info ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_PENDING_TRANSACTION 4144 \ No newline at end of file diff --git a/dia/dia_3gpp_ts_29219_Sy.dia b/dia/dia_3gpp_ts_29219_Sy.dia index 605ddb0..28046da 100644 --- a/dia/dia_3gpp_ts_29219_Sy.dia +++ b/dia/dia_3gpp_ts_29219_Sy.dia @@ -3,6 +3,7 @@ @id 16777302 @name dia_3gpp_ts_29212_Sy @vendor 10415 3gpp +@prefix Sy @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29229_Cx.dia b/dia/dia_3gpp_ts_29229_Cx.dia index 61653be..4411d22 100644 --- a/dia/dia_3gpp_ts_29229_Cx.dia +++ b/dia/dia_3gpp_ts_29229_Cx.dia @@ -3,6 +3,7 @@ @id 16777216 @name dia_3gpp_ts_29229_Cx @vendor 10415 3gpp +@prefix Cx @inherits diameter_gen_base_rfc6733 @@ -258,3 +259,19 @@ Push-Profile-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_FIRST_REGISTRATION 2001 +DIAMETER_SUBSEQUENT_REGISTRATION 2002 +DIAMETER_UNREGISTERED_SERVICE 2003 +DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED 2004 +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_IDENTITIES_DONT_MATCH 5002 +DIAMETER_ERROR_IDENTITY_NOT_REGISTERED 5003 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED 5005 +DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED 5006 +DIAMETER_ERROR_IN_ASSIGNMENT_TYPE 5007 +DIAMETER_ERROR_TOO_MUCH_DATA 5008 +DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA 5009 +DIAMETER_ERROR_FEATURE_UNSUPPORTED 5011 +DIAMETER_ERROR_SERVING_NODE_FEATURE_UNSUPPORTED 5012 diff --git a/dia/dia_3gpp_ts_29234_Pr.dia b/dia/dia_3gpp_ts_29234_Pr.dia index ec4635c..1b21c97 100644 --- a/dia/dia_3gpp_ts_29234_Pr.dia +++ b/dia/dia_3gpp_ts_29234_Pr.dia @@ -3,6 +3,7 @@ @id 16777230 @name dia_3gpp_ts_29234_Pr @vendor 10415 3GPP +@prefix Pr @inherits diameter_gen_base_rfc6733 @@ -104,3 +105,8 @@ ASA ::= * [ Proxy-Info ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_ERROR_USER_NO_WLAN_SUBSCRIPTON 5041 +DIAMETER_ERROR_W-APN_UNUSED_BY_USER 5042 +DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION 5043 +DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION 5044 diff --git a/dia/dia_3gpp_ts_29234_Wx.dia b/dia/dia_3gpp_ts_29234_Wx.dia index 1e40e76..8edc693 100644 --- a/dia/dia_3gpp_ts_29234_Wx.dia +++ b/dia/dia_3gpp_ts_29234_Wx.dia @@ -3,6 +3,7 @@ @id 16777219 @name dia_3gpp_ts_29234_Wx @vendor 10415 3GPP +@prefix Wx @inherits diameter_gen_base_rfc6733 @@ -100,3 +101,8 @@ Server-Assignment-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_USER_NO_WLAN_SUBSCRIPTON 5041 +DIAMETER_ERROR_W-APN_UNUSED_BY_USER 5042 +DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION 5043 +DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION 5044 diff --git a/dia/dia_3gpp_ts_29272_S13_S13prim.dia b/dia/dia_3gpp_ts_29272_S13_S13prim.dia index 646888a..f2b43f8 100644 --- a/dia/dia_3gpp_ts_29272_S13_S13prim.dia +++ b/dia/dia_3gpp_ts_29272_S13_S13prim.dia @@ -3,6 +3,7 @@ @id 16777252 @name dia_3gpp_ts_29272_S13_S13prim @vendor 10415 3gpp +@prefix S13_S13prim @inherits diameter_gen_base_rfc6733 @@ -41,4 +42,12 @@ ME-Identity-Check-Answer ::= * [ Proxy-Info ] * [ Route-Record ] - +@define Experimental-Result-Code +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION 5420 +DIAMETER_ERROR_RAT_NOT_ALLOWED 5421 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_EQUIPMENT_UNKNOWN 5422 +DIAMETER_ERROR_UNKNOWN_SERVING_NODE 5423 +DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE 4181 +DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT 4182 diff --git a/dia/dia_3gpp_ts_29272_S6a_S6d.dia b/dia/dia_3gpp_ts_29272_S6a_S6d.dia index 610c4b5..2b77906 100644 --- a/dia/dia_3gpp_ts_29272_S6a_S6d.dia +++ b/dia/dia_3gpp_ts_29272_S6a_S6d.dia @@ -3,6 +3,7 @@ @id 16777251 @name dia_3gpp_ts_29272_S6a_S6d @vendor 10415 3gpp +@prefix S6a_S6d @inherits diameter_gen_base_rfc6733 @@ -337,3 +338,12 @@ Notify-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION 5420 +DIAMETER_ERROR_RAT_NOT_ALLOWED 5421 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_EQUIPMENT_UNKNOWN 5422 +DIAMETER_ERROR_UNKNOWN_SERVING_NODE 5423 +DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE 4181 +DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT 4182 diff --git a/dia/dia_3gpp_ts_29272_S7a_S7d.dia b/dia/dia_3gpp_ts_29272_S7a_S7d.dia index 347727f..0c44885 100644 --- a/dia/dia_3gpp_ts_29272_S7a_S7d.dia +++ b/dia/dia_3gpp_ts_29272_S7a_S7d.dia @@ -3,6 +3,7 @@ @id 16777308 @name dia_3gpp_ts_29272_S7a_S7d @vendor 10415 3gpp +@prefix S7a_S7d @inherits diameter_gen_base_rfc6733 @@ -171,3 +172,12 @@ Cancel-VCSG-Location-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION 5420 +DIAMETER_ERROR_RAT_NOT_ALLOWED 5421 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_EQUIPMENT_UNKNOWN 5422 +DIAMETER_ERROR_UNKNOWN_SERVING_NODE 5423 +DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE 4181 +DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT 4182 diff --git a/dia/dia_3gpp_ts_29273_S6b.dia b/dia/dia_3gpp_ts_29273_S6b.dia index 41e5649..26a6a3e 100644 --- a/dia/dia_3gpp_ts_29273_S6b.dia +++ b/dia/dia_3gpp_ts_29273_S6b.dia @@ -3,13 +3,29 @@ @id 16777272 @name dia_3gpp_ts_29273_S6b @vendor 10415 3gpp +@prefix S6b @inherits diameter_gen_base_rfc6733 -@inherits dia_ietf - @inherits dia_3gpp +@inherits dia_ietf +MIP6-Feature-Vector +DRMP +QoS-Resources +QoS-Capability +MIP6-Agent-Info +OC-Supported-Features +Load +Service-Selection +MIP-Session-Key +Mobile-Node-Identifier +EAP-Payload +MIP-Careof-Address +EAP-Master-Session-Key +MIP-MN-HA-SPI +OC-OLR + @messages Diameter-EAP-Request ::= < Session-Id > @@ -165,3 +181,15 @@ Re-Auth-Answer ::= [ User-Name ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_IDENTITY_NOT_REGISTERED 5003 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED 5005 +DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION 5450 +DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION 5451 +DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED 5452 +DIAMETER_ERROR_LATE_OVERLAPPING_REQUEST 5453 +DIAMETER_ERROR_TIMED_OUT_REQUEST 5454 +DIAMETER_ERROR_ILLEGAL_EQUIPMENT 5554 diff --git a/dia/dia_3gpp_ts_29273_STa.dia b/dia/dia_3gpp_ts_29273_STa.dia index e080e12..6c3e51d 100644 --- a/dia/dia_3gpp_ts_29273_STa.dia +++ b/dia/dia_3gpp_ts_29273_STa.dia @@ -3,6 +3,7 @@ @id 16777250 @name dia_3gpp_ts_29273_STa @vendor 10415 3gpp +@prefix STa @inherits diameter_gen_base_rfc6733 @@ -192,3 +193,15 @@ AA-Answer ::= * [ Load ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_IDENTITY_NOT_REGISTERED 5003 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED 5005 +DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION 5450 +DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION 5451 +DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED 5452 +DIAMETER_ERROR_LATE_OVERLAPPING_REQUEST 5453 +DIAMETER_ERROR_TIMED_OUT_REQUEST 5454 +DIAMETER_ERROR_ILLEGAL_EQUIPMENT 5554 diff --git a/dia/dia_3gpp_ts_29273_SWm.dia b/dia/dia_3gpp_ts_29273_SWm.dia index b22de23..08cd916 100644 --- a/dia/dia_3gpp_ts_29273_SWm.dia +++ b/dia/dia_3gpp_ts_29273_SWm.dia @@ -3,6 +3,7 @@ @id 16777264 @name dia_3gpp_ts_29273_SWm @vendor 10415 3gpp +@prefix SWm @inherits diameter_gen_base_rfc6733 @@ -168,3 +169,15 @@ Re-Auth-Answer ::= [ User-Name ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_IDENTITY_NOT_REGISTERED 5003 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED 5005 +DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION 5450 +DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION 5451 +DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED 5452 +DIAMETER_ERROR_LATE_OVERLAPPING_REQUEST 5453 +DIAMETER_ERROR_TIMED_OUT_REQUEST 5454 +DIAMETER_ERROR_ILLEGAL_EQUIPMENT 5554 diff --git a/dia/dia_3gpp_ts_29273_SWx.dia b/dia/dia_3gpp_ts_29273_SWx.dia index 525b553..67182d8 100644 --- a/dia/dia_3gpp_ts_29273_SWx.dia +++ b/dia/dia_3gpp_ts_29273_SWx.dia @@ -3,6 +3,7 @@ @id 16777265 @name dia_3gpp_ts_29273_SWx @vendor 10415 3gpp +@prefix SWx @inherits diameter_gen_base_rfc6733 @@ -146,3 +147,15 @@ Registration-Termination-Answer ::= * [ Supported-Features ] * [ AVP ] +@define Experimental-Result-Code +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_IDENTITY_NOT_REGISTERED 5003 +DIAMETER_ERROR_ROAMING_NOT_ALLOWED 5004 +DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED 5005 +DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION 5450 +DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION 5451 +DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED 5452 +DIAMETER_ERROR_LATE_OVERLAPPING_REQUEST 5453 +DIAMETER_ERROR_TIMED_OUT_REQUEST 5454 +DIAMETER_ERROR_ILLEGAL_EQUIPMENT 5554 diff --git a/dia/dia_3gpp_ts_29283_Diameter_Data_Management.dia b/dia/dia_3gpp_ts_29283_Diameter_Data_Management.dia index 8ff2f1e..cbc35ac 100644 --- a/dia/dia_3gpp_ts_29283_Diameter_Data_Management.dia +++ b/dia/dia_3gpp_ts_29283_Diameter_Data_Management.dia @@ -4,6 +4,7 @@ @id 16777351 @name dia_3gpp_ts_29283_Diameter_Data_Management @vendor 10415 3gpp +@prefix Diameter_Data_Management @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29329_Sh.dia b/dia/dia_3gpp_ts_29329_Sh.dia index 13ed5f3..3aea8d6 100644 --- a/dia/dia_3gpp_ts_29329_Sh.dia +++ b/dia/dia_3gpp_ts_29329_Sh.dia @@ -3,6 +3,7 @@ @id 16777217 @name dia_3gpp_ts_29329_Sh @vendor 10415 3gpp +@prefix Sh @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29336_S6m_S6n.dia b/dia/dia_3gpp_ts_29336_S6m_S6n.dia index 77ae109..dd2a44a 100644 --- a/dia/dia_3gpp_ts_29336_S6m_S6n.dia +++ b/dia/dia_3gpp_ts_29336_S6m_S6n.dia @@ -3,6 +3,7 @@ @id 16777310 @name dia_3gpp_ts_29336_S6m_S6n @vendor 10415 3gpp +@prefix S6m_S6n @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29336_S6t.dia b/dia/dia_3gpp_ts_29336_S6t.dia index 6a70150..14f510b 100644 --- a/dia/dia_3gpp_ts_29336_S6t.dia +++ b/dia/dia_3gpp_ts_29336_S6t.dia @@ -3,6 +3,7 @@ @id 16777345 @name dia_3gpp_ts_29336_S6t @vendor 10415 3gpp +@prefix S6t @inherits diameter_gen_base_rfc6733 @@ -145,4 +146,3 @@ DIAMETER_ERROR_CONFIGURATION_EVENT_STORAGE_NOT_SUCCESSFUL 5513 DIAMETER_ERROR_CONFIGURATION_EVENT_NON_EXISTANT 5514 DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION 5451 DIAMETER_ERROR_UNAUTHORIZED_MTC_PROVIDER 5516 - diff --git a/dia/dia_3gpp_ts_29337_T4.dia b/dia/dia_3gpp_ts_29337_T4.dia index ff1bb8e..9a002f0 100644 --- a/dia/dia_3gpp_ts_29337_T4.dia +++ b/dia/dia_3gpp_ts_29337_T4.dia @@ -1,8 +1,9 @@ ;; 3GPP TS 29.337 v17.0.0 T4 @id 16777311 -@name dia_3gpp_ts_29337 +@name dia_3gpp_ts_29337_T4 @vendor 10415 3gpp +@prefix T4 @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29338_S6c.dia b/dia/dia_3gpp_ts_29338_S6c.dia index cfde63a..5cb67a7 100644 --- a/dia/dia_3gpp_ts_29338_S6c.dia +++ b/dia/dia_3gpp_ts_29338_S6c.dia @@ -3,6 +3,7 @@ @id 16777312 @name dia_3gpp_ts_29338_S6c @vendor 10415 3gpp +@prefix S6c @inherits diameter_gen_base_rfc6733 @@ -131,4 +132,14 @@ Report-SM-Delivery-Status-Answer ::= * [ Proxy-Info ] * [ Route-Record ] - +@define Experimental-Result-Code +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_ABSENT_USER 5550 +DIAMETER_ERROR_USER_BUSY_FOR_MT_SMS 5551 +DIAMETER_ERROR_FACILITY_NOT_SUPPORTED 5552 +DIAMETER_ERROR_ILLEGAL_USER 5553 +DIAMETER_ERROR_ILLEGAL_EQUIPMENT 5554 +DIAMETER_ERROR_SM_DELIVERY_FAILURE 5555 +DIAMETER_ERROR_SERVICE_NOT_SUBSCRIBED 5556 +DIAMETER_ERROR_SERVICE_BARRED 5557 +DIAMETER_ERROR_MWD_LIST_FULL 5558 diff --git a/dia/dia_3gpp_ts_29338_SGd_Gdd.dia b/dia/dia_3gpp_ts_29338_SGd_Gdd.dia index 5d7a3dd..b94308b 100644 --- a/dia/dia_3gpp_ts_29338_SGd_Gdd.dia +++ b/dia/dia_3gpp_ts_29338_SGd_Gdd.dia @@ -3,6 +3,7 @@ @id 16777313 @name dia_3gpp_ts_29338_SGd_Gdd @vendor 10415 3gpp +@prefix SGd_Gdd @inherits diameter_gen_base_rfc6733 @@ -130,3 +131,14 @@ Alert-Service-Centre-Answer ::= * [ Proxy-Info ] * [ Route-Record ] +@define Experimental-Result-Code +DIAMETER_ERROR_USER_UNKNOWN 5001 +DIAMETER_ERROR_ABSENT_USER 5550 +DIAMETER_ERROR_USER_BUSY_FOR_MT_SMS 5551 +DIAMETER_ERROR_FACILITY_NOT_SUPPORTED 5552 +DIAMETER_ERROR_ILLEGAL_USER 5553 +DIAMETER_ERROR_ILLEGAL_EQUIPMENT 5554 +DIAMETER_ERROR_SM_DELIVERY_FAILURE 5555 +DIAMETER_ERROR_SERVICE_NOT_SUBSCRIBED 5556 +DIAMETER_ERROR_SERVICE_BARRED 5557 +DIAMETER_ERROR_MWD_LIST_FULL 5558 diff --git a/dia/dia_3gpp_ts_29344_PC4a.dia b/dia/dia_3gpp_ts_29344_PC4a.dia index 4e387a3..3f70735 100644 --- a/dia/dia_3gpp_ts_29344_PC4a.dia +++ b/dia/dia_3gpp_ts_29344_PC4a.dia @@ -3,6 +3,7 @@ @id 16777336 @name dia_3gpp_ts_29344_PC4a @vendor 10415 3gpp +@prefix PC4a @inherits diameter_gen_base_rfc6733 @@ -187,4 +188,3 @@ DIAMETER_ERROR_USER_UNKNOWN 5001 DIAMETER_ERROR_UNKNOWN_PROSE_SUBSCRIPTION 5610 DIAMETER_ERROR_PROSE_NOT_ALLOWED 5611 DIAMETER_ERROR_UE_LOCATION_UNKNOWN 5612 - diff --git a/dia/dia_3gpp_ts_29345_PC6_PC7.dia b/dia/dia_3gpp_ts_29345_PC6_PC7.dia index 32bcb9b..562ba8f 100644 --- a/dia/dia_3gpp_ts_29345_PC6_PC7.dia +++ b/dia/dia_3gpp_ts_29345_PC6_PC7.dia @@ -3,6 +3,7 @@ @id 16777340 @name dia_3gpp_ts_29345_PC6_PC7 @vendor 10415 3gpp +@prefix PC6_PC7 @inherits diameter_gen_base_rfc6733 @@ -322,4 +323,3 @@ DIAMETER_ERROR_INVALID_TARGET_RPAUID 5639 DIAMETER_ERROR_NO_ASSOCIATED_RESTRICTED_CODE 5640 ; DIAMETER_ERROR_REVOCATION_FAILURE 56x1 ; DIAMETER_ERROR_ALREADY_BANNED 56x2 - diff --git a/dia/dia_3gpp_ts_29368_Tsp.dia b/dia/dia_3gpp_ts_29368_Tsp.dia index 0d3714b..d40b468 100644 --- a/dia/dia_3gpp_ts_29368_Tsp.dia +++ b/dia/dia_3gpp_ts_29368_Tsp.dia @@ -3,6 +3,7 @@ @id 16777309 @name dia_3gpp_ts_29368_Tsp @vendor 10415 3gpp +@prefix Tsp @inherits diameter_gen_base_rfc6733 @@ -79,5 +80,3 @@ DN-Answer ::= [ Failed-AVP ] * [ Proxy-Info ] * [ AVP ] - - diff --git a/dia/dia_3gpp_ts_29388_V4.dia b/dia/dia_3gpp_ts_29388_V4.dia index ac1dae4..4c98a52 100644 --- a/dia/dia_3gpp_ts_29388_V4.dia +++ b/dia/dia_3gpp_ts_29388_V4.dia @@ -3,6 +3,7 @@ @id 16777355 @name dia_3gpp_ts_29388_V4 @vendor 10415 3gpp +@prefix V4 @inherits diameter_gen_base_rfc6733 @@ -154,4 +155,3 @@ Reset-Answer ::= DIAMETER_ERROR_USER_UNKNOWN 5001 DIAMETER_ERROR_UNKNOWN_V2X_SUBSCRIPTION 5690 DIAMETER_ERROR_V2X_NOT_ALLOWED 5691 - diff --git a/dia/dia_3gpp_ts_29389_V6.dia b/dia/dia_3gpp_ts_29389_V6.dia index 07983b6..ee4125e 100644 --- a/dia/dia_3gpp_ts_29389_V6.dia +++ b/dia/dia_3gpp_ts_29389_V6.dia @@ -1,8 +1,9 @@ ;; 3GPP TS 29.389 v17.0.0 @id 16777356 -@name dia_3gpp_ts_29389 +@name dia_3gpp_ts_29389_V6 @vendor 10415 3gpp +@prefix V6 @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_29468_MB2-C.dia b/dia/dia_3gpp_ts_29468_MB2-C.dia index 1e7c61c..3499fe3 100644 --- a/dia/dia_3gpp_ts_29468_MB2-C.dia +++ b/dia/dia_3gpp_ts_29468_MB2-C.dia @@ -3,6 +3,7 @@ @id 16777335 @name dia_3gpp_ts_29468_MB2-C @vendor 10415 3gpp +@prefix MB2-C @inherits diameter_gen_base_rfc6733 diff --git a/dia/dia_3gpp_ts_32299_Rf.dia b/dia/dia_3gpp_ts_32299_Rf.dia new file mode 100644 index 0000000..60984bd --- /dev/null +++ b/dia/dia_3gpp_ts_32299_Rf.dia @@ -0,0 +1,63 @@ +;; 3GPP TS 32.299 v17.0.0 + +@id 3 +@name dia_3gpp_ts_32299_Rf +@vendor 10415 3gpp +@prefix Rf + +@inherits diameter_gen_base_rfc6733 + +@inherits dia_3gpp + +@inherits dia_ietf + +@messages +Accounting-Request ::= < Diameter Header: 271, REQ, PXY > + < Session-Id > + { Origin-Host } + { Origin-Realm } + { Destination-Realm } + { Accounting-Record-Type } + { Accounting-Record-Number } + [ Acct-Application-Id ] + [ User-Name ] + [ Destination-Host ] + [ Acct-Interim-Interval ] + [ Origin-State-Id ] + [ Event-Timestamp ] + * [ Proxy-Info ] + * [ Route-Record ] + [ Service-Context-Id ] + [ Service-Information ] + * [ AVP ] + +Accounting-Answer ::= < Diameter Header: 271, PXY > + < Session-Id > + { Result-Code } + { Origin-Host } + { Origin-Realm } + { Accounting-Record-Type } + { Accounting-Record-Number } + [ Experimental-Result ] + [ Acct-Application-Id ] + [ User-Name ] + [ Error-Message ] + [ Error-Reporting-Host ] + [ Acct-Interim-Interval ] + [ Failed-AVP ] + [ Origin-State-Id ] + [ Event-Timestamp ] + * [ Proxy-Info ] + * [ AVP ] + +@define Experimental-Result-Code +DIAMETER_ERROR_FEATURE_UNSUPPORTED 5011 + +@define Result-Code +DIAMETER_END_USER_SERVICE_DENIED 4010 +DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE 4011 +DIAMETER_CREDIT_LIMIT_REACHED 4012 +DIAMETER_AUTHORIZATION_REJECTED 5003 +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_RATING_FAILED 5031 + diff --git a/dia/dia_3gpp_ts_32299_Ro.dia b/dia/dia_3gpp_ts_32299_Ro.dia new file mode 100644 index 0000000..0d3b4c6 --- /dev/null +++ b/dia/dia_3gpp_ts_32299_Ro.dia @@ -0,0 +1,111 @@ +;; 3GPP TS 32.299 v17.0.0 + +@id 4 +@name dia_3gpp_ts_32299_Ro +@vendor 10415 3gpp +@prefix Ro + +@inherits diameter_gen_base_rfc6733 + +@inherits dia_3gpp + +@inherits dia_ietf + +@messages +Credit-Control-Request ::= < Diameter Header: 272, REQ, PXY > + < Session-Id > + { Origin-Host } + { Origin-Realm } + { Destination-Realm } + { Auth-Application-Id } + { Service-Context-Id } + { CC-Request-Type } + { CC-Request-Number } + [ Destination-Host ] + [ User-Name ] + [ Origin-State-Id ] + [ Event-Timestamp ] + * [ Subscription-Id ] + [ Termination-Cause ] + [ Requested-Action ] + [ AoC-Request-Type ] + [ Multiple-Services-Indicator ] + * [ Multiple-Services-Credit-Control ] + [ CC-Correlation-Id ] + [ User-Equipment-Info ] + [ OC-Supported-Features ] + * [ Proxy-Info ] + * [ Route-Record ] + [ Service-Information ] + * [ AVP ] + +Credit-Control-Answer::= < Diameter Header: 272, PXY > + < Session-Id > + { Result-Code } + { Origin-Host } + { Origin-Realm } + { Auth-Application-Id } + { CC-Request-Type } + { CC-Request-Number } + [ Experimental-Result ] + [ CC-Session-Failover ] + * [ Multiple-Services-Credit-Control ] + [ Cost-Information] + [ Low-Balance-Indication ] + [ Remaining-Balance ] + [ Credit-Control-Failure-Handling ] + [ Direct-Debiting-Failure-Handling ] + [ OC-Supported-Features ] + [ OC-OLR ] + * [ Redirect-Host] + [ Redirect-Host-Usage ] + [ Redirect-Max-Cache-Time ] + * [ Proxy-Info ] + * [ Route-Record ] + [ Failed-AVP ] + [ Service-Information ] + * [ AVP ] + +Re-Auth-Request ::= < Diameter Header: 258, REQ, PXY > + < Session-Id > + { Origin-Host } + { Origin-Realm } + { Destination-Realm } + { Destination-Host } + { Auth-Application-Id } + { Re-Auth-Request-Type } + [ User-Name ] + [ Origin-State-Id ] + * [ Proxy-Info ] + * [ Route-Record ] + [ G-S-U-Pool-Identifier ] + [ Service-Identifier ] + [ Rating-Group ] + * [ AVP ] + +Re-Auth-Answer ::= < Diameter Header: 258, PXY > + < Session-Id > + { Result-Code } + { Origin-Host } + { Origin-Realm } + [ User-Name ] + [ Origin-State-Id ] + [ Error-Message ] + [ Error-Reporting-Host ] + [ Failed-AVP ] + * [ Redirect-Host ] + [ Redirect-Host-Usage ] + [ Redirect-Max-Cache-Time ] + * [ Proxy-Info ] + * [ AVP ] + +@define Experimental-Result-Code +DIAMETER_ERROR_FEATURE_UNSUPPORTED 5011 + +@define Result-Code +DIAMETER_END_USER_SERVICE_DENIED 4010 +DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE 4011 +DIAMETER_CREDIT_LIMIT_REACHED 4012 +DIAMETER_AUTHORIZATION_REJECTED 5003 +DIAMETER_USER_UNKNOWN 5030 +DIAMETER_RATING_FAILED 5031 diff --git a/dia/dia_etsi.dia b/dia/dia_etsi.dia index 9dea0ce..2cedb94 100644 --- a/dia/dia_etsi.dia +++ b/dia/dia_etsi.dia @@ -18,13 +18,65 @@ @inherits dia_ietf +@avp_vendor_id 10415 +Media-Type +AF-Application-Identifier +3GPP-User-Location-Info +QoS-Information +ToS-Traffic-Class +Event-Trigger +Precedence +Reporting-Level +Rule-Failure-Code +Flow-Description +Flow-Number +Flows +Flow-Status +Max-Requested-Bandwidth-DL +Max-Requested-Bandwidth-UL +Media-Component-Number + +@avp_vendor_id 11502 +Traffic-Descriptor-UL +Traffic-Descriptor-DL +Maximum-Burst-Size +Committed-Data-Rate +Committed-Burst-Size +Excess-Burst-Size + @avp_types +;; Inherited from dia_3gpp +Media-Type 520 Enumerated MV +AF-Application-Identifier 504 OctetString MV +3GPP-User-Location-Info 22 OctetString V +QoS-Information 1016 Grouped MV +ToS-Traffic-Class 1019 OctetString MV +Event-Trigger 1006 Enumerated MV +Precedence 1010 Unsigned32 MV +Reporting-Level 1011 Enumerated MV +Rule-Failure-Code 1031 Enumerated MV +Flow-Description 507 IPFilterRule MV +Flow-Number 509 Unsigned32 MV +Flows 510 Grouped MV +Flow-Status 511 Enumerated MV +Max-Requested-Bandwidth-DL 515 Unsigned32 MV +Max-Requested-Bandwidth-UL 516 Unsigned32 MV +Media-Component-Number 518 Unsigned32 MV + +;; Inherited from dia_itu +Traffic-Descriptor-UL 1012 Grouped V +Traffic-Descriptor-DL 1013 Grouped V +Maximum-Burst-Size 1014 Unsigned32 V +Committed-Data-Rate 1015 Unsigned32 V +Committed-Burst-Size 1016 Unsigned32 V +Excess-Burst-Size 1017 Unsigned32 V + ;; ES 283 034 Globally-Unique-Address 300 Grouped MV Address-Realm 301 OctetString MV Logical-Access-ID 302 OctetString V Initial-Gate-Setting-Description 303 Grouped V -; QoS-Profile-Description 304 Grouped V ; Inherits from dia_3gpp +QoS-Profile-Description 304 Grouped V IP-Connectivity-Status 305 Enumerated V Access-Network-Type 306 Grouped V Aggregation-Network-Type 307 Enumerated V @@ -44,7 +96,7 @@ Requested-Information 353 Enumerated Event-Type 354 Enumerated V Civic-Location 355 OctetString V Geospatial-Location 356 OctetString V -; Global-Access-Id 357 Grouped V ; Inherits from dia_3gpp +Global-Access-Id 357 Grouped V Fixed-Access-ID 358 Grouped V Relay-Agent 359 OctetString V Operator-Specific-GI 360 OctetString V @@ -60,8 +112,7 @@ Session-Bundle-Id 400 Unsigned32 Data-Operation-Indicator 420 Enumerated V ;; TS 183 020 -; Inherits from dia_3gpp -; Privacy-Indicator 440 Grouped V +Privacy-Indicator 440 Grouped V ;; TS 183 017 Binding-Information 450 Grouped V @@ -102,16 +153,15 @@ Media-Authorization-Context-Id 462 UTF8String ; ETSI-Digest-Response-Auth 521 UTF8String V ;; TS 183 060 -; Inherits from dia_3gpp -; Policy-Rule-Install 550 Grouped MV -; Policy-Rule-Remove 551 Grouped MV -; Policy-Rule-Definition 552 Grouped MV -; Policy-Rule-Base-Name 553 UTF8String MV -; Policy-Rule-Name 554 OctetString MV -; Policy-Rule-Report 555 Grouped MV -; Policy-Rule-Status 556 Enumerated MV -; Traffic-Flow 557 Grouped MV -; Policy-Update-Request 558 Grouped MV +Policy-Rule-Install 550 Grouped MV +Policy-Rule-Remove 551 Grouped MV +Policy-Rule-Definition 552 Grouped MV +Policy-Rule-Base-Name 553 UTF8String MV +Policy-Rule-Name 554 OctetString MV +Policy-Rule-Report 555 Grouped MV +Policy-Rule-Status 556 Enumerated MV +Traffic-Flow 557 Grouped MV +Policy-Update-Request 558 Grouped MV ;; TS 183 059-1 CNGCF-Address 600 Grouped V @@ -136,6 +186,33 @@ Total-Bandwidth-DL 658 Unsigned32 @grouped +;; Inherited from 3GPP +QoS-Information ::= < AVP Header: 1016 > + [ Max-Requested-Bandwidth-UL ] + [ Max-Requested-Bandwidth-DL ] + [ Traffic-Descriptor-UL ] + [ Traffic-Descriptor-DL ] + [ ToS-Traffic-Class ] + +Flows ::= + { Media-Component-Number } + * [ Flow-Number ] + +;; Inherited from ITU-T +Traffic-Descriptor-UL ::= + [ Maximum-Burst-Size ] + [ Committed-Data-Rate ] + [ Committed-Burst-Size ] + [ Excess-Burst-Size ] + +Traffic-Descriptor-DL ::= + [ Maximum-Burst-Size ] + [ Committed-Data-Rate ] + [ Committed-Burst-Size ] + [ Excess-Burst-Size ] + + +;; ETSI Globally-Unique-Address ::= [ Framed-IP-Address ] [ Framed-IPv6-Prefix ] @@ -146,13 +223,13 @@ Initial-Gate-Setting-Description ::= [ Maximum-Allowed-Bandwidth-UL ] [ Maximum-Allowed-Bandwidth-DL ] -; QoS-Profile-Description ::= -; * [ Application-Class-ID ] -; * [ Media-Type ] -; [ Reservation-Priority ] -; [ Maximum-Allowed-Bandwidth-UL ] -; [ Maximum-Allowed-Bandwidth-DL ] -; [ Transport-Class ] +QoS-Profile-Description ::= + * [ Application-Class-ID ] + * [ Media-Type ] ; Inherited from dia_3gpp + [ Reservation-Priority ] + [ Maximum-Allowed-Bandwidth-UL ] + [ Maximum-Allowed-Bandwidth-DL ] + [ Transport-Class ] Access-Network-Type ::= { NAS-Port-Type } @@ -166,10 +243,10 @@ ETSI-Location-Information ::= [ PIDF-Location-Object ] * [ AVP ] -; Global-Access-Id ::= -; [ Fixed-Access-ID ] -; [ 3GPP-User-Location-Info ] -; * [ AVP ] +Global-Access-Id ::= + [ Fixed-Access-ID ] + [ 3GPP-User-Location-Info ] ; Inherited from dia_3gpp + * [ AVP ] Fixed-Access-ID ::= { Relay-Agent } @@ -177,9 +254,9 @@ Fixed-Access-ID ::= [ Physical-Access-ID ] * [ AVP ] -; Privacy-Indicator ::= -; * { Requested-Information } -; * [ AF-Application-Identifier ] +Privacy-Indicator ::= + * { Requested-Information } + * [ AF-Application-Identifier ] ; Inherited from dia_3gpp Binding-Information ::= { Binding-Input-List } @@ -201,65 +278,101 @@ V4-Transport-Address ::= { Framed-IP-Address } { Port-Number } -; Policy-Rule-Install ::= -; * [ Policy-Rule-Definition ] -; * [ Policy-Rule-Name ] -; * [ Policy-Rule-Base-Name ] -; * [ AVP ] - -; Policy-Rule-Remove ::= -; * [ Policy-Rule-Name ] -; * [ Policy-Rule-Base-Name ] -; * [ AVP ] - -; Policy-Rule-Definition ::= -; { Policy-Rule-Name } -; [ Service-Identifier ] -; [ Rating-Group ] -; [ User-Name ] -; [ Logical-Access-Id ] -; [ Framed-IP-Address ] -; [ Address-Realm ] -; [ Called-Station-ID ] -; [ Physical-Access-Id ] -; [ Flow-Description ] -; [ Flow-Status ] -; [ QoS-Information ] -; [ Reporting-Level ] -; [ Precedence ] -; * [ Flows ] -; * [ AVP ] - -; Policy-Rule-Report ::= -; * [ Policy-Rule-Name ] -; * [ Policy-Rule-Base-Name ] -; [ Policy-Rule-Status ] -; [ Rule-Failure-Code ] -; * [ AVP ] - -; Traffic-Flow ::= -; [ Flow-Description ] -; [ Flow-Status ] -; [ QoS-Information ] -; [ User-Name ] -; [ Called-Station-ID ] -; [ Framed-IP-Address ] -; [ Framed-Ipv6-Prefix ] -; [ Address-Realm ] -; [ Logical-Access-Id ] -; [ Physical-Access-ID ] - -; Policy-Update-Request ::= -; * [ Policy-Rule-Name ] -; * [ Policy-Rule-Base-Name ] -; [ Policy-Rule-Status ] -; [ QoS-Information ] -; * [ AVP ] +Policy-Rule-Install ::= + * [ Policy-Rule-Definition ] + * [ Policy-Rule-Name ] + * [ Policy-Rule-Base-Name ] + * [ AVP ] + +Policy-Rule-Remove ::= + * [ Policy-Rule-Name ] + * [ Policy-Rule-Base-Name ] + * [ AVP ] + +Policy-Rule-Definition ::= + { Policy-Rule-Name } + [ Service-Identifier ] + [ Rating-Group ] + [ User-Name ] + [ Logical-Access-ID ] + [ Framed-IP-Address ] + [ Address-Realm ] + [ Called-Station-Id ] + [ Physical-Access-ID ] + [ Flow-Description ] + [ Flow-Status ] + [ QoS-Information ] + [ Reporting-Level ] + [ Precedence ] + * [ Flows ] + * [ AVP ] + +Policy-Rule-Report ::= + * [ Policy-Rule-Name ] + * [ Policy-Rule-Base-Name ] + [ Policy-Rule-Status ] + [ Rule-Failure-Code ] + * [ AVP ] + +Traffic-Flow ::= + [ Flow-Description ] + [ Flow-Status ] + [ QoS-Information ] + [ User-Name ] + [ Called-Station-Id ] + [ Framed-IP-Address ] + [ Framed-IPv6-Prefix ] + [ Address-Realm ] + [ Logical-Access-ID ] + [ Physical-Access-ID ] + +Policy-Update-Request ::= + * [ Policy-Rule-Name ] + * [ Policy-Rule-Base-Name ] + [ Policy-Rule-Status ] + [ QoS-Information ] + * [ AVP ] CNGCF-Address ::= [ TFTP-Server ] [ ACS-Server ] +;; Inherited from 3GPP +@enum Media-Type +AUDIO 0 +VIDEO 1 +DATA 2 +APPLICATION 3 +CONTROL 4 +TEXT 5 +MESSAGE 6 +OTHER 0xFFFFFFFF + +@enum Event-Trigger +LOSS_OF_BEARER 5 +RECOVERY_OF_BEARER 6 +RESOURCES_MODIFICATION 101 +ANY_EVENT 11 +NO_EVENT 12 + +@enum Reporting-Level +SERVICE_IDENTIFIER_LEVEL 0 +RATING_GROUP_LEVEL 1 + +@enum Rule-Failure-Code +UNKNOWN_RULE_NAME 1 +RATING_GROUP_ERROR 2 +SERVICE_IDENTIFIER_ERROR 3 +GW_RCEF_MALFUNCTION 4 +RESOURCES_LIMITATION 5 +MAX_NR_BEARERS_REACHED 6 + +@enum Flow-Status +ENABLED_UPLINK 0 +ENABLED_DOWNLINK 1 +REMOVED 4 + +;; ETSI @enum IP-Connectivity-Status IP_CONNECTIVITY_ON 0 IP_CONNECTIVITY_LOST 1 diff --git a/dia/dia_etsi_es_283035_e2.dia b/dia/dia_etsi_es_283035_e2.dia index 425a8bc..ff81b0f 100644 --- a/dia/dia_etsi_es_283035_e2.dia +++ b/dia/dia_etsi_es_283035_e2.dia @@ -7,8 +7,9 @@ @inherits diameter_gen_base_rfc6733 @inherits dia_3gpp -AF-Application-Identifier +; AF-Application-Identifier ; also defined in dia_etsi Expiry-Time +Subs-Req-Type @inherits dia_etsi diff --git a/dia/dia_etsi_ts_183060_Re.dia b/dia/dia_etsi_ts_183060_Re.dia index bbfbde5..150e322 100644 --- a/dia/dia_etsi_ts_183060_Re.dia +++ b/dia/dia_etsi_ts_183060_Re.dia @@ -9,6 +9,8 @@ @inherits dia_ietf @inherits dia_itu +PI-Request-Type +PI-Request-Number @inherits dia_etsi diff --git a/dia/dia_itu.dia b/dia/dia_itu.dia index b763595..00149a8 100644 --- a/dia/dia_itu.dia +++ b/dia/dia_itu.dia @@ -101,6 +101,7 @@ DOWNGRADED 2 INITIAL_REQUEST 1 UPDATE_REQUEST 2 TERMINATION_REQUEST 3 +QUERY_REQUEST 4 ; Added for ETSI @enum Removal-Cause SESSION_RELEASED 0