osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Extend value_strings to make full use of value_string_ext. 

svn path=/trunk/; revision=34872
This commit is contained in:
Anders Broman 2010-11-14 20:53:15 +00:00
parent a7063f9cc8
commit 84dd318764
3 changed files with 154 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diameter/TGPPGmb.xml
View File

@ -200,7 +200,7 @@
<type type-name="Enumerated"/>
<enum name="START" code="0"/>
<enum name="STOP" code="1"/>
<enum name="UPDATE" code="1"/>
<enum name="UPDATE" code="2"/>
</avp>
<avp name="MBMS-Service-Area" code="903" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
<type type-name="OctetString"/>

91
diameter/dictionary.xml
View File

@ -672,8 +672,9 @@
<enum name="PortMaster" code="3"/>
<enum name="LAT" code="4"/>
<enum name="X25-PAD" code="5"/>
<enum name="X25-T3POS" code="6"/>
<enum name="TCP Clear Quiet (suppresses any NAS-generated connect string)" code="8"/>
<enum name="X25-T3POS" code="6"/>
<enum name="Unassigned" code="7"/>
<enum name="TCP Clear Quiet (suppresses any NAS-generated connect string)" code="8"/>
</avp>
<avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
@ -2898,7 +2899,14 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
<enum name="CHANGE_IN_QOS" code="2"/>
<enum name="CHANGE_IN_LOCATION" code="3"/>
<enum name="CHANGE_IN_RAT" code="4"/>
<enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
<enum name="Undefined" code="5"/>
<enum name="Undefined" code="6"/>
<enum name="Undefined" code="7"/>
<enum name="Undefined" code="8"/>
<enum name="Undefined" code="9"/>
<enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
<enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
<enum name="CHANGEINQOS_DELAY_CLASS" code="12"/>
<enum name="CHANGEINQOS_PEAK_THROUGHPUT" code="13"/>
@ -2912,17 +2920,63 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
<enum name="CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY" code="21"/>
<enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK" code="22"/>
<enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK" code="23"/>
<enum name="CHANGEINLOCATION_MCC" code="30"/>
<enum name="Undefined" code="24"/>
<enum name="Undefined" code="25"/>
<enum name="Undefined" code="26"/>
<enum name="Undefined" code="27"/>
<enum name="Undefined" code="28"/>
<enum name="Undefined" code="29"/>
<enum name="CHANGEINLOCATION_MCC" code="30"/>
<enum name="CHANGEINLOCATION_MNC" code="31"/>
<enum name="CHANGEINLOCATION_RAC" code="32"/>
<enum name="CHANGEINLOCATION_LAC" code="33"/>
<enum name="CHANGEINLOCATION_CellId" code="34"/>
<enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
<enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
<enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
<enum name="Undefined" code="35"/>
<enum name="Undefined" code="36"/>
<enum name="Undefined" code="37"/>
<enum name="Undefined" code="38"/>
<enum name="Undefined" code="39"/>
<enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
<enum name="Undefined" code="41"/>
<enum name="Undefined" code="42"/>
<enum name="Undefined" code="43"/>
<enum name="Undefined" code="44"/>
<enum name="Undefined" code="45"/>
<enum name="Undefined" code="46"/>
<enum name="Undefined" code="47"/>
<enum name="Undefined" code="48"/>
<enum name="Undefined" code="49"/>
<enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
<enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
<enum name="CHANGE_IN_USER_PARTICIPATING_TYPE" code="52"/>
<enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
</avp>
<enum name="Undefined" code="53"/>
<enum name="Undefined" code="54"/>
<enum name="Undefined" code="55"/>
<enum name="Undefined" code="56"/>
<enum name="Undefined" code="57"/>
<enum name="Undefined" code="58"/>
<enum name="Undefined" code="59"/>
<enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
<enum name="Undefined" code="61"/>
<enum name="Undefined" code="62"/>
<enum name="Undefined" code="63"/>
<enum name="Undefined" code="64"/>
<enum name="Undefined" code="65"/>
<enum name="Undefined" code="66"/>
<enum name="Undefined" code="67"/>
<enum name="Undefined" code="68"/>
<enum name="Undefined" code="69"/>
<enum name="CHANGE_IN_USER_CSG_INFORMATION" code="70"/>
</avp>
<avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
@ -3197,7 +3251,7 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
<type type-name="Enumerated"/>
<enum name="2G" code="0"/>
<enum name="3G" code="1"/>
<enum name="2G-AND-3G" code="3"/>
<enum name="2G-AND-3G" code="2"/>
</avp>
<avp name="MBMS-Session-Identity" code="908" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
<type type-name="OctetString"/>
@ -3842,17 +3896,18 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
</avp>
<!-- The Type-Number AVP (AVP code1204) is of type Enumerated and identifies the well-known -->
<!-- media types. The values are taken from OMNA WSP Content Type Codes database -->
<!-- http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.htm -->
<!-- http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.aspx -->
<avp name="Type-Number" code="1204" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
<type type-name="Enumerated"/>
<enum name="text/*" code="1"/>
<enum name="text/html" code="2"/>
<enum name="*/*" code="0"/>
<enum name="text/*" code="1"/>
<enum name="text/html" code="2"/>
<enum name="text/plain" code="3"/>
<enum name="text/x-hdml" code="4"/>
<enum name="text/x-ttml" code="5"/>
<enum name="text/x-vCalendar" code="6"/>
<enum name="text/x-vCard" code="7"/>
<enum name="text/vnd.wap.wml" code="9"/>
<enum name="text/vnd.wap.wml" code="8"/>
<enum name="text/vnd.wap.wmlscript" code="9"/>
<enum name="text/vnd.wap.wta-event" code="10"/>
<enum name="multipart/*" code="11"/>
@ -3952,8 +4007,8 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
<avp name="Priority" code="1209" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
<type type-name="Enumerated"/>
<enum name="Low" code="0"/>
<enum name="Normal" code="2"/>
<enum name="High" code="3"/>
<enum name="Normal" code="1"/>
<enum name="High" code="2"/>
</avp>
<avp name="Message-ID" code="1210" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
<type type-name="UTF8String"/>
@ -4982,7 +5037,7 @@ Note: The AVP codes from 1621 to 1699 are reserved for TS 29.272.
<type type-name="Enumerated"/>
<enum name="SUBMISSION" code="0"/>
<enum name="DELIVERY_REPORT" code="1"/>
<enum name="SM Service Request" code="1"/>
<enum name="SM Service Request" code="2"/>
</avp>
<avp name="Originating-SCCP-Address" code="2008" vendor-bit="must" vendor-id="TGPP">
<type type-name="IPAddress"/>
@ -5020,7 +5075,7 @@ Note: The AVP codes from 1621 to 1699 are reserved for TS 29.272.
<enum name="SMS Router" code="0"/>
<enum name="IP-SM-GW" code="1"/>
<enum name="SMS Router and IP-SM-GW" code="2"/>
<enum name="SMS-SC" code="4"/>
<enum name="SMS-SC" code="3"/>
</avp>
<avp name="SMSC-Address" code="2017" vendor-bit="must" vendor-id="TGPP">
<type type-name="IPAddress"/>

