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

"Fill" a couple of value_string(ext) 

svn path=/trunk/; revision=46518
This commit is contained in:
Anders Broman 2012-12-12 12:48:12 +00:00
parent 93fdffd70d
commit 5c1bc94608
7 changed files with 78 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asn1/gsm_map/packet-gsm_map-template.c
View File

@ -880,6 +880,11 @@ static const value_string gsm_map_number_plan_values[] = {
{ 0x07, "spare" },
{ 0x08, "National Numbering" },
{ 0x09, "Private Numbering" },
{ 0x0a, "spare" },
{ 0x0b, "spare" },
{ 0x0c, "spare" },
{ 0x0d, "spare" },
{ 0x0e, "spare" },
{ 0x0f, "Reserved for extension" },
{ 0, NULL }
};

2
diameter/Ericsson.xml
View File

@ -187,7 +187,7 @@
<avp name="Next-Authorization-State" code="1059" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
<type type-name="Enumerated"/>
<enum name="Authorized" code="0"/>
<enum name="Unauthorized due to calendar time" code="0"/>
<enum name="Unauthorized due to calendar time" code="1"/>
</avp>
<avp name="Gx-Capability-List" code="1060" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
<type type-name="Unsigned32"/>

5
diameter/dictionary.xml
View File

@ -3654,8 +3654,9 @@
<enum name="RESOURCE_ALLOCATION_FAILURE" code="10"/>
<enum name="UNSUCCESSFUL_QOS_VALIDATION" code="11"/>
<enum name="INCORRECT_FLOW_INFORMATION" code="12"/>
<enum name="PS_TO_CS_HANDOVER" code="13"/>
<enum name="NO_BEARER_BOUND" code="15"/>
<enum name="PS_TO_CS_HANDOVER" code="13"/>
<enum name="Unused code value" code="14"/>
<enum name="NO_BEARER_BOUND" code="15"/>
</avp>
<avp name="RAT-Type" code="1032" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
<type type-name="Enumerated" />

62
epan/dissectors/packet-bssap.c
View File

