Wireshark-dev: Re: [Wireshark-dev] Sh, Cx/Dx dictionary
From: "Anders Broman" <[email protected]>
Date: Wed, 12 Nov 2008 18:56:22 +0100

Hi,

I’ve checked in the difference, in the future please send a diff file instead if possible, that’s a lot easier to handle.

Regards

Anders

 


Från: [email protected] [mailto:[email protected]] För Bartosz Baranowski
Skickat: den 11 november 2008 17:31
Till: [email protected]
Ämne: [Wireshark-dev] Sh, Cx/Dx dictionary

 

Hi
Sometime ago I had to put some strings into file and .. .well Ive filled gaps in Sh dictionary (along with Cx/Dx parts that are common), possibly it can go into distro, will save some work.

<application id="16777217" name="3GPP Sh" uri="http://webapp.etsi.org/exchangefolder/ts_129329v060600p.pdf">
    <!-- 3GPP TS 29.329 version 6.6.0 Release 6, ETSI TS 129 329 V6.6.0 (2005-09)-->
    <!-- Note: The AVP codes from 709 to799 are reserved for TS 29.329. -->

        <!-- 3GPP Sh Application -->
        <command name="User-Data"                code="306" vendor-id="TGPP"/>
        <command name="Profile-Update"            code="307" vendor-id="TGPP"/>
        <command name="Subscribe-Notifications"        code="308" vendor-id="TGPP"/>
        <command name="Push-Notification"            code="309" vendor-id="TGPP"/>

        <!-- ************************** 3GPP Sh AVPS ********************* -->
        <avp name="User-Identity" code="700" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Public-Identity"/>
                                <gavp name="MSISDN"/>
                        </grouped>
        </avp>
        <avp name="MSISDN" code="701" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="User-Data" code="702" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="Data-Reference" code="703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="RepositoryData" code="0"/>
                        <enum name="IMSPublicIdentity" code="10"/>
                        <enum name="IMSUserState" code="11"/>
                        <enum name="S-CSCFName" code="12"/>
                        <enum name="InitialFilterCriteria" code="13"/>
                        <enum name="LocationInformation" code="14"/>
                        <enum name="UserState" code="15"/>
                        <enum name="ChargingInformation" code="16"/>
                        <enum name="MSISDN" code="17"/>
                        <enum name="PSIActivation" code="18"/>
        </avp>
        <avp name="Service-Indication" code="704" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="Subs-Req-Type" code="705" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="Subscribe" code="0"/>
                        <enum name="Unsubscribe" code="1"/>
        </avp>
        <avp name="Requested-Domain" code="706" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="CS-Domain" code="0"/>
                        <enum name="PS-Domain" code="1"/>
        </avp>
        <avp name="Current-Location" code="707" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="DoNotNeedInitiateActiveLocationRetrieval" code="0"/>
                        <enum name="InitiateActiveLocationRetrieval" code="1"/>
        </avp>
        <avp name="Identity-Set" code="708" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="ALL_IDENTITIES" code="0"/>
                        <enum name="REGISTERED_IDENTITIES" code="1"/>
                        <enum name="IMPLICIT_IDENTITIES" code="2"/>
        </avp>
       
        <avp name="Expiry-Time" code="709" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"><type type-name="Time"/></avp>
        <avp name="Send-Data-Indication" code="710" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"><type type-name="Enumerated"/></avp>
        <avp name="DSAI-Tag" code="711" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
<!--
       
       
        <avp name="DSAI-Tag" code="711" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"><type type-name="OctetString"/></avp>