80
epan/dissectors/packet-isup.c
View File

@ -134,6 +134,10 @@ static const value_string isup_message_type_value[] = {
{ MESSAGE_TYPE_CONNECT, "Connect"},
{ MESSAGE_TYPE_FORW_TRANS, "Forward transfer"},
{ MESSAGE_TYPE_ANSWER, "Answer"},
{ 0x0a, "Reserved (used in 1984 version)"},
{ 0x0b, "Reserved (used in 1984 version)"},
{ MESSAGE_TYPE_RELEASE, "Release"},
{ MESSAGE_TYPE_SUSPEND, "Suspend"},
{ MESSAGE_TYPE_RESUME, "Resume"},
@ -149,10 +153,24 @@ static const value_string isup_message_type_value[] = {
{ MESSAGE_TYPE_CIRC_GRP_UNBL, "Circuit group unblocking"},
{ MESSAGE_TYPE_CIRC_GRP_BL_ACK, "Circuit group blocking acknowledgement"},
{ MESSAGE_TYPE_CIRC_GRP_UNBL_ACK, "Circuit group unblocking acknowledgement"},
{ 28, "Reserved (used in 1988 version)"},
{ 29, "Reserved (used in 1988 version)"},
{ 30, "Reserved (used in 1988 version)"},
{ MESSAGE_TYPE_FACILITY_REQ, "Facility request"},
{ MESSAGE_TYPE_FACILITY_ACC, "Facility accepted"},
{ MESSAGE_TYPE_FACILITY_REJ, "Facility reject"},
{ 34, "Reserved (used in 1984 version)"},
{ 35, "Reserved (used in 1984 version)"},
{ MESSAGE_TYPE_LOOP_BACK_ACK, "Loop back acknowledgement (national use)"},
{ 37, "Reserved (used in 1984 version)"},
{ 38, "Reserved (used in 1984 version)"},
{ 39, "Reserved (used in 1984 version)"},
{ MESSAGE_TYPE_PASS_ALONG, "Pass-along (national use)"},
{ MESSAGE_TYPE_CIRC_GRP_RST_ACK, "Circuit group reset acknowledgement"},
{ MESSAGE_TYPE_CIRC_GRP_QRY, "Circuit group query (national use)"},
@ -170,6 +188,16 @@ static const value_string isup_message_type_value[] = {
{ MESSAGE_TYPE_IDENT_REQ, "Identification request"},
{ MESSAGE_TYPE_IDENT_RSP, "Identification response"},
{ MESSAGE_TYPE_SEGMENTATION, "Segmentation"},
{ 57, "Reserved (used in B-ISUP)"},
{ 58, "Reserved (used in B-ISUP)"},
{ 59, "Reserved (used in B-ISUP)"},
{ 60, "Reserved (used in B-ISUP)"},
{ 61, "Reserved (used in B-ISUP)"},
{ 63, "Unknown"},
{ 63, "Unknown"},
{ MESSAGE_TYPE_LOOP_PREVENTION, "Loop prevention"},
{ MESSAGE_TYPE_APPLICATION_TRANS, "Application transport"},
{ MESSAGE_TYPE_PRE_RELEASE_INFO, "Pre-release information"},
@ -246,6 +274,10 @@ static const value_string isup_message_type_value_acro[] = {
{ MESSAGE_TYPE_CONNECT, "CON"},
{ MESSAGE_TYPE_FORW_TRANS, "FOT"},
{ MESSAGE_TYPE_ANSWER, "ANM"},
{ 0x0a, "Reserved"},
{ 0x0b, "Reserved"},
{ MESSAGE_TYPE_RELEASE, "REL"},
{ MESSAGE_TYPE_SUSPEND, "SUS"},
{ MESSAGE_TYPE_RESUME, "RES"},
@ -261,10 +293,24 @@ static const value_string isup_message_type_value_acro[] = {
{ MESSAGE_TYPE_CIRC_GRP_UNBL, "CGU"},
{ MESSAGE_TYPE_CIRC_GRP_BL_ACK, "CGBA"},
{ MESSAGE_TYPE_CIRC_GRP_UNBL_ACK, "CGUA"},
{ 28, "Reserved"},
{ 29, "Reserved"},
{ 30, "Reserved"},
{ MESSAGE_TYPE_FACILITY_REQ, "FAR"},
{ MESSAGE_TYPE_FACILITY_ACC, "FAA"},
{ MESSAGE_TYPE_FACILITY_REJ, "FRJ"},
{ 34, "Reserved"},
{ 35, "Reserved"},
{ MESSAGE_TYPE_LOOP_BACK_ACK, "LPA"},
{ 37, "Reserved"},
{ 38, "Reserved"},
{ 39, "Reserved"},
{ MESSAGE_TYPE_PASS_ALONG, "PAM"},
{ MESSAGE_TYPE_CIRC_GRP_RST_ACK, "GRA"},
{ MESSAGE_TYPE_CIRC_GRP_QRY, "CQM"},
@ -282,6 +328,16 @@ static const value_string isup_message_type_value_acro[] = {
{ MESSAGE_TYPE_IDENT_REQ, "IDR"},
{ MESSAGE_TYPE_IDENT_RSP, "IDS"},
{ MESSAGE_TYPE_SEGMENTATION, "SGM"},
{ 57, "Reserved"},
{ 58, "Reserved"},
{ 59, "Reserved"},
{ 60, "Reserved"},
{ 61, "Reserved"},
{ 63, "Unknown"},
{ 63, "Unknown"},
{ MESSAGE_TYPE_LOOP_PREVENTION, "LOP"},
{ MESSAGE_TYPE_APPLICATION_TRANS, "APM"},
{ MESSAGE_TYPE_PRE_RELEASE_INFO, "PRI"},
@ -736,6 +792,12 @@ static const value_string isup_calling_partys_category_value[] = {
{ OPERATOR_GERMAN, "operator, language German"},
{ OPERATOR_RUSSIAN, "operator, language Russian"},
{ OPERATOR_SPANISH, "operator, language Spanish"},
{ 6, "available to Administrations"},
{ 7, "available to Administrations"},
{ 8, "available to Administrations"},
{ 9, "reserved (national use)"},
{ ORDINARY_CALLING_SUBSCRIBER, "ordinary calling subscriber"},
{ CALLING_SUBSCRIBER_WITH_PRIORITY, "calling subscriber with priority"},
{ DATA_CALL, "data call (voice band data)"},
@ -818,9 +880,11 @@ static const value_string isup_cvr_cont_chk_ind_value[ ] = {
#define MEDIUM_384KBS 8
#define MEDIUM_1536KBS 9
#define MEDIUM_1920KBS 10
#define MEDIUM_3_64KBS 16
#define MEDIUM_4_64KBS 17
#define MEDIUM_5_64KBS 18
#define MEDIUM_7_64KBS 20
#define MEDIUM_8_64KBS 21
#define MEDIUM_9_64KBS 22
@ -838,6 +902,7 @@ static const value_string isup_cvr_cont_chk_ind_value[ ] = {
#define MEDIUM_21_64KBS 34
#define MEDIUM_22_64KBS 35
#define MEDIUM_23_64KBS 36
#define MEDIUM_25_64KBS 38
#define MEDIUM_26_64KBS 39
#define MEDIUM_27_64KBS 40
@ -846,6 +911,7 @@ static const value_string isup_cvr_cont_chk_ind_value[ ] = {
static const value_string isup_transmission_medium_requirement_value[] = {
{ MEDIUM_SPEECH, "speech"},
{ 1, "spare"},
{ MEDIUM_64KBS, "64 kbit/s unrestricted"},
{ MEDIUM_3_1_KHZ_AUDIO, "3.1 kHz audio"},
{ MEDIUM_RESERVED_SERVICE2_1, "reserved for alternate speech (service 2)/64 kbit/s unrestricted (service 1)"},
@ -855,9 +921,19 @@ static const value_string isup_transmission_medium_requirement_value[] = {
{ MEDIUM_384KBS, "384 kbit/s unrestricted"},
{ MEDIUM_1536KBS, "1536 kbit/s unrestricted"},
{ MEDIUM_1920KBS, "1920 kbit/s unrestricted"},
{ 11, "spare"},
{ 12, "spare"},
{ 13, "spare"},
{ 14, "spare"},
{ 15, "spare"},
{ MEDIUM_3_64KBS, "3x64 kbit/s unrestricted"},
{ MEDIUM_4_64KBS, "4x64 kbit/s unrestricted"},
{ MEDIUM_5_64KBS, "5x64 kbit/s unrestricted"},
{ 19, "spare"},
{ MEDIUM_7_64KBS, "7x64 kbit/s unrestricted"},
{ MEDIUM_8_64KBS, "8x64 kbit/s unrestricted"},
{ MEDIUM_9_64KBS, "9x64 kbit/s unrestricted"},
@ -875,6 +951,9 @@ static const value_string isup_transmission_medium_requirement_value[] = {
{ MEDIUM_21_64KBS, "21x64 kbit/s unrestricted"},
{ MEDIUM_22_64KBS, "22x64 kbit/s unrestricted"},
{ MEDIUM_23_64KBS, "23x64 kbit/s unrestricted"},
{ 37, "spare"},
{ MEDIUM_25_64KBS, "25x64 kbit/s unrestricted"},
{ MEDIUM_26_64KBS, "26x64 kbit/s unrestricted"},
{ MEDIUM_27_64KBS, "27x64 kbit/s unrestricted"},
@ -885,6 +964,7 @@ value_string_ext isup_transmission_medium_requirement_value_ext = VALUE_STRING_E
static const value_string isup_transmission_medium_requirement_prime_value[] = {
{ MEDIUM_SPEECH, "speech"},
{ 1, "spare"},
{ MEDIUM_64KBS, "reserved for 64 kbit/s unrestricted"},
{ MEDIUM_3_1_KHZ_AUDIO, "3.1 kHz audio"},
{ MEDIUM_RESERVED_SERVICE2_1, "reserved for alternate speech (service 2)/64 kbit/s unrestricted (service 1)"},