@ -140,36 +140,38 @@ static const value_string bsap_sapi_values[] = {
#define BSSAP_MS_UNREACHABLE 31 /* 17.1.17 */
static const value_string bssap_plus_message_type_values[] = {
{ 0x00, "Unassigned: treated as an unknown Message type." },
{ BSSAP_PAGING_REQUEST, "BSSAP+-PAGING-REQUEST" }, /* 17.1.19 */
{ BSSAP_PAGING_REJECT, "BSSAP+-PAGING-REJECT" }, /* 17.1.18 */
{ 0x03, "Unassigned: treated as an unknown Message type." },
{ 0x04, "Unassigned: treated as an unknown Message type." },
{ 0x05, "Unassigned: treated as an unknown Message type." },
{ 0x06, "Unassigned: treated as an unknown Message type." },
{ BSSAP_DOWNLINK_TUNNEL_REQUEST, "BSSAP+-DOWNLINK-TUNNEL-REQUEST" }, /* 17.1.4 */
{ BSSAP_UPLINK_TUNNEL_REQUEST, "BSSAP+-UPLINK-TUNNEL-REQUEST" }, /* 17.1.23 */
{ BSSAP_LOCATION_UPDATE_REQUEST, "BSSAP+-LOCATION-UPDATE-REQUEST" }, /* 17.1.11 */
{ BSSAP_LOCATION_UPDATE_ACCEPT, "BSSAP+-LOCATION-UPDATE-ACCEPT" }, /* 17.1.9 */
{ BSSAP_LOCATION_UPDATE_REJECT, "BSSAP+-LOCATION-UPDATE-REJECT" }, /* 17.1.10 */
{ BSSAP_TMSI_REALLOCATION_COMPLETE, "BSSAP+-TMSI-REALLOCATION-COMPLETE" }, /* 17.1.22 */
{ BSSAP_ALERT_REQUEST, "BSSAP+-ALERT-REQUEST" }, /* 17.1.3 */
{ BSSAP_ALERT_ACK, "BSSAP+-ALERT-ACK" }, /* 17.1.1 */
{ BSSAP_ALERT_REJECT, "BSSAP+-ALERT-REJECT" }, /* 17.1.2 */
{ BSSAP_MS_ACTIVITY_INDICATION, "BSSAP+-MS-ACTIVITY-INDICATION" }, /* 17.1.14 */
{ BSSAP_GPRS_DETACH_INDICATION, "BSSAP+-GPRS-DETACH-INDICATION" }, /* 17.1.6 */
{ BSSAP_GPRS_DETACH_ACK, "BSSAP+-GPRS-DETACH-ACK" }, /* 17.1.5 */
{ BSSAP_IMSI_DETACH_INDICATION, "BSSAP+-IMSI-DETACH-INDICATION" }, /* 17.1.8 */
{ BSSAP_IMSI_DETACH_ACK, "BSSAP+-IMSI-DETACH-ACK" }, /* 17.1.7 */
{ BSSAP_RESET_INDICATION, "BSSAP+-RESET-INDICATION" }, /* 17.1.21 */
{ BSSAP_RESET_ACK, "BSSAP+-RESET-ACK" }, /* 17.1.20 */
{ BSSAP_MS_INFORMATION_REQUEST, "BSSAP+-MS-INFORMATION-REQUEST" }, /* 17.1.15 */
{ BSSAP_MS_INFORMATION_RESPONSE, "BSSAP+-MS-INFORMATION-RESPONSE" }, /* 17.1.16 */
{ 0x19, "Unassigned: treated as an unknown Message type." },
{ BSSAP_MM_INFORMATION_REQUEST, "BSSAP+-MM-INFORMATION-REQUEST" }, /* 17.1.12 */
{ BSSAP_MOBILE_STATUS, "BSSAP+-MOBILE-STATUS" }, /* 17.1.13 */
{ 0x1e, "Unassigned: treated as an unknown Message type." },
{ BSSAP_MS_UNREACHABLE, "BSSAP+-MS-UNREACHABLE" }, /* 17.1.17 */
/* 0 */ { 0x00, "Unassigned: treated as an unknown Message type." },
/* 1 */ { BSSAP_PAGING_REQUEST, "BSSAP+-PAGING-REQUEST" }, /* 17.1.19 */
/* 2 */ { BSSAP_PAGING_REJECT, "BSSAP+-PAGING-REJECT" }, /* 17.1.18 */
/* 3 */ { 0x03, "Unassigned: treated as an unknown Message type." },
/* 4 */ { 0x04, "Unassigned: treated as an unknown Message type." },
/* 5 */ { 0x05, "Unassigned: treated as an unknown Message type." },
/* 6 */ { 0x06, "Unassigned: treated as an unknown Message type." },
/* 7 */ { BSSAP_DOWNLINK_TUNNEL_REQUEST, "BSSAP+-DOWNLINK-TUNNEL-REQUEST" }, /* 17.1.4 */
/* 8 */ { BSSAP_UPLINK_TUNNEL_REQUEST, "BSSAP+-UPLINK-TUNNEL-REQUEST" }, /* 17.1.23 */
/* 9 */ { BSSAP_LOCATION_UPDATE_REQUEST, "BSSAP+-LOCATION-UPDATE-REQUEST" }, /* 17.1.11 */
/* 10 */ { BSSAP_LOCATION_UPDATE_ACCEPT, "BSSAP+-LOCATION-UPDATE-ACCEPT" }, /* 17.1.9 */
/* 11 */ { BSSAP_LOCATION_UPDATE_REJECT, "BSSAP+-LOCATION-UPDATE-REJECT" }, /* 17.1.10 */
/* 12 */ { BSSAP_TMSI_REALLOCATION_COMPLETE, "BSSAP+-TMSI-REALLOCATION-COMPLETE" }, /* 17.1.22 */
/* 13 */ { BSSAP_ALERT_REQUEST, "BSSAP+-ALERT-REQUEST" }, /* 17.1.3 */
/* 14 */ { BSSAP_ALERT_ACK, "BSSAP+-ALERT-ACK" }, /* 17.1.1 */
/* 15 */ { BSSAP_ALERT_REJECT, "BSSAP+-ALERT-REJECT" }, /* 17.1.2 */
/* 16 */ { BSSAP_MS_ACTIVITY_INDICATION, "BSSAP+-MS-ACTIVITY-INDICATION" }, /* 17.1.14 */
/* 17 */ { BSSAP_GPRS_DETACH_INDICATION, "BSSAP+-GPRS-DETACH-INDICATION" }, /* 17.1.6 */
/* 18 */ { BSSAP_GPRS_DETACH_ACK, "BSSAP+-GPRS-DETACH-ACK" }, /* 17.1.5 */
/* 19 */ { BSSAP_IMSI_DETACH_INDICATION, "BSSAP+-IMSI-DETACH-INDICATION" }, /* 17.1.8 */
/* 20 */ { BSSAP_IMSI_DETACH_ACK, "BSSAP+-IMSI-DETACH-ACK" }, /* 17.1.7 */
/* 21 */ { BSSAP_RESET_INDICATION, "BSSAP+-RESET-INDICATION" }, /* 17.1.21 */
/* 22 */ { BSSAP_RESET_ACK, "BSSAP+-RESET-ACK" }, /* 17.1.20 */
/* 23 */ { BSSAP_MS_INFORMATION_REQUEST, "BSSAP+-MS-INFORMATION-REQUEST" }, /* 17.1.15 */
/* 24 */ { BSSAP_MS_INFORMATION_RESPONSE, "BSSAP+-MS-INFORMATION-RESPONSE" }, /* 17.1.16 */
/* 25 */ { 0x19, "Unassigned: treated as an unknown Message type." },
/* 26 */ { BSSAP_MM_INFORMATION_REQUEST, "BSSAP+-MM-INFORMATION-REQUEST" }, /* 17.1.12 */
/* 27 */ { 0x1b, "Unassigned: treated as an unknown Message type." },
/* 28 */ { 0x1c, "Unassigned: treated as an unknown Message type." },
/* 29 */ { BSSAP_MOBILE_STATUS, "BSSAP+-MOBILE-STATUS" }, /* 17.1.13 */
/* 30 */ { 0x1e, "Unassigned: treated as an unknown Message type." },
/* 31 */ { BSSAP_MS_UNREACHABLE, "BSSAP+-MS-UNREACHABLE" }, /* 17.1.17 */
{ 0, NULL }
};
static value_string_ext bssap_plus_message_type_values_ext = VALUE_STRING_EXT_INIT(bssap_plus_message_type_values);

11
epan/dissectors/packet-gsm_map.c
View File

@ -18375,6 +18375,11 @@ static const value_string gsm_map_number_plan_values[] = {
{ 0x07, "spare" },
{ 0x08, "National Numbering" },
{ 0x09, "Private Numbering" },
{ 0x0a, "spare" },
{ 0x0b, "spare" },
{ 0x0c, "spare" },
{ 0x0d, "spare" },
{ 0x0e, "spare" },
{ 0x0f, "Reserved for extension" },
{ 0, NULL }
};
@ -25997,7 +26002,7 @@ void proto_register_gsm_map(void) {
NULL, HFILL }},
/*--- End of included file: packet-gsm_map-hfarr.c ---*/
#line 2607 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 2612 "../../asn1/gsm_map/packet-gsm_map-template.c"
};
/* List of subtrees */
@ -26631,7 +26636,7 @@ void proto_register_gsm_map(void) {
&ett_gsm_map_ericsson_EnhancedCheckIMEI_Arg,
/*--- End of included file: packet-gsm_map-ettarr.c ---*/
#line 2638 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 2643 "../../asn1/gsm_map/packet-gsm_map-template.c"
};
static const enum_val_t application_context_modes[] = {
@ -26724,7 +26729,7 @@ void proto_register_gsm_map(void) {
/*--- End of included file: packet-gsm_map-dis-tab.c ---*/
#line 2669 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 2674 "../../asn1/gsm_map/packet-gsm_map-template.c"
oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
/*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );

56
epan/dissectors/packet-gsm_rlcmac.c
View File

@ -6247,40 +6247,40 @@ static const value_string dl_rlc_message_type_vals[] = {
{0x0B, "PACKET_CELL_CHANGE_CONTINUE"},
{0x0C, "PACKET_NEIGHBOUR_CELL_DATA"},
{0x0D, "PACKET_SERVING_CELL_DATA"},
/* {0x0E, "Invalid Message Type"}, */
/* {0x0F, "Invalid Message Type"}, */
/* {0x10, "Invalid Message Type"}, */
/* {0x11, "Invalid Message Type"}, */
/* {0x12, "Invalid Message Type"}, */
/* {0x13, "Invalid Message Type"}, */
/* {0x14, "Invalid Message Type"}, */
{0x0E, "Invalid Message Type"},
{0x0F, "Invalid Message Type"},
{0x10, "Invalid Message Type"},
{0x11, "Invalid Message Type"},
{0x12, "Invalid Message Type"},
{0x13, "Invalid Message Type"},
{0x14, "Invalid Message Type"},
{0x15, "PACKET_HANDOVER_COMMAND"},
{0x16, "PACKET_PHYSICAL_INFORMATION"},
/* {0x17, "Invalid Message Type"}, */
/* {0x18, "Invalid Message Type"}, */
/* {0x19, "Invalid Message Type"}, */
/* {0x1A, "Invalid Message Type"}, */
/* {0x1B, "Invalid Message Type"}, */
/* {0x1C, "Invalid Message Type"}, */
/* {0x1D, "Invalid Message Type"}, */
/* {0x1E, "Invalid Message Type"}, */
/* {0x1F, "Invalid Message Type"}, */
/* {0x20, "Invalid Message Type"}, */
{0x17, "Invalid Message Type"},
{0x18, "Invalid Message Type"},
{0x19, "Invalid Message Type"},
{0x1A, "Invalid Message Type"},
{0x1B, "Invalid Message Type"},
{0x1C, "Invalid Message Type"},
{0x1D, "Invalid Message Type"},
{0x1E, "Invalid Message Type"},
{0x1F, "Invalid Message Type"},
{0x20, "Invalid Message Type"},
{0x21, "PACKET_ACCESS_REJECT"},
{0x22, "PACKET_PAGING_REQUEST"},
{0x23, "PACKET_PDCH_RELEASE"},
{0x24, "PACKET_PRACH_PARAMETERS"},
{0x25, "PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK"},
/* {0x26, "Invalid Message Type"}, */
/* {0x27, "Invalid Message Type"}, */
/* {0x28, "Invalid Message Type"}, */
/* {0x29, "Invalid Message Type"}, */
/* {0x2A, "Invalid Message Type"}, */
/* {0x2B, "Invalid Message Type"}, */
/* {0x2C, "Invalid Message Type"}, */
/* {0x2D, "Invalid Message Type"}, */
/* {0x2E, "Invalid Message Type"}, */
/* {0x2F, "Invalid Message Type"}, */
{0x26, "Invalid Message Type"},
{0x27, "Invalid Message Type"},
{0x28, "Invalid Message Type"},
{0x29, "Invalid Message Type"},
{0x2A, "Invalid Message Type"},
{0x2B, "Invalid Message Type"},
{0x2C, "Invalid Message Type"},
{0x2D, "Invalid Message Type"},
{0x2E, "Invalid Message Type"},
{0x2F, "Invalid Message Type"},
{0x30, "PACKET_SYSTEM_INFO_6"},
{0x31, "PACKET_SYSTEM_INFO_1"},
{0x32, "PACKET_SYSTEM_INFO_2"},
@ -6292,7 +6292,7 @@ static const value_string dl_rlc_message_type_vals[] = {
{0x38, "PACKET_SYSTEM_INFO_7"},
{0x39, "PACKET_SYSTEM_INFO_8"},
{0x3A, "PACKET_SYSTEM_INFO_14"},
/* {0x3B, "Invalid Message Type"}, */
{0x3B, "Invalid Message Type"},
{0x3C, "PACKET_SYSTEM_INFO_3_TER"},
{0x3D, "PACKET_SYSTEM_INFO_3_QUATER"},
{0x3E, "PACKET_SYSTEM_INFO_15"},

1
epan/dissectors/packet-gsm_sms.c
View File

@ -1540,6 +1540,7 @@ static const value_string gsm_sms_tp_failure_cause_values[] = {
{ 0xD5, "(U)SIM data download error" },
/* D6 - DF Reserved */
{ 0xd6, "Reserved" },
{ 0xd7, "Reserved" },
{ 0xd8, "Reserved" },
{ 0xd9, "Reserved" },
{ 0xda, "Reserved" },