diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | diameter/TGPP2.xml | 377 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 248 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 |
4 files changed, 382 insertions, 245 deletions
diff --git a/Makefile.am b/Makefile.am index 455b7c8e1b..c18848f3ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,7 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \ diameter/sunping.xml \ diameter/TGPPGmb.xml \ diameter/TGPPRx.xml \ + diameter/TGPP2.xml \ diameter/TGPPS9.xml \ diameter/TGPPSh.xml \ diameter/Vodafone.xml \ diff --git a/diameter/TGPP2.xml b/diameter/TGPP2.xml new file mode 100644 index 0000000000..ce6d31c703 --- /dev/null +++ b/diameter/TGPP2.xml @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application id="16777237" name="3GPP2 Ty" uri="http://www.3gpp2.org/public_html/specs/x.s0013-014-0_v1.0_080224.pdf"> + <!--- TGPP2 AVPs X.S0013-013-0 (Tx): + http://www.3gpp2.org/Public_html/specs/X.S0013-013-0_v1.0_080224.pdf + --> + <avp name="Abort-Cause" code="500" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="FLOW_RELEASED" code="0"/> + <enum name="INSUFFICIENT_SERVER_RESOURCES" code="1"/> + <enum name="INSUFFICIENT_BEARER_RESOURCES" code="2"/> + </avp> + <avp name="Access-Network-Charging-Address" code="501" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="IPAddress"/> + </avp> + <avp name="Access-Network-Charging-Identifier" code="502" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Access-Network-Charging-Identifier-Value"/> + <gavp name="Flows"/> + </grouped> + </avp> + <avp name="Access-Network-Charging-Identifier-Value" code="503" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="AF-Application-Identifier" code="504" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="AF-Charging-Identifier" code="505" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Flow-Description" code="507" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="IPFilterRule"/> + </avp> + <avp name="Flow-Number" code="509" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Flow-Status" code="511" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="ENABLED-UPLINK" code="0"/> + <enum name="ENABLED-DOWNLINK" code="1"/> + <enum name="ENABLED" code="2"/> + <enum name="DISABLED" code="3"/> + <enum name="REMOVED" code="4"/> + </avp> + <avp name="Flow-Usage" code="512" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="NO_INFORMATION" code="0"/> + <enum name="RTCP" code="1"/> + <enum name="AF_SIGNALING" code="2"/> + </avp> + <avp name="Specific-Action" code="513" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="SERVICE_INFORMATION_REQUEST" code="0"/> + <enum name="CHARGING_CORRELATION_EXCHANGE" code="1"/> + <enum name="INDICATION_OF_LOSS_OF_FLOW" code="2"/> + <enum name="INDICATION_OF_RECOVERY_OF_FLOW" code="3"/> + <enum name="INDICATION_OF_RELEASE_OF_FLOW" code="4"/> + <enum name="INDICATION_OF_ESTABLISHMENT_OF_FLOW" code="5"/> + </avp> + <avp name="Max-Requested-Bandwidth-DL" code="515" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Max-Requested-Bandwidth-UL" code="516" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Media-Component-Description" code="517" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Media-Component-Number"/> + <gavp name="Media-Sub-Component"/> + <gavp name="AF-Application-Identifier"/> + <gavp name="Media-Type"/> + <gavp name="Max-Requested-Bandwidth-UL"/> + <gavp name="Max-Requested-Bandwidth-DL"/> + <gavp name="Flow-Status"/> + <gavp name="RS-Bandwidth"/> + <gavp name="RR-Bandwidth"/> + <gavp name="Codec-Data"/> + </grouped> + </avp> + <avp name="Media-Component-Number" code="518" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Media-Sub-Component" code="519" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Flow-Number"/> + <gavp name="Flow-Description"/> + <gavp name="Flow-Status"/> + <gavp name="Flow-Usage"/> + <gavp name="Max-Requested-Bandwidth-UL"/> + <gavp name="Max-Requested-Bandwidth-DL"/> + </grouped> + </avp> + <avp name="Media-Type" code="520" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="AUDIO" code="0"/> + <enum name="VIDEO" code="1"/> + <enum name="DATA" code="2"/> + <enum name="APPLICATION" code="3"/> + <enum name="CONTROL" code="4"/> + <enum name="TEXT" code="5"/> + <enum name="MESSAGE" code="6"/> + <enum name="OTHER" code="0xFFFFFFFF"/> + </avp> + <avp name="RR-Bandwidth" code="521" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="RS-Bandwidth" code="522" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SIP-Forking-Indication" code="523" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="SINGLE_DIALOGUE" code="0"/> + <enum name="SEVERAL_DIALOGUES" code="1"/> + </avp> + <avp name="Codec-Data" code="524" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Access-Network-Physical-Access-ID-Realm" code="898" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Access-Network-Physical-Access-ID-Value" code="899" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Access-Network-Physical-Access-ID" code="900" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Access-Network-Physical-Access-ID-Value"/> + <gavp name="Access-Network-Physical-Access-ID-Realm"/> + </grouped> + </avp> + + + <!--- TGPP2 AVPs X.S0013-014-0 (Ty): + http://www.3gpp2.org/Public_html/specs/X.S0013-014-0_v1.0_080224.pdf + --> + <avp name="Flow-Operation" code="800" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="TERMINATION" code="0"/> + <enum name="ESTABLISHMENT" code="1"/> + <enum name="MODIFICATION" code="2"/> + </avp> + <avp name="Charging-Rule-Install" code="801" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Charging-Rule-Definition"/> + <gavp name="Charging-Rule-Name"/> + <gavp name="Charging-Rule-Base-Name"/> + </grouped> + </avp> + <avp name="Charging-Rule-Definition" code="802" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Charging-Rule-Name"/> + <gavp name="Service-Identifier"/> + <gavp name="Rating-Group"/> + <gavp name="Flow-Identifier"/> + <gavp name="Flow-Description"/> + <gavp name="Flow-Status"/> + <gavp name="QoS-Information"/> + <gavp name="Reporting-Level"/> + <gavp name="Online"/> + <gavp name="Offline"/> + <gavp name="Metering-Method"/> + <gavp name="Precedence"/> + <gavp name="AF-Charging-Identifier"/> + <gavp name="Flows"/> + </grouped> + </avp> + <avp name="Event-Trigger" code="803" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="PCF_CHANGE" code="0"/> + <enum name="QOS_CHANGE" code="1"/> + <enum name="RAT_CHANGE" code="2"/> + <enum name="TFT_CHANGE" code="3"/> + <enum name="PLMN_CHANGE" code="4"/> + <enum name="LOSS_OF_FLOW" code="5"/> + <enum name="RECOVERY_OF_FLOW" code="6"/> + <enum name="IP-CAN_CHANGE" code="7"/> + <enum name="PCC_RULE_FAILURE" code="8"/> + <enum name="ACCESS_NETWORK_PHYSICAL_ACCESS_ID_CHANGE" code="9"/> + </avp> + <avp name="QoS-Information" code="804" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="QoS-Class-Identifier"/> + <gavp name="Max-Requested-Bandwidth-UL"/> + <gavp name="Max-Requested-Bandwidth-DL"/> + <gavp name="Guaranteed-Bitrate-UL"/> + <gavp name="Guaranteed-Bitrate-DL"/> + </grouped> + </avp> + <avp name="Charging-Rule-Report" code="805" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Charging-Rule-Name"/> + <gavp name="Charging-Rule-Base-Name"/> + <gavp name="PCC-Rule-Status"/> + <gavp name="Rule-Reason-Code"/> + </grouped> + </avp> + <avp name="AGW-IP-Address" code="806" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="IPAddress"/> + </avp> + <avp name="AGW-IPv6-Address" code="807" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="IPAddress"/> + </avp> + <avp name="RAT-Type" code="808" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="CDMA2000-1X" code="0"/> + <enum name="HRPD" code="1"/> + <enum name="WLAN" code="2"/> + <enum name="UMB" code="3"/> + </avp> + <avp name="Flow-Info" code="809" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Flow-Identifier"/> + <gavp name="Flow-Description-Info"/> + <gavp name="Requested-QoS"/> + <gavp name="Granted-QoS"/> + <gavp name="Flow-Status"/> + </grouped> + </avp> + <avp name="Flow-Identifier" code="810" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="UTF8String"/> + </avp> + <avp name="Granted-QoS" code="811" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="QoS-Class-Identifier"/> + <gavp name="Guaranteed-Bitrate-UL"/> + <gavp name="Guaranteed-Bitrate-DL"/> + </grouped> + </avp> + <avp name="Requested-QoS" code="812" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="QoS-Class-Identifier"/> + <gavp name="Guaranteed-Bitrate-UL"/> + <gavp name="Guaranteed-Bitrate-DL"/> + </grouped> + </avp> + <avp name="Flow-Description-Info" code="813" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Flow-Description"/> + <gavp name="Precedence"/> + </grouped> + </avp> + <avp name="Rule-Reason-Code" code="814" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="UNKNOWN_FLOW_IDENTIFIER" code="0"/> + <enum name="UNKNOWN_RULE_NAME" code="0"/> + <enum name="RATING_GROUP_ERROR" code="0"/> + <enum name="SERVICE_IDENTIFIER_ERROR" code="0"/> + <enum name="AGW_MALFUNCTION" code="0"/> + <enum name="RESOURCES_LIMITATION" code="0"/> + </avp> + <avp name="AGW-MCC-MNC" code="815" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="UTF8String"/> + </avp> + <avp name="Bearer-Usage" code="1000" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="GENERAL" code="0"/> + <enum name="IMS_SIGNALLING" code="1"/> + </avp> + <avp name="Charging-Rule-Install" code="1001" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Charging-Rule-Definition"/> + <gavp name="Charging-Rule-Name"/> + <gavp name="Charging-Rule-Base-Name"/> + </grouped> + </avp> + <avp name="Charging-Rule-Remove" code="1002" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Charging-Rule-Name"/> + <gavp name="Charging-Rule-Base-Name"/> + </grouped> + </avp> + <avp name="Charging-Rule-Definition" code="1003" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Charging-Rule-Name"/> + <gavp name="Service-Identifier"/> + <gavp name="Rating-Group"/> + <gavp name="Flow-Description"/> + <gavp name="Reporting-Level"/> + <gavp name="Online"/> + <gavp name="Offline"/> + <gavp name="Metering-Method"/> + <gavp name="Precedence"/> + <gavp name="AF-Charging-Identifier"/> + <gavp name="Flows"/> + </grouped> + </avp> + <avp name="Charging-Rule-Base-Name" code="1004" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Charging-Rule-Name" code="1005" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Event-Trigger" code="1006" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="SGSN_CHANGE" code="0"/> + <enum name="QOS_CHANGE" code="1"/> + <enum name="RAT_CHANGE" code="2"/> + <enum name="TFT_CHANGE" code="3"/> + </avp> + <avp name="Metering-Method" code="1007" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="DURATION" code="0"/> + <enum name="VOLUME" code="1"/> + <enum name="DURATION_VOLUME" code="2"/> + </avp> + <avp name="Offline" code="1008" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="DISABLE_OFFLINE" code="0"/> + <enum name="ENABLE_OFFLINE" code="1"/> + </avp> + <avp name="Online" code="1009" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="DISABLE_ONLINE" code="0"/> + <enum name="ENABLE_ONLINE" code="1"/> + </avp> + <avp name="Precedence" code="1010" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Primary-CCF-Address" code="1011" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="DiameterURI"/> + </avp> + <avp name="Primary-OCS-Address" code="1012" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="DiameterURI"/> + </avp> + <avp name="Reporting-Level" code="1014" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="CHARGING_RULE_LEVEL" code="0"/> + <enum name="RATING_GROUP_LEVEL" code="1"/> + </avp> + <avp name="Secondary-CCF-Address" code="1015" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="DiameterURI"/> + </avp> + <avp name="Secondary-OCS-Address" code="1016" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="DiameterURI"/> + </avp> + <avp name="TFT-Filter" code="1017" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="IPFilterRule"/> + </avp> + <avp name="TFT-Packet-Filter-Information" code="1018" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Precedence"/> + <gavp name="TFT-Filter"/> + <gavp name="ToS-Traffic-Class"/> + </grouped> + </avp> + <avp name="ToS-Traffic-Class" code="1019" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="OctetString"/> + </avp> + <avp name="Access-Network-Charging-Identifier-Ty" code="1022" vendor-bit="must" vendor-id="TGPP2"> + <grouped> + <gavp name="Access-Network-Charging-Identifier-Value"/> + <gavp name="Charging-Rule-Base-Name"/> + <gavp name="Charging-Rule-Name"/> + </grouped> + </avp> + <avp name="Guaranteed-Bitrate-DL" code="1025" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Guaranteed-Bitrate-UL" code="1026" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Unsigned32"/> + </avp> + <avp name="QoS-Class-Identifier AVP" code="1028 vendor-bit="must" vendor-id="TGPP2"> + <type type-name="Enumerated"/> + <enum name="Conversational1" code="0"/> + <enum name="Conversational2" code="1"/> + <enum name="Streaming1" code="2"/> + <enum name="Streaming2" code="3"/> + <enum name="Interactive1" code="4"/> + <enum name="Interactive2" code="5"/> + <enum name="Interactive3" code="6"/> + <enum name="Interactive4" code="7"/> + <enum name="Background" code="8"/> + </avp> + <avp name="3GPP2-BSID" code="9010" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2"> + <type type-name="UTF8String"/> + </avp> +</application> + diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index 5df95e3665..8c81927fff 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -17,6 +17,7 @@ <!ENTITY TGPPS9 SYSTEM "TGPPS9.xml"> <!ENTITY TGPPSh SYSTEM "TGPPSh.xml"> <!ENTITY TGPPRx SYSTEM "TGPPRx.xml"> + <!ENTITY TGPP2 SYSTEM "TGPP2.xml"> <!ENTITY sip SYSTEM "sip.xml"> <!ENTITY gqpolicy SYSTEM "gqpolicy.xml"> <!ENTITY etsie2e4 SYSTEM "etsie2e4.xml"> @@ -6627,250 +6628,6 @@ <enum name="UNIDENTIFIED_SUBSCRIBER" code="5"/> </avp> - <!--- TGPP2 AVP's X.S0013-014-0 - http://www.3gcn.org/TGPP2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S0013-014%20v0.3.0%20SBBC%20Ty%20Stage-3.doc - --> - <avp name="Flow-Operation" code="800" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="TERMINATION" code="0"/> - <enum name="ESTABLISHMENT" code="1"/> - <enum name="MODIFICATION" code="2"/> - </avp> - <avp name="Charging-Rule-Install" code="801" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Charging-Rule-Definition"/> - <gavp name="Charging-Rule-Name"/> - <gavp name="Charging-Rule-Base-Name"/> - </grouped> - </avp> - <avp name="Charging-Rule-Definition" code="802" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Charging-Rule-Name"/> - <gavp name="Service-Identifier"/> - <gavp name="Rating-Group"/> - <gavp name="Flow-Identifier"/> - <gavp name="Flow-Description"/> - <gavp name="Flow-Status"/> - <gavp name="QoS-Information"/> - <gavp name="Reporting-Level"/> - <gavp name="Online"/> - <gavp name="Offline"/> - <gavp name="Metering-Method"/> - <gavp name="Precedence"/> - <gavp name="AF-Charging-Identifier"/> - <gavp name="Flows"/> - </grouped> - </avp> - <avp name="Event-Trigger" code="803" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="PCF_CHANGE" code="0"/> - <enum name="QOS_CHANGE" code="1"/> - <enum name="RAT_CHANGE" code="2"/> - <enum name="TFT_CHANGE" code="3"/> - <enum name="PLMN_CHANGE" code="4"/> - <enum name="LOSS_OF_FLOW" code="5"/> - <enum name="RECOVERY_OF_FLOW" code="6"/> - <enum name="IP-CAN_CHANGE" code="7"/> - <enum name="PCC_RULE_FAILURE" code="8"/> - <enum name="ACCESS_NETWORK_PHYSICAL_ACCESS_ID_CHANGE" code="9"/> - </avp> - <avp name="QoS-Information" code="804" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="QoS-Class-Identifier"/> - <gavp name="Max-Requested-Bandwidth-UL"/> - <gavp name="Max-Requested-Bandwidth-DL"/> - <gavp name="Guaranteed-Bitrate-UL"/> - <gavp name="Guaranteed-Bitrate-DL"/> - </grouped> - </avp> - <avp name="Charging-Rule-Report" code="805" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Charging-Rule-Name"/> - <gavp name="Charging-Rule-Base-Name"/> - <gavp name="PCC-Rule-Status"/> - <gavp name="Rule-Reason-Code"/> - </grouped> - </avp> - <avp name="AGW-IP-Address" code="806" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="IPAddress"/> - </avp> - <avp name="AGW-IPv6-Address" code="807" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="IPAddress"/> - </avp> - <avp name="RAT-Type" code="808" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="CDMA2000-1X" code="0"/> - <enum name="HRPD" code="1"/> - <enum name="WLAN" code="2"/> - <enum name="UMB" code="3"/> - </avp> - <avp name="Flow-Info" code="809" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Flow-Identifier"/> - <gavp name="Flow-Description-Info"/> - <gavp name="Requested-QoS"/> - <gavp name="Granted-QoS"/> - <gavp name="Flow-Status"/> - </grouped> - </avp> - <avp name="Flow-Identifier" code="810" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="UTF8String"/> - </avp> - <avp name="Granted-QoS" code="811" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="QoS-Class-Identifier"/> - <gavp name="Guaranteed-Bitrate-UL"/> - <gavp name="Guaranteed-Bitrate-DL"/> - </grouped> - </avp> - <avp name="Requested-QoS" code="812" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="QoS-Class-Identifier"/> - <gavp name="Guaranteed-Bitrate-UL"/> - <gavp name="Guaranteed-Bitrate-DL"/> - </grouped> - </avp> - <avp name="Flow-Description-Info" code="813" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Flow-Description"/> - <gavp name="Precedence"/> - </grouped> - </avp> - <avp name="Rule-Reason-Code" code="814" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="UNKNOWN_FLOW_IDENTIFIER" code="0"/> - <enum name="UNKNOWN_RULE_NAME" code="0"/> - <enum name="RATING_GROUP_ERROR" code="0"/> - <enum name="SERVICE_IDENTIFIER_ERROR" code="0"/> - <enum name="AGW_MALFUNCTION" code="0"/> - <enum name="RESOURCES_LIMITATION" code="0"/> - </avp> - <avp name="AGW-MCC-MNC" code="815" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="UTF8String"/> - </avp> - <avp name="Bearer-Usage" code="1000" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="GENERAL" code="0"/> - <enum name="IMS_SIGNALLING" code="1"/> - </avp> - <avp name="Charging-Rule-Install" code="1001" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Charging-Rule-Definition"/> - <gavp name="Charging-Rule-Name"/> - <gavp name="Charging-Rule-Base-Name"/> - </grouped> - </avp> - <avp name="Charging-Rule-Remove" code="1002" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Charging-Rule-Name"/> - <gavp name="Charging-Rule-Base-Name"/> - </grouped> - </avp> - <avp name="Charging-Rule-Definition" code="1003" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Charging-Rule-Name"/> - <gavp name="Service-Identifier"/> - <gavp name="Rating-Group"/> - <gavp name="Flow-Description"/> - <gavp name="Reporting-Level"/> - <gavp name="Online"/> - <gavp name="Offline"/> - <gavp name="Metering-Method"/> - <gavp name="Precedence"/> - <gavp name="AF-Charging-Identifier"/> - <gavp name="Flows"/> - </grouped> - </avp> - <avp name="Charging-Rule-Base-Name" code="1004" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="OctetString"/> - </avp> - <avp name="Charging-Rule-Name" code="1005" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="OctetString"/> - </avp> - <avp name="Event-Trigger" code="1006" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="SGSN_CHANGE" code="0"/> - <enum name="QOS_CHANGE" code="1"/> - <enum name="RAT_CHANGE" code="2"/> - <enum name="TFT_CHANGE" code="3"/> - </avp> - <avp name="Metering-Method" code="1007" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="DURATION" code="0"/> - <enum name="VOLUME" code="1"/> - <enum name="DURATION_VOLUME" code="2"/> - </avp> - <avp name="Offline" code="1008" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="DISABLE_OFFLINE" code="0"/> - <enum name="ENABLE_OFFLINE" code="1"/> - </avp> - <avp name="Online" code="1009" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="DISABLE_ONLINE" code="0"/> - <enum name="ENABLE_ONLINE" code="1"/> - </avp> - <avp name="Precedence" code="1010" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Unsigned32"/> - </avp> - <avp name="Primary-CCF-Address" code="1011" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="DiameterURI"/> - </avp> - <avp name="Primary-OCS-Address" code="1012" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="DiameterURI"/> - </avp> - <avp name="Reporting-Level" code="1014" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="CHARGING_RULE_LEVEL" code="0"/> - <enum name="RATING_GROUP_LEVEL" code="1"/> - </avp> - <avp name="Secondary-CCF-Address" code="1015" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="DiameterURI"/> - </avp> - <avp name="Secondary-OCS-Address" code="1016" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="DiameterURI"/> - </avp> - <avp name="TFT-Filter" code="1017" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="IPFilterRule"/> - </avp> - <avp name="TFT-Packet-Filter-Information" code="1018" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Precedence"/> - <gavp name="TFT-Filter"/> - <gavp name="ToS-Traffic-Class"/> - </grouped> - </avp> - <avp name="ToS-Traffic-Class" code="1019" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="OctetString"/> - </avp> - <avp name="Access-Network-Charging-Identifier-Ty" code="1022" vendor-bit="must" vendor-id="TGPP2"> - <grouped> - <gavp name="Access-Network-Charging-Identifier-Value"/> - <gavp name="Charging-Rule-Base-Name"/> - <gavp name="Charging-Rule-Name"/> - </grouped> - </avp> - <avp name="Guaranteed-Bitrate-DL" code="1025" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Unsigned32"/> - </avp> - <avp name="Guaranteed-Bitrate-UL" code="1026" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Unsigned32"/> - </avp> - <avp name="QoS-Class-Identifier AVP" code="1028 vendor-bit="must" vendor-id="TGPP2"> - <type type-name="Enumerated"/> - <enum name="Conversational1" code="0"/> - <enum name="Conversational2" code="1"/> - <enum name="Streaming1" code="2"/> - <enum name="Streaming2" code="3"/> - <enum name="Interactive1" code="4"/> - <enum name="Interactive2" code="5"/> - <enum name="Interactive3" code="6"/> - <enum name="Interactive4" code="7"/> - <enum name="Background" code="8"/> - </avp> - <avp name="3GPP2-BSID" code="9010" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2"> - <type type-name="UTF8String"/> - </avp> </base> <!--- @@ -6880,6 +6637,7 @@ 16777227 is defined in Ericsson.xml 16777228 is defined in starent.xml 16777234 is defined in Vodafone.xml + 16777237 is defined in TGPP2.xml 16777238 is Cisco.xml 16777304 is defined in SKT.xml 16777317 is defined in NokiaSiemensNetworks.xml @@ -6888,7 +6646,6 @@ <application id="3" name="Diameter Base Accounting" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application> <application id="16777229" name="3GPP RX" uri="http://www.3GPP.org/ftp/Specs/html-info/29229.htm"></application> <application id="16777232" name="Ericsson Charging-CIP" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm"></application> - <application id="16777237" name="3GPP2 Ty" uri="http://www.3gpp2.org/public_html/specs/x.s0013-014-0_v1.0_080224.pdf"></application> <application id="16777250" name="3GPP STa" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application> <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516"></application> <application id="16777252" name="3GPP S13/S13'" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516"></application> @@ -6915,6 +6672,7 @@ &TGPPS9; &TGPPSh; &TGPPRx; + &TGPP2; &sip; &gqpolicy; &etsie2e4; diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 881a02eaee..f01710acd7 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -482,6 +482,7 @@ File "..\..\diameter\Starent.xml" File "..\..\diameter\sunping.xml" File "..\..\diameter\TGPPGmb.xml" File "..\..\diameter\TGPPRx.xml" +File "..\..\diameter\TGPP2.xml" File "..\..\diameter\TGPPS9.xml" File "..\..\diameter\TGPPSh.xml" File "..\..\diameter\VerizonWireless.xml" |