Fix a number of benign bugs wherein proto_tree_add_uint was intended (rather than...

Tip o' the hat to Guy ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39356 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 0bfab31c34d9ea694290ce77d5a3b37ee9799064..c22ca7396231bb1d2d76e7bcbdf7ceff9b969445 100644 (file)
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -13,8 +13,8 @@
  *
  * Support for SMPP 5.0
  * introduced by Abhik Sarkar
- * 
- * Support for Huawei SMPP+ extensions 
+ *
+ * Support for Huawei SMPP+ extensions
  * introduced by Xu Bo and enhance by Abhik Sarkar
  *
  * $Id$
@@ -323,9 +323,9 @@ static const value_string vals_command_id[] = {         /* Operation    */
     { 0x80000113, "Cancel_broadcast_sm - resp" },
     /* Huawei SMPP+ extensions */
     { 0x01000001, "Auth_acc" },
-    { 0x81000001, "Auth_acc - resp" },   
+    { 0x81000001, "Auth_acc - resp" },
     { 0X01000002, "Sm_result_notify" },
-    { 0X81000002, "Sm_result_notify - resp" },   
+    { 0X81000002, "Sm_result_notify - resp" },
     { 0, NULL }
 };
 
@@ -1031,7 +1031,7 @@ static const value_string vals_mo_mt_flag[] = {
     { 0x03, "Reserved" },
     { 0x00, NULL }
 };
- 
+
 static const value_string vals_operation_result[] = {
     { 0x00, "Successful" },
     { 0x01, "Protocol is not supported" },
@@ -1462,9 +1462,9 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
                 break;
             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_uint(sub_tree, hf_smpp_msg_wait_ind,
                                     tvb, *offset, 1, field);
-                proto_tree_add_item(sub_tree, hf_smpp_msg_wait_type,
+                proto_tree_add_uint(sub_tree, hf_smpp_msg_wait_type,
                                     tvb, *offset, 1, field);
                 (*offset)++;
                 break;
@@ -1529,9 +1529,9 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
                 break;
             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_uint(sub_tree, hf_smpp_callback_num_pres,
                                     tvb, *offset, 1, field);
-                proto_tree_add_item(sub_tree, hf_smpp_callback_num_scrn,
+                proto_tree_add_uint(sub_tree, hf_smpp_callback_num_scrn,
                                     tvb, *offset, 1, field);
                 (*offset)++;
                 break;
@@ -1730,9 +1730,9 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
                 smpp_handle_int1(sub_tree, tvb,
                                  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_uint(sub_tree, hf_smpp_its_session_sequence,
                                     tvb, *offset, 1, field);
-                proto_tree_add_item(sub_tree, hf_smpp_its_session_ind,
+                proto_tree_add_uint(sub_tree, hf_smpp_its_session_ind,
                                     tvb, *offset, 1, field);
                 (*offset)++;
                 break;
@@ -1906,11 +1906,11 @@ submit_sm(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
     dst_str = smpp_handle_string_return(tree, tvb, hf_smpp_destination_addr, &offset);
     flag = tvb_get_guint8(tvb, offset);
     udhi = flag & 0x40;
-    proto_tree_add_item(tree, hf_smpp_esm_submit_msg_mode,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_msg_mode,
                         tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_msg_type,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_msg_type,
                         tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_features,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_features,
                         tvb, offset, 1, flag);
     offset++;
     smpp_handle_int1(tree, tvb, hf_smpp_protocol_id, &offset);
@@ -1930,9 +1930,9 @@ submit_sm(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
                             "Validity period: SMSC default validity period");
     }
     flag = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
     offset++;
     smpp_handle_int1(tree, tvb, hf_smpp_replace_if_present_flag, &offset);
         smpp_handle_dcs(tree, tvb, &offset);
@@ -1993,9 +1993,9 @@ replace_sm(proto_tree *tree, tvbuff_t *tvb)
                                 "Validity period: Keep initial validity period setting");
         }
     flag = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
     offset++;
     smpp_handle_int1(tree, tvb, hf_smpp_sm_default_msg_id, &offset);
     length = tvb_get_guint8(tvb, offset);
@@ -2036,11 +2036,11 @@ submit_multi(proto_tree *tree, tvbuff_t *tvb)
     smpp_handle_dlist(tree, tvb, &offset);
 
     flag = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_msg_mode,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_msg_mode,
             tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_msg_type,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_msg_type,
             tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_features,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_features,
             tvb, offset, 1, flag);
     offset++;
     smpp_handle_int1(tree, tvb, hf_smpp_protocol_id, &offset);
@@ -2060,9 +2060,9 @@ submit_multi(proto_tree *tree, tvbuff_t *tvb)
                 "Validity period: SMSC default validity period");
     }
     flag = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
     offset++;
     smpp_handle_int1(tree, tvb, hf_smpp_replace_if_present_flag, &offset);
     smpp_handle_dcs(tree, tvb, &offset);
@@ -2104,17 +2104,17 @@ data_sm(proto_tree *tree, tvbuff_t *tvb)
     smpp_handle_int1(tree, tvb, hf_smpp_dest_addr_npi, &offset);
     smpp_handle_string(tree, tvb, hf_smpp_destination_addr, &offset);
     flag = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_msg_mode,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_msg_mode,
                         tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_msg_type,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_msg_type,
                         tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_esm_submit_features,
+    proto_tree_add_uint(tree, hf_smpp_esm_submit_features,
                         tvb, offset, 1, flag);
     offset++;
     flag = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
-    proto_tree_add_item(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_receipt, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_acks, tvb, offset, 1, flag);
+    proto_tree_add_uint(tree, hf_smpp_regdel_notif, tvb, offset, 1, flag);
     offset++;
         smpp_handle_dcs(tree, tvb, &offset);
     smpp_handle_tlv(tree, tvb, &offset);
@@ -2257,14 +2257,14 @@ huawei_auth_acc(proto_tree *tree, tvbuff_t *tvb)
     guint8 version = 0;
 
     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);
     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_npi, &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_int1(tree, tvb, hf_huawei_smpp_mo_mt_flag, &offset);
     smpp_handle_string(tree, tvb, hf_huawei_smpp_sm_id, &offset);
@@ -2288,16 +2288,16 @@ huawei_sm_result_notify(proto_tree *tree, tvbuff_t *tvb)
     guint8 version = 0;
 
     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);
-    
+
     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_npi, &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_int1(tree, tvb, hf_huawei_smpp_mo_mt_flag, &offset);
     smpp_handle_string(tree, tvb, hf_huawei_smpp_sm_id, &offset);
@@ -3701,7 +3701,7 @@ proto_register_smpp(void)
                         FT_UINT8, BASE_DEC, VALS(vals_notify_mode), 0x00,
                         "SMPP+: Indicates the SMS notify mode", HFILL
                 }
-        },        
+        },
         {        &hf_huawei_smpp_delivery_result,
                 {       "SMPP+: Delivery result of SMS", "smpp.delivery_result",
                         FT_UINT32, BASE_DEC, VALS(vals_delivery_result), 0x00,