Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 20 Oct 2011 14:30:27 +0000 (14:30 +0000)
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 20 Oct 2011 14:30:27 +0000 (14:30 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39490 f5534014-38df-0310-8fa8-9805f1628bb7

13 files changed:
plugins/docsis/packet-bpkmattr.c
plugins/docsis/packet-dccreq.c
plugins/docsis/packet-dcd.c
plugins/docsis/packet-macmgmt.c
plugins/docsis/packet-tlv.c
plugins/ethercat/packet-ecatmb.c
plugins/unistim/packet-unistim.c
plugins/wimax/msg_dcd.c
plugins/wimax/msg_dreg.c
plugins/wimax/msg_reg_req.c
plugins/wimax/msg_rng_req.c
plugins/wimax/msg_rng_rsp.c
plugins/wimax/wimax_utils.c

index 52e1acdba1164e477e0cc612ebe2deecceb5d57d..a126f4d9a5ca9dc1619032b21b6cc6027d316be8 100644 (file)
@@ -175,7 +175,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
         case BPKM_MAC_ADDR:
           if (length == 6)
             proto_tree_add_item (tree, hf_docsis_bpkmattr_mac_addr, tvb, pos,
-                                 length, FALSE);
+                                 length, ENC_NA);
           else
             THROW (ReportedBoundsError);
           break;
index 75f43b8aa82ed6e05e029862e086298a9c0e1ebf..4d579b0203f3ace55c0ea4dc82d99641437ba41c 100644 (file)
@@ -333,7 +333,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
              if (length == 6)
                {
                  proto_tree_add_item (dcc_tree, hf_docsis_dccreq_cmts_mac_addr, tvb,
-                                      pos, length, FALSE);
+                                      pos, length, ENC_NA);
                }
              else
                {
index 60d5a464506b13d5a472fa8fcc30042e75b78b19..6714cc08f7271a397636353d3d1926e718deb4ce 100644 (file)
@@ -341,7 +341,7 @@ dissect_dcd_clid (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
              if (length == 6)
                {
                  proto_tree_add_item (dcd_tree, hf_docsis_dcd_clid_known_mac_addr, tvb,
-                                      pos, length, FALSE);
+                                      pos, length, ENC_NA);
                }
              else
                {
@@ -426,7 +426,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
              if (length == 6)
                {
                  proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_tunl_addr, tvb,
-                                  pos, length, FALSE);
+                                  pos, length, ENC_NA);
                }
               else 
                {
index 07cf1cfcf41f3237218b1697de90cb3098cb51f4..a69ade685651c8d577ed15b6dfb670a5834a2174 100644 (file)
@@ -175,9 +175,9 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
                                         "Mac Management");
       mgt_hdr_tree = proto_item_add_subtree (mgt_hdr_it, ett_docsis_mgmt);
       proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_dst_addr, tvb, 0, 6,
-                           FALSE);
+                           ENC_NA);
       proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_src_addr, tvb, 6, 6,
-                           FALSE);
+                           ENC_NA);
       proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_msg_len, tvb, 12, 2,
                            ENC_BIG_ENDIAN);
       proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_dsap, tvb, 14, 1,
