diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2018-11-08 10:37:53 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-08 11:14:32 +0000 |
| commit | fe3010e8823d1105d9441c7652e37b8c6a35fc6d (patch) | |
| tree | 0498320b2afdd99d1f8f6cb9735cc9371880ce76 /diameter | |
| parent | 22023c873d75c491cb850ab8c6f408f24ef2d93c (diff) | |
Diameter: Add AVPs for 3GPP S6c
Change-Id: I8ad0f2d0fa2919b459e65c2241b1e6fa14a9c44a
Reviewed-on: https://code.wireshark.org/review/30540
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'diameter')
| -rw-r--r-- | diameter/TGPP.xml | 129 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 91 |
2 files changed, 130 insertions, 90 deletions
diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml index 12d6175d96..aa4ba3e872 100644 --- a/diameter/TGPP.xml +++ b/diameter/TGPP.xml @@ -1245,6 +1245,135 @@ </avp> </application> <!-- 3GPP S9 --> +<!-- + Note: The AVP codes from 3206 to 3308 are reserved for TS 29.338 + --> + +<application id="16777312" name="3GPP S6c" uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"> + <avp name="SC-Address" code="3300" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="SM-RP-UI" code="3301" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="TFR-Flags" code="3302" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SM-Delivery-Failure-Cause" code="3303" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> + <grouped> + <gavp name="SM-Enumerated-Delivery-Failure-Cause"/> + <gavp name="SM-Diagnostic-Info"/> + </grouped> + </avp> + <avp name="SM-Enumerated-Delivery-Failure-Cause" code="3304" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="MEMORY_CAPACITY_EXCEEDED" code="0"/> + <enum name="EQUIPMENT_PROTOCOL_ERROR" code="1"/> + <enum name="EQUIPMENT_NOT_SM-EQUIPPED" code="2"/> + <enum name="UNKNOWN_SERVICE_CENTRE " code="3"/> + <enum name="SC-CONGESTION" code="4"/> + <enum name="INVALID_SME-ADDRESS" code="5"/> + <enum name="USER_NOT_SC-USER" code="6"/> + </avp> + <avp name="SM-Diagnostic-Info" code="3305" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="SM-Delivery-Timer" code="3306" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SM-Delivery-Start-Time" code="3307" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Time"/> + </avp> + <avp name="SM-RP-MTI" code="3308" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="SM_DELIVER" code="0"/> + <enum name="SM_STATUS_REPORT" code="1"/> + </avp> + <avp name="SM-RP-SMEA" code="3309" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="SRR-Flags" code="3310" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SM-Delivery-Not-Intended" code="3311" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="ONLY_IMSI_REQUESTED" code="0"/> + <enum name="ONLY_MCC_MNC_REQUESTED" code="1"/> + </avp> + <avp name="MWD-Status" code="3312" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="MME-Absent-User-Diagnostic-SM" code="3313" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="MSC-Absent-User-Diagnostic-SM" code="3314" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SGSN-Absent-User-Diagnostic-SM" code="3315" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SM-Delivery-Outcome" code="3316" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> + <grouped> + <gavp name="MME-SM-Delivery-Outcome"/> + <gavp name="MSC-SM-Delivery-Outcome"/> + <gavp name="SGSN-SM-Delivery-Outcome"/> + <gavp name="IP-SM-GW-SM-Delivery-Outcome"/> + </grouped> + </avp> + <avp name="MME-SM-Delivery-Outcome" code="3317" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> + <grouped> + <gavp name="SM-Delivery-Cause"/> + <gavp name="Absent-User-Diagnostic-SM"/> + </grouped> + </avp> + <avp name="MSC-SM-Delivery-Outcome" code="3318" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> + <grouped> + <gavp name="SM-Delivery-Cause"/> + <gavp name="Absent-User-Diagnostic-SM"/> + </grouped> + </avp> + <avp name="SGSN-SM-Delivery-Outcome" code="3319" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> + <grouped> + <gavp name="SM-Delivery-Cause"/> + <gavp name="Absent-User-Diagnostic-SM"/> + </grouped> + </avp> + <avp name="IP-SM-GW-SM-Delivery-Outcome" code="3320" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> + <grouped> + <gavp name="SM-Delivery-Cause"/> + <gavp name="Absent-User-Diagnostic-SM"/> + </grouped> + </avp> + <avp name="SM-Delivery-Cause" code="3321" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="SM-Delivery-Cause" code="0"/> + <enum name="ABSENT_USER" code="1"/> + <enum name="SUCCESSFUL_TRANSFER" code="2"/> + </avp> + <avp name="Absent-User-Diagnostic-SM" code="3322" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="RDR-Flags" code="3323" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + + <avp name="Maximum-UE-Availability-Time" code="3329" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Time"/> + </avp> + <avp name="Maximum-Retransmission-Time" code="3330" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Time"/> + </avp> + <avp name="Requested-Retransmission-Time" code="3331" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> + <type type-name="Time"/> + </avp> + <avp name="SMS-GMSC-Address" code="3332" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="SMS-GMSC-Alert-Event" code="3333" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> +</application> <!-- 3GPP S6c --> + <application id="16777335" name="3GPP MB2c" uri="http://www.3gpp.org/DynaReport/29468.htm"> <command name="GCS-Action" code="8388662" vendor-id="TGPP"/> diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index d3f317de04..c6893afce8 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -7983,95 +7983,6 @@ <!-- Note: The AVP codes from 3206 to 3308 are reserved for TS 29.338 --> - <avp name="SM-RP-MTI" code="3308" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Enumerated"/> - <enum name="SM_DELIVER" code="0"/> - <enum name="SM_STATUS_REPORT" code="1"/> - </avp> - <avp name="SM-RP-SMEA" code="3309" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="OctetString"/> - </avp> - <avp name="SRR-Flags" code="3310" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="SM-Delivery-Not-Intended" code="3311" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Enumerated"/> - <enum name="ONLY_IMSI_REQUESTED" code="0"/> - <enum name="ONLY_MCC_MNC_REQUESTED" code="1"/> - </avp> - <avp name="MWD-Status" code="3312" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="MME-Absent-User-Diagnostic-SM" code="3313" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="MSC-Absent-User-Diagnostic-SM" code="3314" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="SGSN-Absent-User-Diagnostic-SM" code="3315" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="SM-Delivery-Outcome" code="3316" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> - <grouped> - <gavp name="MME-SM-Delivery-Outcome"/> - <gavp name="MSC-SM-Delivery-Outcome"/> - <gavp name="SGSN-SM-Delivery-Outcome"/> - <gavp name="IP-SM-GW-SM-Delivery-Outcome"/> - </grouped> - </avp> - <avp name="MME-SM-Delivery-Outcome" code="3317" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> - <grouped> - <gavp name="SM-Delivery-Cause"/> - <gavp name="Absent-User-Diagnostic-SM"/> - </grouped> - </avp> - <avp name="MSC-SM-Delivery-Outcome" code="3318" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> - <grouped> - <gavp name="SM-Delivery-Cause"/> - <gavp name="Absent-User-Diagnostic-SM"/> - </grouped> - </avp> - <avp name="SGSN-SM-Delivery-Outcome" code="3319" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> - <grouped> - <gavp name="SM-Delivery-Cause"/> - <gavp name="Absent-User-Diagnostic-SM"/> - </grouped> - </avp> - <avp name="IP-SM-GW-SM-Delivery-Outcome" code="3320" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP"> - <grouped> - <gavp name="SM-Delivery-Cause"/> - <gavp name="Absent-User-Diagnostic-SM"/> - </grouped> - </avp> - <avp name="SM-Delivery-Cause" code="3321" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Enumerated"/> - <enum name="SM-Delivery-Cause" code="0"/> - <enum name="ABSENT_USER" code="1"/> - <enum name="SUCCESSFUL_TRANSFER" code="2"/> - </avp> - <avp name="Absent-User-Diagnostic-SM" code="3322" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="RDR-Flags" code="3323" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - - - <avp name="Maximum-UE-Availability-Time" code="3329" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Time"/> - </avp> - <avp name="Maximum-Retransmission-Time" code="3330" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Time"/> - </avp> - <avp name="Requested-Retransmission-Time" code="3331" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> - <type type-name="Time"/> - </avp> - <avp name="SMS-GMSC-Address" code="3332" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> - <type type-name="OctetString"/> - </avp> - <avp name="SMS-GMSC-Alert-Event" code="3333" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> <avp name="Reason-Header" code="3401" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> @@ -8611,7 +8522,7 @@ <application id="16777309" name="3GPP Tsp" uri="http://www.3gpp.org/ftp/Specs/html-info/29368.htm"/> <application id="16777310" name="3GPP S6m" uri="http://www.3gpp.org/ftp/Specs/html-info/29336.htm"/> <application id="16777311" name="3GPP T4" uri="http://www.3gpp.org/ftp/Specs/html-info/29337.htm"/> - <application id="16777312" name="3GPP S6c" uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"/> + <!-- application 16777312 3GPP S6c"is defined in TGPP.xml --> <application id="16777313" name="3GPP SGd" uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"/> <application id="16777314" name="Intrado-SLg" uri="none"/> <!-- application 16777315 is defined in Ericsson.xml --> |