-->
        <!-- ************************ END 3GPP Sh AVPS ******************* -->

    </application>
      <application id="16777216" name="3GPP Cx/Dx">
          <!-- 3GPP Sh Application -->
        <command name="User-Authorization"                code="300" vendor-id="TGPP"/>
        <command name="Server-Assigment"                code="301" vendor-id="TGPP"/>
        <command name="Location-Info"                    code="302" vendor-id="TGPP"/>
        <command name="Multimedia-Auth"                    code="303" vendor-id="TGPP"/>
        <command name="Registration-Termination"        code="304" vendor-id="TGPP"/>
        <command name="Push-Profile"                    code="305" vendor-id="TGPP"/>
       
        <!-- ************************** 3GPP Cx/Dx AVPS ********************* -->
        <avp name="Visited-Network-Identifier" code="600" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="Public-Identity" code="601" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="UTF8String"/>
        </avp>
        <avp name="Server-Name" code="602" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="UTF8String"/>
        </avp>
        <avp name="Server-Capabilities" code="603" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Mandatory-Capability"/>
                                <gavp name="Optional-Capability"/>
                                <gavp name="Server-Name"/>
                        </grouped>
        </avp>
        <avp name="Mandatory-Capability" code="604" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
        </avp>
        <avp name="Optional-Capability" code="605" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
        </avp>
        <avp name="User-Data" code="606" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="SIP-Number-Auth-Items" code="607" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
        </avp>
        <avp name="SIP-Authentication-Scheme" code="608" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="UTF8String"/>
        </avp>
        <avp name="SIP-Authenticate" code="609" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="SIP-Athorization" code="610" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="SIP-Authentication-Context" code="611" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="SIP-Auth-Data-Item" code="612" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="SIP-Item-Number"/>
                                <gavp name="SIP-Authentication-Scheme"/>
                                <gavp name="SIP-Authenticate"/>
                                <gavp name="SIP-Authorization"/>
                                <gavp name="SIP-Authentication-Context"/>
                                <gavp name="Confidentiality-Key"/>
                                <gavp name="Integrity-Key"/>
                                <gavp name="SIP-Digest-Authenticate"/>
                                <gavp name="Line-Identifier"/>
                        </grouped>
        </avp>   
        <avp name="SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
        </avp>
       
        <avp name="Server-Assignment-Type" code="614" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="NO_ASSIGMENT" code="0"/>
                        <enum name="REGISTRATION" code="1"/>
                        <enum name="RE_REGISTRATION" code="2"/>
                        <enum name="UNREGISTERED_USER" code="3"/>
                        <enum name="TIMEOUT_DEREGISTRATION" code="4"/>
                        <enum name="USER_DEREGISTRATION" code="5"/>
                        <enum name="TIMEOUT_DEREGISTRATION_STORE_SERVER_NAME" code="6"/>
                        <enum name="USER_DEREGISTRATION_STORE_SERVER_NAME" code="7"/>
                        <enum name="ADMINISTRATIVE_DEREGISTRATION" code="8"/>
                        <enum name="AUTHENTICATION_FAILURE" code="9"/>
                        <enum name="AUTHENTICATION_TIMEOUT" code="10"/>
                        <enum name="DEREGISTRATION_TOO_MUCH_DATA" code="11"/>
        </avp>
        <avp name="Deregistration-Reason" code="615" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Reason-Code"/>
                                <gavp name="Reason-Info"/>
                        </grouped>
        </avp>   
        <avp name="Reason-Code" code="616" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="PERMANENT_TERMINATION" code="0"/>
                        <enum name="NEW_SERVER_ASSIGNED" code="1"/>
                        <enum name="SERVER_CHANGE" code="2"/>
                        <enum name="REMOVE_S-CSCF" code="3"/>
        </avp>       
        <avp name="Reason-Info" code="617" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="UTF8String"/>
        </avp>
        <avp name="Charging-Information" code="618" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Primary-Event-Charging-Function-Name"/>
                                <gavp name="Secondary-Event-Charging-Function-Name"/>
                                <gavp name="Primary-Charging-Collection-Function-Name"/>
                                <gavp name="Secondary-Charging-Collection-Function-Name"/>
                        </grouped>
        </avp>   
        <avp name="Primary-Event-Charging-Function-Name" code="619" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="DiameterURI"/>
        </avp>
        <avp name="Secondary-Event-Charging-Function-Name" code="620" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="DiameterURI"/>
        </avp>
        <avp name="Primary-Charging-Collection-Function-Name" code="621" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="DiameterURI"/>
        </avp>
        <avp name="Secondary-Charging-Collection-Function-Name" code="622" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="DiameterURI"/>
        </avp>
        <avp name="User-Authorization-Type" code="623" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="REGISTRATION" code="0"/>
                        <enum name="DE_REGISTRATION" code="1"/>
                        <enum name="REGISTRATION_AND_CAPABILITIES" code="2"/>
        </avp>       
        <avp name="User-Data-Already-Available" code="624" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="PUSER_DATA_NOT_AVAILABLE" code="0"/>
                        <enum name="USER_DATA_ALREADY_AVAILABLE" code="1"/>
        </avp>       
        <avp name="Confidentiality-Key" code="625" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <avp name="Integrity-Key" code="626" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="OctetString"/>
        </avp>
        <!--  627 ??? -->
       
        <avp name="Supported-Features" code="628" mandatory="may" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Vendor-Id"/>
                                <gavp name="Feature-List-ID"/>
                                <gavp name="Feature-List"/>
                        </grouped>
        </avp>
        <avp name="Feature-List-ID" code="629" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
        </avp>
        <avp name="Feature-List" code="630" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
        </avp>
        <avp name="Supported-Applications" code="631" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Auth-Application-Id"/>
                                <gavp name="Acct-Application-Id"/>
                                <gavp name="Vendor-Specific-Application-Id"/>
                        </grouped>
        </avp>
        <avp name="Associated-Identities" code="632" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="User-Name"/>
                        </grouped>
        </avp>
        <avp name="Originating-Request" code="633" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="Unsigned32"/>
                        <enum name="ORIGINATING" code="0"/>
        </avp>       
        <avp name="Wildcarded-PSI" code="634" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="UTF8String"/>
        </avp>
        <avp name="SIP-Digest-Authenticate AVP" code="635" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <grouped>
                                <gavp name="Digest-Realm"/>
                                <gavp name="Digest-Domain"/>
                                <gavp name="Digest-Algorithm"/>
                                <gavp name="Digest-QoP"/>
                                <gavp name="Digest-HA1"/>
                        </grouped>
        </avp>
        <avp name="Wildcarded-IMPU" code="636" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
            <type type-name="UTF8String"/>
        </avp>
      </application>


--
Bartosz Baranowski
JBoss R & D
==================================
Word of criticism meant to improve is always step forward.