index 1f1152286abadee59e4d38581a4db94cceefa2de..594e0b88129e60e32ac6060229fb6638a9467e21 100644 (file)
@@ -1331,7 +1331,7 @@ dissect_eth_clsfr (tvbuff_t * tvb, proto_tree * tree, int start,
           if (length == 6)
             {
               proto_tree_add_item (ethclsfr_tree, hf_docsis_tlv_ethclsfr_dmac,
-                                   tvb, pos, length, FALSE);
+                                   tvb, pos, length, ENC_NA);
             }
           else
             {
@@ -1342,7 +1342,7 @@ dissect_eth_clsfr (tvbuff_t * tvb, proto_tree * tree, int start,
           if (length == 6)
             {
               proto_tree_add_item (ethclsfr_tree, hf_docsis_tlv_ethclsfr_smac,
-                                   tvb, pos, length, FALSE);
+                                   tvb, pos, length, ENC_NA);
             }
           else
             {
@@ -4011,7 +4011,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
             if (length == 6)
               {
                 proto_tree_add_item (tlv_tree, hf_docsis_tlv_cpe_ethernet,
-                                     tvb, pos, length, FALSE);
+                                     tvb, pos, length, ENC_NA);
               }
             else
               {
@@ -4202,7 +4202,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
             if (length == 6)
               {
                 proto_tree_add_item(tlv_tree, hf_docsis_tlv_mc_mac_address,
-                                    tvb, pos, length, FALSE);
+                                    tvb, pos, length, ENC_NA);
               }
             else
               {
index 278974c4846615f2fb24b18d4501aa348f3d6806..a9b01617447ff2ce9983a2204f6a04eb8429e264 100644 (file)
@@ -1113,7 +1113,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
                proto_tree_add_item(ecat_eoe_init_tree, hf_ecat_mailbox_eoe_init_append_timestamp, tvb, offset, 4, ENC_LITTLE_ENDIAN);
                offset+=4;
 
-               proto_tree_add_item(ecat_eoe_init_tree, hf_ecat_mailbox_eoe_init_macaddr, tvb, offset, ETHERNET_ADDRESS_LEN, TRUE);
+               proto_tree_add_item(ecat_eoe_init_tree, hf_ecat_mailbox_eoe_init_macaddr, tvb, offset, ETHERNET_ADDRESS_LEN, ENC_NA);
                offset+=ETHERNET_ADDRESS_LEN;
 
                proto_tree_add_item(ecat_eoe_init_tree, hf_ecat_mailbox_eoe_init_ipaddr, tvb, offset, 4, ENC_LITTLE_ENDIAN);
index 4ee1aa04f4c227be057f7818ef2615846e75bdab..72381b9b9fd671d0c0d9dddbe95405e17a196b25 100644 (file)
@@ -578,7 +578,7 @@ dissect_basic_phone(proto_tree *msg_tree,
       case 0x11:
    /*Phone Ethernet address*/
          proto_tree_add_item(msg_tree,hf_basic_ether_address,
-                             tvb,offset,msg_len,FALSE);
+                             tvb,offset,msg_len,ENC_NA);
          offset+=msg_len;
          break;
       case 0x0b:
index fd3be4ac599cbe47e2cf00dd9e71378cd4840b55..95ce5eb2760488e4e5b40f432e4aa1cb693d71a8 100644 (file)
@@ -559,7 +559,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
                                case DCD_BS_ID:
                                {
                                        tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_bs_id, tvb, offset, tlv_len, FALSE);
-                                       proto_tree_add_item(tlv_tree, hf_dcd_bs_id, tvb, offset, tlv_len, FALSE);
+                                       proto_tree_add_item(tlv_tree, hf_dcd_bs_id, tvb, offset, tlv_len, ENC_NA);
                                        break;
                                }
                                case DCD_FRAME_DURATION_CODE:
index 625ecd28561d8b5b1935ffc8f30a4087fc11b761..51834a2e3b1911d2872f4ccb37ad788d8f5a12f3 100644 (file)
@@ -158,7 +158,7 @@ static void dissect_dreg_tlv(proto_tree *dreg_tree, gint tlv_type, tvbuff_t *tvb
                        proto_tree_add_item(dreg_tree, hf_dreg_req_duration, tvb, tlv_offset, 1, ENC_BIG_ENDIAN);
                        break;
                case DREG_PAGING_CONTROLLER_ID:
-                       proto_tree_add_item(dreg_tree, hf_paging_controller_id, tvb, tlv_offset, 6, FALSE);
+                       proto_tree_add_item(dreg_tree, hf_paging_controller_id, tvb, tlv_offset, 6, ENC_NA);
                        break;
                case DREG_IDLE_MODE_RETAIN_INFO:
                        proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_sbc, tvb, tlv_offset, 1, ENC_BIG_ENDIAN);
index a915a0ace70af313b0d02fbd55bbb5c7678449cf..e2772b671101f34974c82a7e6b4eef373eb675be 100644 (file)
@@ -350,7 +350,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb
                        break;
                case REG_MAC_ADDRESS:
                        tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_mac_address, tvb, tlv_offset, tlv_len, FALSE);
-                       proto_tree_add_item(tlv_tree, hf_reg_mac_address, tvb, tlv_offset, 6, FALSE);
+                       proto_tree_add_item(tlv_tree, hf_reg_mac_address, tvb, tlv_offset, 6, ENC_NA);
                        break;
                case REG_TLV_T_20_MAX_MAC_DATA_PER_FRAME_SUPPORT:
                        /* display Maximum MAC level data per frame info */
index 60dfdd8006b20bf41ec3ab52222ed0ca7572c7dc..ac2e53e259c26171799bdee27b3be0e50b108107 100644 (file)
@@ -278,7 +278,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
                                        break;
                                case RNG_REQ_SS_MAC_ADDRESS:
                                        tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_ss_mac_address, tvb, tlv_offset, 6, FALSE);
-                                       proto_tree_add_item(tlv_tree, hf_rng_req_ss_mac_address, tvb, tlv_offset, 6, FALSE);
+                                       proto_tree_add_item(tlv_tree, hf_rng_req_ss_mac_address, tvb, tlv_offset, 6, ENC_NA);
                                        break;
                                case RNG_REQ_RANGING_ANOMALIES:
                                        /* add TLV subtree */
