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

Fix some benign bugs in proto_tree_add_item() 'encoding' arg. 

svn path=/trunk/; revision=39345
This commit is contained in:
Bill Meier 2011-10-10 21:12:05 +00:00
parent e81572eaa9
commit 8960630a3c
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
epan/dissectors/packet-smpp.c
View File

@ -13,8 +13,8 @@
* *
* Support for SMPP 5.0 * Support for SMPP 5.0
* introduced by Abhik Sarkar * introduced by Abhik Sarkar
* *
* Support for Huawei SMPP+ extensions * Support for Huawei SMPP+ extensions
* introduced by Xu Bo and enhance by Abhik Sarkar * introduced by Xu Bo and enhance by Abhik Sarkar
* *
* $Id$ * $Id$
@ -323,9 +323,9 @@ static const value_string vals_command_id[] = { /* Operation */
{ 0x80000113, "Cancel_broadcast_sm - resp" }, { 0x80000113, "Cancel_broadcast_sm - resp" },
/* Huawei SMPP+ extensions */ /* Huawei SMPP+ extensions */
{ 0x01000001, "Auth_acc" }, { 0x01000001, "Auth_acc" },
{ 0x81000001, "Auth_acc - resp" }, { 0x81000001, "Auth_acc - resp" },
{ 0X01000002, "Sm_result_notify" }, { 0X01000002, "Sm_result_notify" },
{ 0X81000002, "Sm_result_notify - resp" }, { 0X81000002, "Sm_result_notify - resp" },
{ 0, NULL } { 0, NULL }
}; };
@ -1031,7 +1031,7 @@ static const value_string vals_mo_mt_flag[] = {
{ 0x03, "Reserved" }, { 0x03, "Reserved" },
{ 0x00, NULL } { 0x00, NULL }
}; };
static const value_string vals_operation_result[] = { static const value_string vals_operation_result[] = {
{ 0x00, "Successful" }, { 0x00, "Successful" },
{ 0x01, "Protocol is not supported" }, { 0x01, "Protocol is not supported" },
@ -1461,11 +1461,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
hf_smpp_receipted_message_id, offset); hf_smpp_receipted_message_id, offset);
break; break;
case 0x0030: /* ms_msg_wait_facilities */ case 0x0030: /* ms_msg_wait_facilities */
field = tvb_get_guint8(tvb, *offset);
proto_tree_add_item(sub_tree, hf_smpp_msg_wait_ind, proto_tree_add_item(sub_tree, hf_smpp_msg_wait_ind,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
proto_tree_add_item(sub_tree, hf_smpp_msg_wait_type, proto_tree_add_item(sub_tree, hf_smpp_msg_wait_type,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
(*offset)++; (*offset)++;
break; break;
case 0x0201: /* privacy_indicator */ case 0x0201: /* privacy_indicator */
@ -1528,11 +1527,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
(*offset)++; (*offset)++;
break; break;
case 0x0302: /* callback_num_pres_ind */ case 0x0302: /* callback_num_pres_ind */
field = tvb_get_guint8(tvb, *offset);
proto_tree_add_item(sub_tree, hf_smpp_callback_num_pres, proto_tree_add_item(sub_tree, hf_smpp_callback_num_pres,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
proto_tree_add_item(sub_tree, hf_smpp_callback_num_scrn, proto_tree_add_item(sub_tree, hf_smpp_callback_num_scrn,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
(*offset)++; (*offset)++;
break; break;
case 0x0303: /* callback_num_atag */ case 0x0303: /* callback_num_atag */
@ -1729,11 +1727,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
case 0x1383: /* its_session_info */ case 0x1383: /* its_session_info */
smpp_handle_int1(sub_tree, tvb, smpp_handle_int1(sub_tree, tvb,
hf_smpp_its_session_number, offset); hf_smpp_its_session_number, offset);
field = tvb_get_guint8(tvb, *offset);
proto_tree_add_item(sub_tree, hf_smpp_its_session_sequence, proto_tree_add_item(sub_tree, hf_smpp_its_session_sequence,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
proto_tree_add_item(sub_tree, hf_smpp_its_session_ind, proto_tree_add_item(sub_tree, hf_smpp_its_session_ind,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
(*offset)++; (*offset)++;
break; break;
@ -2257,14 +2254,14 @@ huawei_auth_acc(proto_tree *tree, tvbuff_t *tvb)
guint8 version = 0; guint8 version = 0;
smpp_handle_int1(tree, tvb, hf_huawei_smpp_version, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_version, &offset);
version = tvb_get_guint8(tvb, offset); version = tvb_get_guint8(tvb, offset);
smpp_handle_string(tree, tvb, hf_huawei_smpp_smsc_addr, &offset); smpp_handle_string(tree, tvb, hf_huawei_smpp_smsc_addr, &offset);
if ( version == '3' ) { if ( version == '3' ) {
smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_noa, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_noa, &offset);
smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_npi, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_npi, &offset);
smpp_handle_string(tree, tvb, hf_huawei_smpp_msc_addr, &offset); smpp_handle_string(tree, tvb, hf_huawei_smpp_msc_addr, &offset);
} }
smpp_handle_string(tree, tvb, hf_smpp_source_addr, &offset); smpp_handle_string(tree, tvb, hf_smpp_source_addr, &offset);
smpp_handle_string(tree, tvb, hf_smpp_destination_addr, &offset); smpp_handle_string(tree, tvb, hf_smpp_destination_addr, &offset);
smpp_handle_int1(tree, tvb, hf_huawei_smpp_mo_mt_flag, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_mo_mt_flag, &offset);
smpp_handle_string(tree, tvb, hf_huawei_smpp_sm_id, &offset); smpp_handle_string(tree, tvb, hf_huawei_smpp_sm_id, &offset);
@ -2288,16 +2285,16 @@ huawei_sm_result_notify(proto_tree *tree, tvbuff_t *tvb)
guint8 version = 0; guint8 version = 0;
smpp_handle_int1(tree, tvb, hf_huawei_smpp_version, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_version, &offset);
version = tvb_get_guint8(tvb, offset); version = tvb_get_guint8(tvb, offset);
smpp_handle_string(tree, tvb, hf_huawei_smpp_smsc_addr, &offset); smpp_handle_string(tree, tvb, hf_huawei_smpp_smsc_addr, &offset);
if ( version == '3' ) { if ( version == '3' ) {
smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_noa, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_noa, &offset);
smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_npi, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_msc_addr_npi, &offset);
smpp_handle_string(tree, tvb, hf_huawei_smpp_msc_addr, &offset); smpp_handle_string(tree, tvb, hf_huawei_smpp_msc_addr, &offset);
} }
smpp_handle_string(tree, tvb, hf_smpp_source_addr, &offset); smpp_handle_string(tree, tvb, hf_smpp_source_addr, &offset);
smpp_handle_string(tree, tvb, hf_smpp_destination_addr, &offset); smpp_handle_string(tree, tvb, hf_smpp_destination_addr, &offset);
smpp_handle_int1(tree, tvb, hf_huawei_smpp_mo_mt_flag, &offset); smpp_handle_int1(tree, tvb, hf_huawei_smpp_mo_mt_flag, &offset);
smpp_handle_string(tree, tvb, hf_huawei_smpp_sm_id, &offset); smpp_handle_string(tree, tvb, hf_huawei_smpp_sm_id, &offset);
@ -3701,7 +3698,7 @@ proto_register_smpp(void)
FT_UINT8, BASE_DEC, VALS(vals_notify_mode), 0x00, FT_UINT8, BASE_DEC, VALS(vals_notify_mode), 0x00,
"SMPP+: Indicates the SMS notify mode", HFILL "SMPP+: Indicates the SMS notify mode", HFILL
} }
}, },
{ &hf_huawei_smpp_delivery_result, { &hf_huawei_smpp_delivery_result,
{ "SMPP+: Delivery result of SMS", "smpp.delivery_result", { "SMPP+: Delivery result of SMS", "smpp.delivery_result",
FT_UINT32, BASE_DEC, VALS(vals_delivery_result), 0x00, FT_UINT32, BASE_DEC, VALS(vals_delivery_result), 0x00,