@@ -293,7 +293,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
                                        break;
                                case RNG_REQ_SERVING_BS_ID:
                                        tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_serving_bs_id, tvb, tlv_offset, 6, FALSE);
-                                       proto_tree_add_item(tlv_tree, hf_rng_req_serving_bs_id, tvb, tlv_offset, 6, FALSE);
+                                       proto_tree_add_item(tlv_tree, hf_rng_req_serving_bs_id, tvb, tlv_offset, 6, ENC_NA);
                                        break;
                                case RNG_REQ_RANGING_PURPOSE_INDICATION:
                                        /* display the Ranging Purpose Flags */
index facd6290165b5be7e5c96d75f0038fb7a06e469d..febb4e48650397092d1120ea100264cd318aae31 100644 (file)
@@ -382,10 +382,10 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
                                        if (tlv_len == 6)
                                        {
                                                sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_ss_mac_address, tvb, tlv_offset, 6, FALSE);
-                                               ss_mac_address_item = proto_tree_add_item(sub_tree, hf_rng_rsp_ss_mac_address, tvb, tlv_offset, 6, FALSE);
+                                               ss_mac_address_item = proto_tree_add_item(sub_tree, hf_rng_rsp_ss_mac_address, tvb, tlv_offset, 6, ENC_NA);
                                        } else {
                                                sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_invalid_tlv, tvb, tlv_offset, tlv_len, FALSE);
-                                               proto_tree_add_item(sub_tree, hf_rng_rsp_ss_mac_address, tvb, tlv_offset, 6, FALSE);
+                                               proto_tree_add_item(sub_tree, hf_rng_rsp_ss_mac_address, tvb, tlv_offset, 6, ENC_NA);
                                        }
                                        break;
                                case RNG_RSP_BASIC_CID:
index c1de1ee494ae77a7a6618dbb4d56cf77642d3249..e12d0954aaae073c592181cd030fd5e2b9c83ba3 100644 (file)
@@ -1988,14 +1988,14 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
                                                        case CST_PKT_CLASS_RULE_DST_MAC:
                                                                ti_tree = add_tlv_subtree(&tlv_info, ett_wimax_cst_encoding_rules, tlv_tree, hf_cst_pkt_class_rule_dest_mac_address, tvb, tlv_offset, length, FALSE);
                                                                /* add TLV subtree */
-                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_dest_mac, tvb, tlv_offset, 6, FALSE);
-                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_mask_mac, tvb, tlv_offset + 6, 6, FALSE);
+                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_dest_mac, tvb, tlv_offset, 6, ENC_NA);
+                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_mask_mac, tvb, tlv_offset + 6, 6, ENC_NA);
                                                        break;
                                                        case CST_PKT_CLASS_RULE_SRC_MAC:
                                                                /* add TLV subtree */
                                                                ti_tree = add_tlv_subtree(&tlv_info, ett_wimax_cst_encoding_rules, tlv_tree, hf_cst_pkt_class_rule_src_mac_address, tvb, tlv_offset, length, FALSE);
-                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_src_mac, tvb, tlv_offset, 6, FALSE);
-                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_mask_mac, tvb, tlv_offset + 6, 6, FALSE);
+                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_src_mac, tvb, tlv_offset, 6, ENC_NA);
+                                                               proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_mask_mac, tvb, tlv_offset + 6, 6, ENC_NA);
                                                        break;
                                                        case CST_PKT_CLASS_RULE_ETHERTYPE:
                                                                /* add TLV subtree */
@@ -2528,7 +2528,7 @@ void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui
        cmac_offset++;
        if(length > 13)
        {
-               proto_tree_add_item(cmac_tree, hf_cmac_tuple_bsid, tvb, cmac_offset, 6, FALSE);
+               proto_tree_add_item(cmac_tree, hf_cmac_tuple_bsid, tvb, cmac_offset, 6, ENC_NA);
                cmac_offset += 6;
        }
        proto_tree_add_item(cmac_tree, hf_packet_number_counter, tvb, cmac_offset, 4, ENC_BIG_ENDIAN);
@@ -2937,7 +2937,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
                        break;
                        case PKM_ATTR_MS_MAC_ADDRESS:
                                tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_attr_ms_mac_address, tvb, offset, tlv_len, FALSE);
-                               proto_tree_add_item(tlv_tree, hf_pkm_attr_ms_mac_address, tvb, offset, tlv_len, FALSE);
+                               proto_tree_add_item(tlv_tree, hf_pkm_attr_ms_mac_address, tvb, offset, tlv_len, ENC_NA);
                        break;
                        case PKM_ATTR_CMAC_DIGEST:
                                /* add TLV subtree */