diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-20 14:07:54 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-20 14:07:54 +0000 |
| commit | d65261d344ba268dd76e533970714649d1bbfb71 (patch) | |
| tree | 8498849c46a94048de6ad33480a4e0aed549da2b | |
| parent | f27e3fa74bf641a08e8a17c68bf2393143013bd8 (diff) | |
Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
(Some minor whitespace cleanup).
svn path=/trunk/; revision=39488
45 files changed, 456 insertions, 456 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index 766b9e458e..c8cf9353d7 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -461,7 +461,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) break; case NJACK_CMD_MACADDRESS: proto_tree_add_item(tlv_tree, hf_njack_tlv_devicemac, - tvb, offset, 6, ENC_BIG_ENDIAN); + tvb, offset, 6, ENC_NA); offset += 6; break; case NJACK_CMD_VERSION: diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 367b87cb5f..d025655f1d 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -463,10 +463,10 @@ dissect_ancp_adj_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ancp_tree, col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", val_to_str(adjcode, adj_code_names, "Unknown (0x%02x)")); - proto_tree_add_item(ancp_tree, hf_ancp_sender_name, tvb, offset, 6, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_sender_name, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(ancp_tree, hf_ancp_receiver_name, tvb,offset, 6, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_receiver_name, tvb,offset, 6, ENC_NA); offset += 6; proto_tree_add_item(ancp_tree, hf_ancp_sender_port, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index ded5187531..f837f38deb 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -91,7 +91,7 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ans_tree, hf_ans_rev_id, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ans_tree, hf_ans_seq_num, tvb, 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ans_tree, hf_ans_sender_id, tvb, 8, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ans_tree, hf_ans_team_id, tvb, 10, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(ans_tree, hf_ans_team_id, tvb, 10, 6, ENC_NA); } } diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 38fe3895d4..92ab8cff8b 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -741,7 +741,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 4; proto_tree_add_item(tree, hf_artnet_poll_reply_mac, - tvb, offset, 6, ENC_BIG_ENDIAN); + tvb, offset, 6, ENC_NA); offset += 6; diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index cb47401f6c..824cada395 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -84,7 +84,7 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(type){ case ADP_REQUEST: - proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, ENC_NA); mac_str = tvb_ether_to_str(tvb, 6); col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Request Src MAC: %s", mac_str); diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index 545233c52a..7186088dbf 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -251,7 +251,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Ethernet MAC */ proto_tree_add_item(bacnet_tree, hf_bacnet_dadr_eth, tvb, offset, - bacnet_dlen, FALSE); + bacnet_dlen, ENC_NA); offset += bacnet_dlen; } else if (bacnet_dlen==1) { proto_tree_add_uint(bacnet_tree, hf_bacnet_dlen, @@ -298,7 +298,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Ethernet MAC */ proto_tree_add_item(bacnet_tree, hf_bacnet_sadr_eth, tvb, offset, - bacnet_slen, FALSE); + bacnet_slen, ENC_NA); offset += bacnet_slen; } else if (bacnet_slen==1) { /* SLEN */ diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 8234fa9231..7c4cebbafc 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1691,7 +1691,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, if (byte == ARPHRD_ETHER || byte == ARPHRD_IEEE802) proto_tree_add_item(v_tree, hf_bootp_hw_ether_addr, tvb, optoff+1, 6, - ENC_BIG_ENDIAN); + ENC_NA); else proto_tree_add_text(v_tree, tvb, optoff+1, 6, "Client hardware address: %s", @@ -1802,7 +1802,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, if (byte == ARPHRD_ETHER || byte == ARPHRD_IEEE802) proto_tree_add_item(v_tree, hf_bootp_hw_ether_addr, tvb, optoff+1, 6, - ENC_BIG_ENDIAN); + ENC_NA); else proto_tree_add_text(v_tree, tvb, optoff+1, 6, "Client hardware address: %s", @@ -2862,7 +2862,7 @@ dissect_vendor_cablelabs_suboption(packet_info *pinfo, proto_item *v_ti, proto_t break; } - proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_cl_mta_mac_address, tvb, suboptoff, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_cl_mta_mac_address, tvb, suboptoff, 6, ENC_NA); break; default: if (o43cablelabs_opt[subopt].phf != NULL) @@ -4698,7 +4698,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (hlen > 0 && hlen <= 16) { if ((htype == ARPHRD_ETHER || htype == ARPHRD_IEEE802) && hlen == 6) - proto_tree_add_item(bp_tree, hf_bootp_hw_ether_addr, tvb, 28, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(bp_tree, hf_bootp_hw_ether_addr, tvb, 28, 6, ENC_NA); else /* The chaddr element is 16 bytes in length, although only the first hlen bytes are used */ diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 306f3d79e8..0e59142e7b 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -870,7 +870,7 @@ dissect_capwap_board_data(tvbuff_t *tvb, proto_tree *board_data_type_tree, guint break; case BOARD_DATA_BASE_MAC_ADDRESS: - proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_base_mac_address, tvb, offset+4, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_base_mac_address, tvb, offset+4, 6, ENC_NA); break; default: @@ -1110,7 +1110,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ break; case IEEE80211_STATION_SESSION_KEY: /* ieee80211 Station Session Key (1038) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_mac, tvb, offset+4, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_mac, tvb, offset+4, 6, ENC_NA); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_flags, tvb, offset+10, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_flags_a, tvb, offset+10, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_flags_c, tvb, offset+10, 2, ENC_BIG_ENDIAN); @@ -1260,7 +1260,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_length, tvb, offset+plen, 1, ENC_BIG_ENDIAN); plen += 1; if (maclength == 6) { - proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_eui48, tvb, offset+plen, maclength, ENC_BIG_ENDIAN); + proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_eui48, tvb, offset+plen, maclength, ENC_NA); } else if (maclength == 8) { proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_eui64, tvb, offset+plen, maclength, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index aaef067ead..d6b316cf83 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -425,7 +425,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr tvb, maid_offset, cfm_maid_md_name_length, ENC_NA); } else { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac, - tvb, maid_offset, 6, ENC_BIG_ENDIAN); + tvb, maid_offset, 6, ENC_NA); proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac_id, tvb, maid_offset+6, 2, ENC_NA); } @@ -533,9 +533,9 @@ static int dissect_cfm_ltm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset += 4; proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_orig_addr, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_orig_addr, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_targ_addr, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_targ_addr, tvb, offset, 6, ENC_NA); offset += 6; return offset; } @@ -697,7 +697,7 @@ static int dissect_cfm_raps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_dnf, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, ENC_NA); @@ -1066,7 +1066,7 @@ static int dissect_cfm_slm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset += 4; proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - + return offset; } @@ -1098,7 +1098,7 @@ static int dissect_cfm_slr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset += 4; proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - + return offset; } @@ -1324,7 +1324,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ingress_mac_address, - tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); + tvb, tlv_data_offset, 6, ENC_NA); tlv_data_offset += 6; /* For the IEEE standard if the TLV length is greater than 7 then we have @@ -1352,7 +1352,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_egress_mac_address, - tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); + tvb, tlv_data_offset, 6, ENC_NA); tlv_data_offset += 6; /* For the IEEE standard if the TLV length is greater than 7 then we have @@ -1380,7 +1380,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, tlv_data_offset, 2, ENC_NA); tlv_data_offset += 2; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_mac, - tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); + tvb, tlv_data_offset, 6, ENC_NA); tlv_data_offset += 6; break; case LTR_EGR_ID_TLV: @@ -1388,13 +1388,13 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, tlv_data_offset, 2, ENC_NA); tlv_data_offset += 2; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_mac, - tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); + tvb, tlv_data_offset, 6, ENC_NA); tlv_data_offset += 6; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_unique_identifier, tvb, tlv_data_offset, 2, ENC_NA); tlv_data_offset += 2; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_mac, - tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); + tvb, tlv_data_offset, 6, ENC_NA); tlv_data_offset += 6; break; case ORG_SPEC_TLV: diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index f641ec689e..25950d449d 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -83,11 +83,11 @@ dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (count != 0) { proto_tree_add_item(cgmp_tree, hf_cgmp_gda, tvb, offset, 6, - FALSE); + ENC_NA); offset += 6; proto_tree_add_item(cgmp_tree, hf_cgmp_usa, tvb, offset, 6, - FALSE); + ENC_NA); offset += 6; count--; diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index c73f6830c9..b897facf76 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -165,13 +165,13 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(bpdu_tree, hf_dec_bpdu_root_pri, tvb, BPDU_ROOT_PRI, 2, ENC_BIG_ENDIAN); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_root_mac, tvb, - BPDU_ROOT_MAC, 6, ENC_BIG_ENDIAN); + BPDU_ROOT_MAC, 6, ENC_NA); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_root_cost, tvb, BPDU_ROOT_PATH_COST, 2, ENC_BIG_ENDIAN); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_bridge_pri, tvb, BPDU_BRIDGE_PRI, 2, ENC_BIG_ENDIAN); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_bridge_mac, tvb, - BPDU_BRIDGE_MAC, 6, ENC_BIG_ENDIAN); + BPDU_BRIDGE_MAC, 6, ENC_NA); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_port_id, tvb, BPDU_PORT_IDENTIFIER, 1, ENC_BIG_ENDIAN); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_msg_age, tvb, diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 0d9624eeef..83de7fd631 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -472,7 +472,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ offset += 3; ti = proto_tree_add_item(rt_tree, hf_dec_rt_dst_addr, tvb, - offset, 6, ENC_BIG_ENDIAN); + offset, 6, ENC_NA); addr = dnet_ntoa(ep_tvb_memdup(tvb, offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); @@ -483,7 +483,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ offset += 8; ti = proto_tree_add_item(rt_tree, hf_dec_rt_src_addr, tvb, - offset, 6, ENC_BIG_ENDIAN); + offset, 6, ENC_NA); addr = dnet_ntoa(ep_tvb_memdup(tvb, offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); @@ -740,7 +740,7 @@ do_hello_msg( version, eco_nr, user_eco); my_offset +=3; ti = proto_tree_add_item(tree, hf_dec_rt_id, tvb, - my_offset, 6, TRUE); + my_offset, 6, ENC_NA); addr = dnet_ntoa(ep_tvb_memdup(tvb, my_offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); @@ -784,7 +784,7 @@ do_hello_msg( my_offset, 8, ENC_NA); my_offset += 8; ti = proto_tree_add_item(tree, hf_dec_rt_neighbor, tvb, - my_offset, 6, TRUE); + my_offset, 6, ENC_NA); addr = dnet_ntoa(ep_tvb_memdup(tvb, my_offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); @@ -835,7 +835,7 @@ do_hello_msg( proto_tree *pstate_tree; ti_localb = proto_tree_add_item(list_ether, hf_dec_rt_router_id, - tvb, my_offset, 6, TRUE); + tvb, my_offset, 6, ENC_NA); addr = dnet_ntoa(ep_tvb_memdup(tvb, my_offset, 6)); if (addr != NULL) { proto_item_append_text(ti_localb, " (%s)", addr); diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 4ec68cca84..fe80424352 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -1468,7 +1468,7 @@ dissect_eigrp_ipx_extdata (proto_tree *tree, tvbuff_t *tvb, int offset) /* Decode the external route source info */ proto_tree_add_item(sub_tree, hf_eigrp_ipx_extdata_routerid, sub_tvb, - sub_offset, 6, ENC_BIG_ENDIAN); + sub_offset, 6, ENC_NA); sub_offset += 6; proto_tree_add_item(sub_tree, hf_eigrp_extdata_as, sub_tvb, sub_offset, 4, ENC_BIG_ENDIAN); @@ -1602,7 +1602,7 @@ dissect_eigrp_nexthop (proto_tree *tree, tvbuff_t *tvb, guint16 afi, int offset) ENC_NA); offset += 4; proto_tree_add_item(tree, hf_eigrp_ipx_nexthop_host, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; break; diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 67364706ba..8e060034c6 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1296,7 +1296,7 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Add each node in the list */ for( nCnt = 0, nOffset = DLR_SO_NODE_1_MAC; nCnt < nNumNodes; nCnt++ ) { - proto_tree_add_item( dlr_tree, hf_dlr_somac, tvb, nOffset, 6, ENC_BIG_ENDIAN ); + proto_tree_add_item( dlr_tree, hf_dlr_somac, tvb, nOffset, 6, ENC_NA ); nOffset += 6; proto_tree_add_item( dlr_tree, hf_dlr_soip, tvb, nOffset, 4, ENC_BIG_ENDIAN ); nOffset += 4; diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index c500717a21..064b2995e3 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -127,7 +127,7 @@ static gint dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_enttec_poll_reply_mac, tvb, - offset, 6, FALSE); + offset, 6, ENC_NA); offset += 6; proto_tree_add_item(tree, hf_enttec_poll_reply_node_type, tvb, @@ -141,7 +141,7 @@ dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_tree_add_item(tree, hf_enttec_poll_reply_switch, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + proto_tree_add_item(tree, hf_enttec_poll_reply_name, tvb, offset, 10, ENC_ASCII|ENC_NA); offset += 10; @@ -149,11 +149,11 @@ dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_tree_add_item(tree, hf_enttec_poll_reply_option, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + proto_tree_add_item(tree, hf_enttec_poll_reply_tos, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + proto_tree_add_item(tree, hf_enttec_poll_reply_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -211,7 +211,7 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) offset, 1, ENC_BIG_ENDIAN); offset += 1; - type = tvb_get_guint8(tvb, offset); + type = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_enttec_dmx_data_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -246,7 +246,7 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) } } else if (v == 0xFD) { ci++; - v = tvb_get_guint8(tvb, offset+ci); + v = tvb_get_guint8(tvb, offset+ci); dmx_data[ui] = v; dmx_data_offset[ui] = ci; ci++; @@ -265,7 +265,7 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) dmx_data_offset[ui] = ui; } dmx_data_offset[ui] = ui; - } + } if ((type == ENTTEC_DATA_TYPE_DMX || type == ENTTEC_DATA_TYPE_RLE) && global_disp_col_count > 0) { @@ -277,7 +277,7 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) ENC_NA); si = proto_item_add_subtree(hi, ett_enttec); - + row_count = (ui/global_disp_col_count) + ((ui%global_disp_col_count) == 0 ? 0 : 1); dmx_epstr = ep_strbuf_new_label(NULL); for (r=0; r < row_count;r++) { @@ -299,19 +299,19 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) } start_offset = dmx_data_offset[(r*global_disp_col_count)]; - end_offset = dmx_data_offset[(r*global_disp_col_count)+c]; + end_offset = dmx_data_offset[(r*global_disp_col_count)+c]; proto_tree_add_none_format(si,hf_enttec_dmx_data_dmx_data, tvb, - offset+start_offset, + offset+start_offset, end_offset-start_offset, string_format[global_disp_chan_nr_type], (r*global_disp_col_count)+1, dmx_epstr->str); ep_strbuf_truncate(dmx_epstr, 0); } - + item = proto_tree_add_item(si, hf_enttec_dmx_data_data_filter, tvb, offset, length, ENC_NA ); PROTO_ITEM_SET_HIDDEN(item); - + offset += length; } else if (type == ENTTEC_DATA_TYPE_CHAN_VAL) { proto_tree_add_item(tree, hf_enttec_dmx_data_data_filter, tvb, @@ -321,10 +321,10 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_tree_add_item(tree, hf_enttec_dmx_data_data_filter, tvb, offset, length, ENC_NA); offset += length; - } + } + + - - return offset; } @@ -343,7 +343,7 @@ dissect_enttec_reset(tvbuff_t *tvb _U_, guint offset, proto_tree *tree _U_) } static void -dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { gint offset = 0; guint32 head = 0; @@ -400,7 +400,7 @@ dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } void -proto_register_enttec(void) +proto_register_enttec(void) { static hf_register_info hf[] = { /* General */ @@ -554,7 +554,7 @@ proto_reg_handoff_enttec(void) { } udp_port_enttec = global_udp_port_enttec; - tcp_port_enttec = global_tcp_port_enttec; + tcp_port_enttec = global_tcp_port_enttec; dissector_add_uint("udp.port",global_udp_port_enttec,enttec_handle); dissector_add_uint("tcp.port",global_tcp_port_enttec,enttec_handle); diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index fd681b78de..8b6d431a82 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -667,7 +667,7 @@ dissect_esrp_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot offset += 4; proto_tree_add_item(esrp_tree, hf_edp_esrp_sysmac, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; proto_tree_add_item(esrp_tree, hf_edp_esrp_hello, tvb, offset, 2, @@ -718,7 +718,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_, offset += 4; proto_tree_add_item(eaps_tree, hf_edp_eaps_sysmac, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; proto_tree_add_item(eaps_tree, hf_edp_eaps_hello, tvb, offset, 2, @@ -794,7 +794,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto length -= 4; proto_tree_add_item(esl_tree, hf_edp_esl_sysmac, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; length -= 6; @@ -1041,7 +1041,7 @@ dissect_edp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; proto_tree_add_item(edp_tree, hf_edp_midmac, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; /* Decode the individual TLVs */ diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 48105c8143..d108171788 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -454,7 +454,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_fip_dt_mac); fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_mac, desc_tvb, - 2, 6, FALSE); + 2, 6, ENC_NA); proto_item_append_text(item, "%s", tvb_bytes_to_str_punct(desc_tvb, 2, 6, ':')); break; @@ -508,7 +508,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_fip_dt_vn); fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_vn_mac, desc_tvb, - 2, 6, FALSE); + 2, 6, ENC_NA); proto_tree_add_item(subtree, hf_fip_desc_vn_fid, desc_tvb, 9, 3, ENC_BIG_ENDIAN); text = tvb_fcwwn_to_str(desc_tvb, 12); diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index 953260e8f8..6cc56d5c8a 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -95,76 +95,76 @@ static gint ett_glbp = -1; static gint ett_glbp_tlv = -1; static const value_string glbp_type_vals[] = { - { 1, "Hello" }, - { 2, "Request/Response?" }, - { 3, "Auth" }, + { 1, "Hello" }, + { 2, "Request/Response?" }, + { 3, "Auth" }, - { 0, NULL } + { 0, NULL } }; #if 0 static const value_string glbp_reqresp_forwarder_vals[] = { - { 0, "Request?" }, - { 2, "Response?" }, + { 0, "Request?" }, + { 2, "Response?" }, - { 0, NULL } + { 0, NULL } }; #endif static const value_string glbp_addr_type_vals[] = { - { 1, "IPv4" }, - { 2, "IPv6" }, + { 1, "IPv4" }, + { 2, "IPv6" }, - { 0, NULL } + { 0, NULL } }; static const value_string glbp_auth_type_vals[] = { - { 0, "None" }, - { 1, "Plain text" }, - { 2, "MD5 string" }, - { 3, "MD5 chain" }, + { 0, "None" }, + { 1, "Plain text" }, + { 2, "MD5 string" }, + { 3, "MD5 chain" }, - { 0, NULL } + { 0, NULL } }; #if 0 static const value_string glbp_loadbalancing_vals[] = { - { x, "None (AVG only)" }, - { x, "Weighted" }, - { x, "Host dependent" }, - { x, "Round robin" }, + { x, "None (AVG only)" }, + { x, "Weighted" }, + { x, "Host dependent" }, + { x, "Round robin" }, - { 0, NULL } + { 0, NULL } }; #endif static const value_string glbp_vgstate_vals[] = { #if 0 - { x, "Disabled" }, - { x, "Initial" }, + { x, "Disabled" }, + { x, "Initial" }, #endif - { 4, "Listen" }, - { 8, "Speak" }, - { 0x10, "Standby" }, - { 0x20, "Active" }, + { 4, "Listen" }, + { 8, "Speak" }, + { 0x10, "Standby" }, + { 0x20, "Active" }, - { 0, NULL } + { 0, NULL } }; static const value_string glbp_vfstate_vals[] = { #if 0 - { x, "Disabled" }, - { x, "Initial" }, + { x, "Disabled" }, + { x, "Initial" }, #endif - { 4, "Listen" }, - { 0x20, "Active" }, + { 4, "Listen" }, + { 0x20, "Active" }, - { 0, NULL } + { 0, NULL } }; static int dissect_glbp_hello(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tlv_tree) + packet_info *pinfo, proto_tree *tlv_tree) { guint8 addrtype; guint8 addrlen; @@ -225,7 +225,7 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset, static int dissect_glbp_reqresp(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tlv_tree) + packet_info *pinfo _U_, proto_tree *tlv_tree) { proto_tree_add_item(tlv_tree, hf_glbp_reqresp_forwarder, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -239,7 +239,7 @@ dissect_glbp_reqresp(tvbuff_t *tvb, int offset, offset++; proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown22, tvb, offset, 7, ENC_NA); offset += 7; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_virtualmac, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_virtualmac, tvb, offset, 6, ENC_NA); offset += 6; return offset; @@ -247,7 +247,7 @@ dissect_glbp_reqresp(tvbuff_t *tvb, int offset, static int dissect_glbp_auth(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tlv_tree) + packet_info *pinfo _U_, proto_tree *tlv_tree) { guint8 authtype; guint8 authlength; @@ -283,7 +283,7 @@ dissect_glbp_auth(tvbuff_t *tvb, int offset, static int dissect_glbp_unknown(tvbuff_t *tvb, int offset, guint32 length, - packet_info *pinfo _U_, proto_tree *tlv_tree) + packet_info *pinfo _U_, proto_tree *tlv_tree) { proto_tree_add_item(tlv_tree, hf_glbp_unknown_data, tvb, offset, length, ENC_NA); offset += length; @@ -321,15 +321,15 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; proto_tree_add_item(glbp_tree, hf_glbp_unknown2, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(glbp_tree, hf_glbp_ownerid, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(glbp_tree, hf_glbp_ownerid, tvb, offset, 6, ENC_NA); offset += 6; while (tvb_length_remaining(tvb, offset) > 0) { type = tvb_get_guint8(tvb, offset); length = tvb_get_guint8(tvb, offset+1); if (length < 2) { - expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Length %u too small", length); - return offset; + expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Length %u too small", length); + return offset; } length -= 2; @@ -344,25 +344,25 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(type, glbp_type_vals, "%d")); - + lastoffset = offset; switch(type) { case 1: /* Hello */ - offset = dissect_glbp_hello(tvb, offset, pinfo, tlv_tree); - break; + offset = dissect_glbp_hello(tvb, offset, pinfo, tlv_tree); + break; case 2: /* Request/Response */ - offset = dissect_glbp_reqresp(tvb, offset, pinfo, tlv_tree); - break; + offset = dissect_glbp_reqresp(tvb, offset, pinfo, tlv_tree); + break; case 3: /* Plaintext auth */ - offset = dissect_glbp_auth(tvb, offset, pinfo, tlv_tree); - break; + offset = dissect_glbp_auth(tvb, offset, pinfo, tlv_tree); + break; default: - offset = dissect_glbp_unknown(tvb, offset, length, pinfo, tlv_tree); - break; + offset = dissect_glbp_unknown(tvb, offset, length, pinfo, tlv_tree); + break; } if (lastoffset >= offset) { - expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Zero or negative length"); - return lastoffset; + expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Zero or negative length"); + return lastoffset; } /* Skip over trailing bytes before starting with the next element */ if (lastoffset + length > offset) @@ -375,31 +375,31 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static gboolean test_glbp(tvbuff_t *tvb, packet_info *pinfo) { - guint32 unknown1; - if ( tvb_length(tvb) < 2) - return FALSE; - unknown1 = tvb_get_guint8(tvb, 1); - if (tvb_get_guint8(tvb, 0) != 1 /* version? */ - || unknown1 > 4 - || pinfo->srcport != pinfo->destport + guint32 unknown1; + if ( tvb_length(tvb) < 2) + return FALSE; + unknown1 = tvb_get_guint8(tvb, 1); + if (tvb_get_guint8(tvb, 0) != 1 /* version? */ + || unknown1 > 4 + || pinfo->srcport != pinfo->destport #if 0 /* XXX */ - || unknown1 == 0 && pinfo->net_dst != ipv4:224.0.0.102 - && pinfo->net_dst != ipv6:... - || unknown1 == 0 && pinfo->dl_src != ether:c2-00-7c-b8-00-00 + || unknown1 == 0 && pinfo->net_dst != ipv4:224.0.0.102 + && pinfo->net_dst != ipv6:... + || unknown1 == 0 && pinfo->dl_src != ether:c2-00-7c-b8-00-00 #endif - ) { - return FALSE; - } - return TRUE; + ) { + return FALSE; + } + return TRUE; } static int dissect_glbp_static(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if ( !test_glbp(tvb, pinfo) ) { - return 0; - } - return dissect_glbp(tvb, pinfo, tree); + if ( !test_glbp(tvb, pinfo) ) { + return 0; + } + return dissect_glbp(tvb, pinfo, tree); } @@ -407,162 +407,162 @@ void proto_register_glbp(void) { static hf_register_info hf[] = { - /* Header */ - { &hf_glbp_version, - { "Version?", "glbp.version", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_unknown1, - { "Unknown1", "glbp.unknown1", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_group, - { "Group", "glbp.group", FT_UINT16, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_unknown2, - { "Unknown2", "glbp.unknown2", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_ownerid, - { "Owner ID", "glbp.ownerid", FT_ETHER, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_tlv, - { "TLV", "glbp.tlv", FT_PROTOCOL, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_type, - { "Type", "glbp.type", FT_UINT8, BASE_DEC, VALS(glbp_type_vals), - 0x0, NULL, HFILL }}, - - { &hf_glbp_length, - { "Length", "glbp.length", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - /* type = 1 - hello */ - { &hf_glbp_hello_unknown10, - { "Unknown1-0", "glbp.hello.unknown10", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_vgstate, - { "VG state?", "glbp.hello.vgstate", FT_UINT8, BASE_DEC, VALS(glbp_vgstate_vals), - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_unknown11, - { "Unknown1-1", "glbp.hello.unknown11", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_priority, - { "Priority", "glbp.hello.priority", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_unknown12, - { "Unknown1-2", "glbp.hello.unknown12", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_helloint, - { "Helloint", "glbp.hello.helloint", FT_UINT32, BASE_DEC, NULL, - 0x0, "Hello interval [msec]", HFILL }}, - - { &hf_glbp_hello_holdint, - { "Holdint", "glbp.hello.holdint", FT_UINT32, BASE_DEC, NULL, - 0x0, "Hold interval [msec]", HFILL }}, - - { &hf_glbp_hello_redirect, - { "Redirect", "glbp.hello.redirect", FT_UINT16, BASE_DEC, NULL, - 0x0, "Redirect interval [sec]", HFILL }}, - - { &hf_glbp_hello_timeout, - { "Timeout", "glbp.hello.timeout", FT_UINT16, BASE_DEC, NULL, - 0x0, "Forwarder timeout interval [sec]", HFILL }}, - - { &hf_glbp_hello_unknown13, - { "Unknown1-3", "glbp.hello.unknown13", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_addrtype, - { "Address type", "glbp.hello.addrtype", FT_UINT8, BASE_DEC, VALS(glbp_addr_type_vals), - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_addrlen, - { "Address length", "glbp.hello.addrlen", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_virtualipv4, - { "Virtual IPv4", "glbp.hello.virtualipv4", FT_IPv4, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_virtualipv6, - { "Virtual IPv6", "glbp.hello.virtualipv6", FT_IPv6, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_hello_virtualunk, - { "Virtual Unknown", "glbp.hello.virtualunk", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, - - /* type = 2 - request/response??? */ - { &hf_glbp_reqresp_forwarder, - { "Forwarder?", "glbp.reqresp.forwarder", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, - - { &hf_glbp_reqresp_vfstate, - { "VF state?", "glbp.reqresp.vfstate", FT_UINT8, BASE_DEC, VALS(glbp_vfstate_vals), - 0x0, NULL, HFILL }}, + /* Header */ + { &hf_glbp_version, + { "Version?", "glbp.version", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_unknown1, + { "Unknown1", "glbp.unknown1", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_group, + { "Group", "glbp.group", FT_UINT16, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_unknown2, + { "Unknown2", "glbp.unknown2", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_ownerid, + { "Owner ID", "glbp.ownerid", FT_ETHER, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_tlv, + { "TLV", "glbp.tlv", FT_PROTOCOL, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_type, + { "Type", "glbp.type", FT_UINT8, BASE_DEC, VALS(glbp_type_vals), + 0x0, NULL, HFILL }}, + + { &hf_glbp_length, + { "Length", "glbp.length", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + /* type = 1 - hello */ + { &hf_glbp_hello_unknown10, + { "Unknown1-0", "glbp.hello.unknown10", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_vgstate, + { "VG state?", "glbp.hello.vgstate", FT_UINT8, BASE_DEC, VALS(glbp_vgstate_vals), + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_unknown11, + { "Unknown1-1", "glbp.hello.unknown11", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_priority, + { "Priority", "glbp.hello.priority", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_unknown12, + { "Unknown1-2", "glbp.hello.unknown12", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_helloint, + { "Helloint", "glbp.hello.helloint", FT_UINT32, BASE_DEC, NULL, + 0x0, "Hello interval [msec]", HFILL }}, + + { &hf_glbp_hello_holdint, + { "Holdint", "glbp.hello.holdint", FT_UINT32, BASE_DEC, NULL, + 0x0, "Hold interval [msec]", HFILL }}, + + { &hf_glbp_hello_redirect, + { "Redirect", "glbp.hello.redirect", FT_UINT16, BASE_DEC, NULL, + 0x0, "Redirect interval [sec]", HFILL }}, + + { &hf_glbp_hello_timeout, + { "Timeout", "glbp.hello.timeout", FT_UINT16, BASE_DEC, NULL, + 0x0, "Forwarder timeout interval [sec]", HFILL }}, + + { &hf_glbp_hello_unknown13, + { "Unknown1-3", "glbp.hello.unknown13", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_addrtype, + { "Address type", "glbp.hello.addrtype", FT_UINT8, BASE_DEC, VALS(glbp_addr_type_vals), + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_addrlen, + { "Address length", "glbp.hello.addrlen", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_virtualipv4, + { "Virtual IPv4", "glbp.hello.virtualipv4", FT_IPv4, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_virtualipv6, + { "Virtual IPv6", "glbp.hello.virtualipv6", FT_IPv6, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_hello_virtualunk, + { "Virtual Unknown", "glbp.hello.virtualunk", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, + + /* type = 2 - request/response??? */ + { &hf_glbp_reqresp_forwarder, + { "Forwarder?", "glbp.reqresp.forwarder", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, + + { &hf_glbp_reqresp_vfstate, + { "VF state?", "glbp.reqresp.vfstate", FT_UINT8, BASE_DEC, VALS(glbp_vfstate_vals), + 0x0, NULL, HFILL }}, - { &hf_glbp_reqresp_unknown21, - { "Unknown2-1", "glbp.reqresp.unknown21", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_reqresp_unknown21, + { "Unknown2-1", "glbp.reqresp.unknown21", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_reqresp_priority, - { "Priority", "glbp.reqresp.priority", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_reqresp_priority, + { "Priority", "glbp.reqresp.priority", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_reqresp_weight, - { "Weight", "glbp.reqresp.weight", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_reqresp_weight, + { "Weight", "glbp.reqresp.weight", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_reqresp_unknown22, - { "Unknown2-2", "glbp.reqresp.unknown22", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_reqresp_unknown22, + { "Unknown2-2", "glbp.reqresp.unknown22", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_reqresp_virtualmac, - { "Virtualmac", "glbp.reqresp.virtualmac", FT_ETHER, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_reqresp_virtualmac, + { "Virtualmac", "glbp.reqresp.virtualmac", FT_ETHER, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - /* type = 3 - auth */ - { &hf_glbp_auth_authtype, - { "Authtype", "glbp.auth.authtype", FT_UINT8, BASE_DEC, VALS(glbp_auth_type_vals), - 0x0, NULL, HFILL }}, + /* type = 3 - auth */ + { &hf_glbp_auth_authtyp e, + { "Authtype", "glbp.auth.authtype", FT_UINT8, BASE_DEC, VALS(glbp_auth_type_vals), + 0x0, NULL, HFILL }}, - { &hf_glbp_auth_authlength, - { "Authlength", "glbp.auth.authlength", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_auth_authlength, + { "Authlength", "glbp.auth.authlength", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_auth_plainpass, - { "Plain pass", "glbp.auth.plainpass", FT_STRING, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_auth_plainpass, + { "Plain pass", "glbp.auth.plainpass", FT_STRING, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_auth_md5hash, - { "MD5-string hash", "glbp.auth.md5hash", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_auth_md5hash, + { "MD5-string hash", "glbp.auth.md5hash", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_auth_md5chainindex, - { "MD5-chain index", "glbp.auth.md5chainindex", FT_UINT32, BASE_DEC, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_auth_md5chainindex, + { "MD5-chain index", "glbp.auth.md5chainindex", FT_UINT32, BASE_DEC, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_auth_md5chainhash, - { "MD5-chain hash", "glbp.auth.md5chainhash", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_auth_md5chainhash, + { "MD5-chain hash", "glbp.auth.md5chainhash", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - { &hf_glbp_auth_authunknown, - { "Unknown auth value", "glbp.auth.authunknown", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + { &hf_glbp_auth_authunknown, + { "Unknown auth value", "glbp.auth.authunknown", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, - /* type = unknown */ - { &hf_glbp_unknown_data, - { "Unknown TLV data", "glbp.unknown.data", FT_BYTES, BASE_NONE, NULL, - 0x0, NULL, HFILL }}, + /* type = unknown */ + { &hf_glbp_unknown_data, + { "Unknown TLV data", "glbp.unknown.data", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL }}, }; static gint *ett[] = { @@ -571,7 +571,7 @@ proto_register_glbp(void) }; proto_glbp = proto_register_protocol( - "Gateway Load Balancing Protocol", "GLBP", "glbp"); + "Gateway Load Balancing Protocol", "GLBP", "glbp"); proto_register_field_array(proto_glbp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index fff530a2ab..b2c70fa2cc 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -290,7 +290,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Group Membership */ proto_tree_add_item(gmrp_tree, hf_gmrp_attribute_value_group_membership, - tvb, offset, (6*sizeof(guint8)), FALSE); + tvb, offset, (6*sizeof(guint8)), ENC_NA); offset += 6*sizeof(guint8); length -= 6*sizeof(guint8); diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 0e2ffc1711..1a882fd57d 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -267,7 +267,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (packet_opcode) { case 0x04: /* Assign new temporary network configuration */ if (packet_plsize >= 48) { - proto_tree_add_item(gvcp_tree, hf_gvcp_ether, tvb, 10, 6, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_ether, tvb, 10, 6, ENC_NA); proto_tree_add_item(gvcp_tree, hf_gvcp_ip, tvb, 28, 4, ENC_BIG_ENDIAN); proto_tree_add_item(gvcp_tree, hf_gvcp_netmask, tvb, 44, 4, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index f95a03efc5..66b08755cd 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -490,7 +490,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(group_state_tlv, hf_hsrp2_group, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(group_state_tlv, hf_hsrp2_identifier, tvb, offset, 6, FALSE); + proto_tree_add_item(group_state_tlv, hf_hsrp2_identifier, tvb, offset, 6, ENC_NA); offset+=6; proto_tree_add_item(group_state_tlv, hf_hsrp2_priority, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 55f8c22a65..2fb5b04f5f 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1270,8 +1270,8 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree const gchar *link_str; /* if the opt len is 8, the Link Addr is MAC Address */ if(opt_len == 8){ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_mac, tvb, opt_offset, 6, ENC_BIG_ENDIAN); - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr_mac, tvb, opt_offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti_opt); link_str = tvb_ether_to_str(tvb, opt_offset); @@ -1303,8 +1303,8 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree const gchar *link_str; /* if the opt len is 8, the Link Addr is MAC Address */ if(opt_len == 8){ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_mac, tvb, opt_offset, 6, ENC_BIG_ENDIAN); - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr_mac, tvb, opt_offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti_opt); link_str = tvb_ether_to_str(tvb, opt_offset); diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index 5691752eb4..759d5dcf98 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -85,7 +85,7 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 length; guint8 type; tvbuff_t *next_tvb; - + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP"); col_clear(pinfo->cinfo, COL_INFO); @@ -108,14 +108,14 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Destination */ proto_tree_add_item(idp_tree, hf_idp_dnet, tvb, 6, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(idp_tree, hf_idp_dnode, tvb, 10, 6, FALSE); + proto_tree_add_item(idp_tree, hf_idp_dnode, tvb, 10, 6, ENC_NA); pinfo->destport = tvb_get_ntohs(tvb, 16); proto_tree_add_uint(idp_tree, hf_idp_dsocket, tvb, 16, 2, pinfo->destport); /* Source */ proto_tree_add_item(idp_tree, hf_idp_snet, tvb, 18, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(idp_tree, hf_idp_snode, tvb, 22, 6, FALSE); + proto_tree_add_item(idp_tree, hf_idp_snode, tvb, 22, 6, ENC_NA); pinfo->srcport = tvb_get_ntohs(tvb, 28); proto_tree_add_uint(idp_tree, hf_idp_ssocket, tvb, 28, 2, pinfo->srcport); diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index e894638d49..5765ecd0f8 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -510,7 +510,7 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wlan_tree, hf_wlan_drops, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; if (tree) - proto_tree_add_item(wlan_tree, hf_wlan_receiver_addr, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(wlan_tree, hf_wlan_receiver_addr, tvb, offset, 6, ENC_NA); offset+=6; if (tree) proto_tree_add_item(wlan_tree, hf_wlan_padding, tvb, offset, 2, ENC_NA); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 919c43cb44..9af5d2b59c 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -1210,34 +1210,34 @@ static const value_string anqp_info_id_vals[] = /* IEEE 802.11v - WNM Action field values */ enum wnm_action { - WNM_EVENT_REQ = 0, - WNM_EVENT_REPORT = 1, - WNM_DIAGNOSTIC_REQ = 2, - WNM_DIAGNOSTIC_REPORT = 3, - WNM_LOCATION_CFG_REQ = 4, - WNM_LOCATION_CFG_RESP = 5, - WNM_BSS_TRANS_MGMT_QUERY = 6, - WNM_BSS_TRANS_MGMT_REQ = 7, - WNM_BSS_TRANS_MGMT_RESP = 8, - WNM_FMS_REQ = 9, - WNM_FMS_RESP = 10, - WNM_COLLOCATED_INTERFERENCE_REQ = 11, - WNM_COLLOCATED_INTERFERENCE_REPORT = 12, - WNM_TFS_REQ = 13, - WNM_TFS_RESP = 14, - WNM_TFS_NOTIFY = 15, - WNM_SLEEP_MODE_REQ = 16, - WNM_SLEEP_MODE_RESP = 17, - WNM_TIM_BROADCAST_REQ = 18, - WNM_TIM_BROADCAST_RESP = 19, - WNM_QOS_TRAFFIC_CAPAB_UPDATE = 20, - WNM_CHANNEL_USAGE_REQ = 21, - WNM_CHANNEL_USAGE_RESP = 22, - WNM_DMS_REQ = 23, - WNM_DMS_RESP = 24, - WNM_TIMING_MEASUREMENT_REQ = 25, - WNM_NOTIFICATION_REQ = 26, - WNM_NOTIFICATION_RESP = 27 + WNM_EVENT_REQ = 0, + WNM_EVENT_REPORT = 1, + WNM_DIAGNOSTIC_REQ = 2, + WNM_DIAGNOSTIC_REPORT = 3, + WNM_LOCATION_CFG_REQ = 4, + WNM_LOCATION_CFG_RESP = 5, + WNM_BSS_TRANS_MGMT_QUERY = 6, + WNM_BSS_TRANS_MGMT_REQ = 7, + WNM_BSS_TRANS_MGMT_RESP = 8, + WNM_FMS_REQ = 9, + WNM_FMS_RESP = 10, + WNM_COLLOCATED_INTERFERENCE_REQ = 11, + WNM_COLLOCATED_INTERFERENCE_REPORT = 12, + WNM_TFS_REQ = 13, + WNM_TFS_RESP = 14, + WNM_TFS_NOTIFY = 15, + WNM_SLEEP_MODE_REQ = 16, + WNM_SLEEP_MODE_RESP = 17, + WNM_TIM_BROADCAST_REQ = 18, + WNM_TIM_BROADCAST_RESP = 19, + WNM_QOS_TRAFFIC_CAPAB_UPDATE = 20, + WNM_CHANNEL_USAGE_REQ = 21, + WNM_CHANNEL_USAGE_RESP = 22, + WNM_DMS_REQ = 23, + WNM_DMS_RESP = 24, + WNM_TIMING_MEASUREMENT_REQ = 25, + WNM_NOTIFICATION_REQ = 26, + WNM_NOTIFICATION_RESP = 27 }; static const value_string wnm_action_codes[] = @@ -3335,7 +3335,7 @@ dissect_vendor_action_marvell(proto_tree *tree, tvbuff_t *tvb, int offset) offset++; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_rreqid, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; - proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_sa, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_sa, tvb, offset, 6, ENC_NA); offset+= 6; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_ssn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; @@ -3347,7 +3347,7 @@ dissect_vendor_action_marvell(proto_tree *tree, tvbuff_t *tvb, int offset) offset++; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_da, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_da, tvb, offset, 6, ENC_NA); offset+= 6; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_dsn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; @@ -3361,7 +3361,7 @@ dissect_vendor_action_marvell(proto_tree *tree, tvbuff_t *tvb, int offset) offset++; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_ttl, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_da, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_da, tvb, offset, 6, ENC_NA); offset+= 6; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_dsn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; @@ -3369,7 +3369,7 @@ dissect_vendor_action_marvell(proto_tree *tree, tvbuff_t *tvb, int offset) offset+= 4; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_metric, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; - proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_sa, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_sa, tvb, offset, 6, ENC_NA); offset+= 6; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_ssn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; @@ -3381,7 +3381,7 @@ dissect_vendor_action_marvell(proto_tree *tree, tvbuff_t *tvb, int offset) offset++; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_dstcount, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_da, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_da, tvb, offset, 6, ENC_NA); offset+= 6; proto_tree_add_item (tree, hf_ieee80211_ff_marvell_mesh_mgt_dsn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; @@ -4270,7 +4270,7 @@ static guint add_ff_current_ap_addr(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_current_ap, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); return 6; } @@ -4432,15 +4432,15 @@ add_ff_mesh_control(proto_tree *tree, tvbuff_t *tvb, int offset) switch (tvb_get_guint8(tvb, offset) & 0x03) { case 1: proto_tree_add_item(tree, hf_ieee80211_ff_mesh_addr4, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; break; case 2: proto_tree_add_item(tree, hf_ieee80211_ff_mesh_addr5, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; proto_tree_add_item(tree, hf_ieee80211_ff_mesh_addr6, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; break; case 3: @@ -4474,7 +4474,7 @@ static guint add_ff_dst_mac_addr(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_dst_mac_addr, tvb, offset, 6, - ENC_LITTLE_ENDIAN); + ENC_NA); return 6; } @@ -4482,7 +4482,7 @@ static guint add_ff_src_mac_addr(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_src_mac_addr, tvb, offset, 6, - ENC_LITTLE_ENDIAN); + ENC_NA); return 6; } @@ -5378,7 +5378,7 @@ static guint add_ff_sta_address(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_sta_address, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); return 6; } @@ -5386,7 +5386,7 @@ static guint add_ff_target_ap_address(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_target_ap_address, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); return 6; } @@ -6698,11 +6698,11 @@ dissect_link_identifier(proto_tree *tree, tvbuff_t *tvb, int offset, } proto_tree_add_item(tree, hf_ieee80211_tag_link_id_bssid, tvb, - offset, 6, ENC_BIG_ENDIAN); + offset, 6, ENC_NA); proto_tree_add_item(tree, hf_ieee80211_tag_link_id_init_sta, tvb, - offset + 6, 6, ENC_BIG_ENDIAN); + offset + 6, 6, ENC_NA); proto_tree_add_item(tree, hf_ieee80211_tag_link_id_resp_sta, tvb, - offset + 12, 6, ENC_BIG_ENDIAN); + offset + 12, 6, ENC_NA); } static void @@ -7570,7 +7570,7 @@ dissect_interworking(packet_info *pinfo, proto_tree *tree, proto_item *item, if (len == 1 + 6 || len == 1 + 2 + 6) { proto_tree_add_item(tree, hf_ieee80211_tag_interworking_hessid, - tvb, offset, 6, ENC_BIG_ENDIAN); + tvb, offset, 6, ENC_NA); offset += 6; } @@ -8235,10 +8235,10 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off switch (type) { case 0: - proto_tree_add_item(tree, hf_ieee80211_tclas_src_mac_addr, tvb, offset, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tclas_src_mac_addr, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(tree, hf_ieee80211_tclas_dst_mac_addr, tvb, offset, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tclas_dst_mac_addr, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(tree, hf_ieee80211_tclas_ether_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); @@ -9317,13 +9317,13 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off offset += 1; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_pdid, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_sta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_sta, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_sn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if (flags & (1<<6)) { - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_ext, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_ext, tvb, offset, 6, ENC_NA); offset += 6; } proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_lifetime, tvb, offset, 4, ENC_LITTLE_ENDIAN); @@ -9339,7 +9339,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_boolean(subtree, hf_ieee80211_ff_hwmp_targ_to_flags, tvb, offset, 1, flags); proto_tree_add_boolean(subtree, hf_ieee80211_ff_hwmp_targ_usn_flags, tvb, offset, 1, flags); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sta, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -9357,19 +9357,19 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off offset += 1; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_ttl, tvb, offset , 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sta, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if (flags & (1<<6)) { - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_ext, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_ext, tvb, offset, 6, ENC_NA); offset += 6; } proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_lifetime, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_metric, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_sta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_sta, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_orig_sn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -9391,12 +9391,12 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sta, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_sn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if (flags & (1<<6)) { - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_ext, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_ext, tvb, offset, 6, ENC_NA); offset += 6; } offset += add_fixed_field(tree, tvb, offset, FIELD_REASON_CODE); @@ -9413,7 +9413,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off offset += 1; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_rann_root_sta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_rann_root_sta, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item (tree, hf_ieee80211_rann_sn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -10210,7 +10210,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, src = tvb_get_ptr (tvb, offset, 6); set_src_addr_cols(pinfo, src, "BSSID"); if (tree) { - proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); } break; } @@ -10220,7 +10220,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, src = tvb_get_ptr (tvb, offset, 6); set_src_addr_cols(pinfo, src, "TA"); if (tree) { - proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); } break; } @@ -10243,7 +10243,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_item *bar_parent_item; proto_tree *bar_sub_tree; - proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); offset += 6; bar_control = tvb_get_letohs(tvb, offset); @@ -10331,7 +10331,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_item *ba_parent_item; proto_tree *ba_sub_tree; - proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA); offset += 6; ba_control = tvb_get_letohs(tvb, offset); @@ -15964,32 +15964,32 @@ proto_register_ieee80211 (void) NULL, 0, "TCLAS Processing", HFILL }}, {&hf_ieee80211_qos_info_field_vo_uapsd, - {"AC_VO U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.vo_uapsd", + {"AC_VO U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.vo_uapsd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_vi_uapsd, - {"AC_VI U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.vi_uapsd", + {"AC_VI U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.vi_uapsd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_bk_uapsd, - {"AC_BK U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.bk_uapsd", + {"AC_BK U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.bk_uapsd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_be_uapsd, - {"AC_BE U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.be_uapsd", + {"AC_BE U-APSD Flag", "wlan_mgt.tag.qos_cap.qos_info.be_uapsd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_qack, - {"Q-ACK", "wlan_mgt.tag.qos_cap.qos_info.qack", + {"Q-ACK", "wlan_mgt.tag.qos_cap.qos_info.qack", FT_BOOLEAN, 8, TFS(&qos_info_field_qack_flags), 0x10, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_max_sp_length, - {"Max SP-Lenght", "wlan_mgt.tag.qos_cap.qos_info.max_sp_length", + {"Max SP-Lenght", "wlan_mgt.tag.qos_cap.qos_info.max_sp_length", FT_UINT8, BASE_HEX, VALS(qos_info_field_max_sp_lenght_flags), 0x60, NULL , HFILL }}, {&hf_ieee80211_qos_info_field_more_data_ack, - {"More Data Ack", "wlan_mgt.tag.qos_cap.qos_info.more_data_ack", + {"More Data Ack", "wlan_mgt.tag.qos_cap.qos_info.more_data_ack", FT_BOOLEAN, 8, TFS(&qos_info_field_more_data_ack_flags) , 0x80, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_edca_upd_cnt, diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index f9f5654cee..0dbf15b8cc 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -630,7 +630,7 @@ static const value_string serial30_snoopctl_vals[] = { { 0, NULL } }; -static const value_string serial30_negoctl_vals[] = { +static const value_string serial30_negoctl_vals[] = { { 0x00, "On initial connection and mux switch" }, { 0x01, "On initial connection" }, { 0x02, "Never" }, @@ -760,7 +760,7 @@ lan_04(tvbuff_t *tvb, proto_tree *tree) static void lan_05(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan05_ether, tvb, 0, 6, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan05_ether, tvb, 0, 6, ENC_NA); } static void @@ -815,7 +815,7 @@ lan_12(tvbuff_t *tvb, proto_tree *tree) static void lan_13(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan13_def_gw_mac, tvb, 0, 6, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan13_def_gw_mac, tvb, 0, 6, ENC_NA); } static void @@ -827,7 +827,7 @@ lan_14(tvbuff_t *tvb, proto_tree *tree) static void lan_15(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan15_bkp_gw_mac, tvb, 0, 6, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan15_bkp_gw_mac, tvb, 0, 6, ENC_NA); } static void @@ -872,7 +872,7 @@ lan_19(tvbuff_t *tvb, proto_tree *tree) if (v == 0) { proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan19_byte3, byte3, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_trn_lan19_ip, tvb, 3, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_lan19_mac, tvb, 7, 6, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_lan19_mac, tvb, 7, 6, ENC_NA); return; } @@ -1285,7 +1285,7 @@ serial_10(tvbuff_t *tvb, proto_tree *tree) static void serial_11(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial11_esc_seq, tvb, 0, 5, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial11_esc_seq, tvb, 0, 5, ENC_ASCII|ENC_NA); } static void diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index f847f596fe..de1c31e2f7 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -288,7 +288,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { proto_tree_add_item(option_tree, hf_ipxwan_node_number, tvb, - offset, 6, FALSE); + offset, 6, ENC_NA); } break; diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 5ae141d0d9..8740b4e3bc 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -161,8 +161,8 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) "ISL"); fh_tree = proto_item_add_subtree(ti, ett_isl); - ti = proto_tree_add_item(fh_tree, hf_isl_dst, tvb, 0, 6, FALSE); - hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 0, 6, FALSE); + ti = proto_tree_add_item(fh_tree, hf_isl_dst, tvb, 0, 6, ENC_NA); + hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 0, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); dst_tree = proto_item_add_subtree(ti, ett_isl_dst); proto_tree_add_item(dst_tree, hf_isl_type, tvb, 5, 1, ENC_BIG_ENDIAN); @@ -179,8 +179,8 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) proto_tree_add_item(dst_tree, hf_isl_user, tvb, 5, 1, ENC_BIG_ENDIAN); break; } - proto_tree_add_item(fh_tree, hf_isl_src, tvb, 6, 6, FALSE); - hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 6, 6, FALSE); + proto_tree_add_item(fh_tree, hf_isl_src, tvb, 6, 6, ENC_NA); + hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 6, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); } length = tvb_get_ntohs(tvb, 12); diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 3e1d80d296..8b1a2169b6 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -267,11 +267,11 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp offset += 2; proto_tree_add_item(edp_tree, hf_ismp_edp_module_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(edp_tree, hf_ismp_edp_module_mac, tvb, offset, 6, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_module_mac, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(edp_tree, hf_ismp_edp_module_port, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_mac, tvb, offset, 6, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_mac, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index dd658e9d08..466149591d 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -1532,7 +1532,7 @@ dissect_tlv_mac(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); for(ix=1; rem >= 6; ix++, offset += 6, rem -= 6) { - proto_tree_add_item(val_tree, hf_ldp_tlv_mac, tvb, offset, 6, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_mac, tvb, offset, 6, ENC_NA); } if (rem) proto_tree_add_text(val_tree, tvb, offset, rem, diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 680b8480a0..8d829f2009 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -413,8 +413,8 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* MEDIA ADDRESS */ if (size == 6) { /* Most likely ETHERNET */ - proto_tree_add_item(conn_header_tree, hf_linx_conn_dstmac, linx_tvb, offset, 6, FALSE); - proto_tree_add_item(conn_header_tree, hf_linx_conn_srcmac, linx_tvb, offset + 6, 6, FALSE); + proto_tree_add_item(conn_header_tree, hf_linx_conn_dstmac, linx_tvb, offset, 6, ENC_NA); + proto_tree_add_item(conn_header_tree, hf_linx_conn_srcmac, linx_tvb, offset + 6, 6, ENC_NA); } offset += (2*size); diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index 81907b7bec..de5256a4a6 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -85,7 +85,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(function, function_vals, "Unknown function (%u)")); } if (tree) - proto_tree_add_text(loop_tree, tvb, offset, 2, "Relevant function:"); + proto_tree_add_text(loop_tree, tvb, offset, 2, "Relevant function:"); set_info = FALSE; } if (tree) @@ -104,7 +104,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case FUNC_FORWARD_DATA: if (tree) proto_tree_add_item(loop_tree, hf_loop_forwarding_address, tvb, offset, - 6, FALSE); + 6, ENC_NA); offset += 6; more_function = TRUE; break; diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index b40fdc6aa4..c32bbb597c 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -329,7 +329,7 @@ dissect_msrp_talker_common(proto_tree *first_value_tree, tvbuff_t *tvb, int msg_ { proto_tree_add_item(first_value_tree, hf_msrp_stream_da, tvb, - MSRP_STREAM_DA_OFFSET + msg_offset, 6, FALSE); + MSRP_STREAM_DA_OFFSET + msg_offset, 6, ENC_NA); proto_tree_add_item(first_value_tree, hf_msrp_vlan_id, tvb, MSRP_VLAN_ID_OFFSET + msg_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_tspec_max_frame_size, tvb, @@ -543,7 +543,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vect_attr_ti = proto_tree_add_item(attr_list_tree, hf_msrp_vector_attribute, tvb, MSRP_VECTOR_ATTRIBUTE_GROUP_OFFSET + msg_offset + vect_offset, vect_attr_len, ENC_NA); - + vect_attr_tree = proto_item_add_subtree(vect_attr_ti, ett_vect_attr); dissect_msrp_common2(vect_attr_tree, tvb, msg_offset + vect_offset); diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 6d77f15c55..f2d7413695 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -2346,7 +2346,7 @@ print_address(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) { case 0x00000000: proto_tree_add_item(ndps_tree, hf_ndps_net, tvb, foffset, 4, ENC_NA); - proto_tree_add_item(ndps_tree, hf_ndps_node, tvb, foffset+4, 6, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_node, tvb, foffset+4, 6, ENC_NA); proto_tree_add_item(ndps_tree, hf_ndps_socket, tvb, foffset+10, 2, ENC_BIG_ENDIAN); break; case 0x00000001: diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index d767605134..89f7c22aca 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -156,11 +156,11 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_item(prp_tree, hf_prp_supervision_frame_source_mac_address_A, tvb, PRP_SOURCEMACADDRESSA_OFFSET, PRP_SOURCE_LENGTH, - FALSE); + ENC_NA); proto_tree_add_item(prp_tree, hf_prp_supervision_frame_source_mac_address_B, tvb, PRP_SOURCEMACADDRESSB_OFFSET, PRP_SOURCE_LENGTH, - FALSE); + ENC_NA); tlv2 = tvb_get_ntohs(tvb, PRP_TYPE2_OFFSET); @@ -177,13 +177,13 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre { proto_tree_add_item(prp_tree, hf_prp_supervision_frame_red_box_mac_address, tvb, PRP_REDBOXVDANMACADDRESS_OFFSET, PRP_SOURCE_LENGTH, - FALSE); + ENC_NA); } else { proto_tree_add_item(prp_tree, hf_prp_supervision_frame_vdan_mac_address, tvb, PRP_REDBOXVDANMACADDRESS_OFFSET, PRP_SOURCE_LENGTH, - FALSE); + ENC_NA); } } diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 591ff6d77b..8811502edd 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1622,7 +1622,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ptp_sourcecommunicationtechnology, tvb, PTP_SOURCECOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sourceuuid, tvb, PTP_SOURCEUUID_OFFSET, 6, FALSE); + hf_ptp_sourceuuid, tvb, PTP_SOURCEUUID_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_sourceportid, tvb, PTP_SOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1695,7 +1695,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_SDR_GRANDMASTERCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_grandmasterclockuuid, tvb, PTP_SDR_GRANDMASTERCLOCKUUID_OFFSET, 6, FALSE); + hf_ptp_sdr_grandmasterclockuuid, tvb, PTP_SDR_GRANDMASTERCLOCKUUID_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterportid, tvb, PTP_SDR_GRANDMASTERPORTID_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1739,7 +1739,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_SDR_PARENTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_parentuuid, tvb, PTP_SDR_PARENTUUID_OFFSET, 6, FALSE); + hf_ptp_sdr_parentuuid, tvb, PTP_SDR_PARENTUUID_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_sdr_parentportfield, tvb, PTP_SDR_PARENTPORTFIELD_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1799,7 +1799,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_DR_REQUESTINGSOURCECOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_dr_requestingsourceuuid, tvb, PTP_DR_REQUESTINGSOURCEUUID_OFFSET, 6, FALSE); + hf_ptp_dr_requestingsourceuuid, tvb, PTP_DR_REQUESTINGSOURCEUUID_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_dr_requestingsourceportid, tvb, PTP_DR_REQUESTINGSOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1814,7 +1814,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_TARGETCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_mm_targetuuid, tvb, PTP_MM_TARGETUUID_OFFSET, 6, FALSE); + hf_ptp_mm_targetuuid, tvb, PTP_MM_TARGETUUID_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_targetportid, tvb, PTP_MM_TARGETPORTID_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1839,7 +1839,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_CLOCK_IDENTITY_CLOCKCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_clockuuidfield, tvb, - PTP_MM_CLOCK_IDENTITY_CLOCKUUIDFIELD_OFFSET, 6, FALSE); + PTP_MM_CLOCK_IDENTITY_CLOCKUUIDFIELD_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_clockportfield, tvb, PTP_MM_CLOCK_IDENTITY_CLOCKPORTFIELD_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1864,7 +1864,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockuuidfield, tvb, - PTP_MM_DEFAULT_DATA_SET_CLOCKUUIDFIELD_OFFSET, 6, FALSE); + PTP_MM_DEFAULT_DATA_SET_CLOCKUUIDFIELD_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockportfield, tvb, PTP_MM_DEFAULT_DATA_SET_CLOCKPORTFIELD_OFFSET, 2, ENC_BIG_ENDIAN); @@ -1981,7 +1981,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentuuid, tvb, - PTP_MM_PARENT_DATA_SET_PARENTUUID_OFFSET, 6, FALSE); + PTP_MM_PARENT_DATA_SET_PARENTUUID_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentportid, tvb, PTP_MM_PARENT_DATA_SET_PARENTPORTID_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2017,7 +2017,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasteruuidfield, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERUUIDFIELD_OFFSET, 6, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERUUIDFIELD_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasterportidfield, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERPORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2059,7 +2059,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PORT_DATA_SET_PORTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_portuuidfield, tvb, - PTP_MM_PORT_DATA_SET_PORTUUIDFIELD_OFFSET, 6, FALSE); + PTP_MM_PORT_DATA_SET_PORTUUIDFIELD_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_portidfield, tvb, PTP_MM_PORT_DATA_SET_PORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2155,7 +2155,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_foreignmasteruuidfield, tvb, - PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERUUIDFIELD_OFFSET, 6, FALSE); + PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERUUIDFIELD_OFFSET, 6, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_foreignmasterportidfield, tvb, PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERPORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 9ff4f199f1..d42418d032 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -76,9 +76,9 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) retix_bpdu_tree = proto_item_add_subtree(ti, ett_retix_bpdu); } - proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_root_mac, tvb, 0, 6, FALSE); + proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_root_mac, tvb, 0, 6, ENC_NA); - proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_bridge_mac, tvb, 10, 6, FALSE); + proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_bridge_mac, tvb, 10, 6, ENC_NA); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_max_age, tvb, 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_hello_time, tvb, 22, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index c46f48a35d..2eb81764f9 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -169,7 +169,7 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x4006: proto_tree_add_item(tree, hf_rpl_lmac, - tvb, offset, 6, FALSE); + tvb, offset, 6, ENC_NA); offset += 6; break; @@ -199,7 +199,7 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x400c: proto_tree_add_item(tree, hf_rpl_smac, - tvb, offset, 6, FALSE); + tvb, offset, 6, ENC_NA); offset += 6; break; diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 79ba46c79c..64da967374 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -382,11 +382,11 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 8; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_dmac, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_smac, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; switch (type) { diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 1a909969f0..38ffd9de57 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -26,7 +26,7 @@ /* This dissector was written entirely from reverse engineering captured * packets. No documentation was used or supplied by Karlnet. Hence, this * dissector is very incomplete. If you have any insight into decoding - * these packets, or if you can supply packet captures from turbocell + * these packets, or if you can supply packet captures from turbocell * networks, contact kiltedtaco@xxxxxxxxx */ /* 2008-08-05 : Added support for aggregate frames. @@ -155,15 +155,15 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* it seem when we have this magic number,that means an alternate header version */ - if (tvb_get_bits64(tvb, 64,48,FALSE) != G_GINT64_CONSTANT(0x000001fe23dc45ba)){ + if (tvb_get_bits64(tvb, 64,48,FALSE) != G_GINT64_CONSTANT(0x000001fe23dc45ba)){ proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x02, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x04, 6, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x04, 6, ENC_NA); proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x0A, 3, ENC_BIG_ENDIAN); } else { proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x02, 3, ENC_BIG_ENDIAN); proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x05, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x08, 6, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x08, 6, ENC_NA); } proto_tree_add_item(turbocell_tree, hf_turbocell_unknown, tvb, 0x0E, 2, ENC_BIG_ENDIAN); @@ -184,7 +184,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre network_tree = proto_item_add_subtree(name_item, ett_network); str_name=tvb_get_ephemeral_stringz(tvb, 0x14, &str_len); - if (check_col (pinfo->cinfo, COL_INFO) && str_len > 0) + if (check_col (pinfo->cinfo, COL_INFO) && str_len > 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Network=\"%s\"",format_text(str_name, str_len-1)); while(tvb_get_guint8(tvb, 0x34 + 8*i)==0x00 && (tvb_length_remaining(tvb,0x34 + 8*i) > 6) && (i<32)) { @@ -340,11 +340,11 @@ void proto_register_turbocell(void) }; proto_turbocell = proto_register_protocol("Turbocell Header", "Turbocell", "turbocell"); - + proto_aggregate = proto_register_protocol("Turbocell Aggregate Data", "Turbocell Aggregate Data", "turbocell_aggregate"); proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields)); - + register_dissector("turbocell", dissect_turbocell, proto_turbocell); proto_register_field_array(proto_turbocell, hf, array_length(hf)); diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index d763000510..40d3f6f92a 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -317,8 +317,8 @@ dissect_addid(tvbuff_t *tvb, guint offset, proto_tree *tree) mac_item = proto_tree_add_string(tree, hf_wai_addid, tvb, offset, 12, "AE MAC and ASUE MAC addresses"); mac_tree = proto_item_add_subtree(mac_item, ett_wai_mac); - proto_tree_add_item(mac_tree, hf_wai_ae_mac, tvb, offset, 6, FALSE); - proto_tree_add_item(mac_tree, hf_wai_asue_mac, tvb, offset+6, 6, FALSE); + proto_tree_add_item(mac_tree, hf_wai_ae_mac, tvb, offset, 6, ENC_NA); + proto_tree_add_item(mac_tree, hf_wai_asue_mac, tvb, offset+6, 6, ENC_NA); } static guint16 diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 222f9ab05b..be875db6a1 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -945,7 +945,7 @@ dissect_wassp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (subtype) { case 1: proto_tree_add_item(wassp_tree, hf_wassp_ether, tvb, offset, 6, - ENC_BIG_ENDIAN); + ENC_NA); offset += 6; break; case 2: @@ -959,11 +959,11 @@ dissect_wassp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wassp_tree, hf_wassp_seqno, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + proto_tree_add_item(wassp_tree, hf_wassp_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + proto_tree_add_item(wassp_tree, hf_wassp_sessionid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 7ac4ba2e02..72e47d638e 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -418,7 +418,7 @@ static void dissect_device_id(proto_item *tlv_root, proto_item *tlv_item, { guint8 addr[6]; proto_tree_add_item(tlv_root, hf_p2p_attr_device_id, tvb, - offset + 3, 6, FALSE); + offset + 3, 6, ENC_NA); tvb_memcpy(tvb, addr, offset + 3, 6); proto_item_append_text(tlv_item, ": %s", ether_to_str(addr)); } @@ -517,7 +517,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, s_offset = offset + 3; proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_p2p_dev_addr, tvb, - s_offset, 6, FALSE); + s_offset, 6, ENC_NA); s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods, @@ -622,7 +622,7 @@ static void dissect_intended_interface_addr(proto_item *tlv_root, { guint8 addr[6]; proto_tree_add_item(tlv_root, hf_p2p_attr_intended_interface_addr, tvb, - offset + 3, 6, FALSE); + offset + 3, 6, ENC_NA); tvb_memcpy(tvb, addr, offset + 3, 6); proto_item_append_text(tlv_item, ": %s", ether_to_str(addr)); } @@ -651,7 +651,7 @@ static void dissect_wifi_p2p_group_id(proto_item *tlv_root, s_offset = offset + 3; proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_dev_addr, tvb, - s_offset, 6, FALSE); + s_offset, 6, ENC_NA); tvb_memcpy(tvb, addr, offset + 3, 6); proto_item_append_text(tlv_item, ": %s", ether_to_str(addr)); s_offset += 6; @@ -675,7 +675,7 @@ static void dissect_wifi_p2p_group_bssid(packet_info *pinfo, s_offset = offset + 3; proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_bssid, tvb, - s_offset, 6, FALSE); + s_offset, 6, ENC_NA); tvb_memcpy(tvb, addr, offset + 3, 6); proto_item_append_text(tlv_item, ": %s", ether_to_str(addr)); } @@ -748,11 +748,11 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, next_offset = s_offset + ci_len; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_p2p_dev_addr, tvb, s_offset, - 6, FALSE); + 6, ENC_NA); s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_p2p_iface_addr, tvb, s_offset, - 6, FALSE); + 6, ENC_NA); s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab, tvb, s_offset, 1, diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 073a1c0c76..625c93c1c9 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -820,10 +820,10 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_ntohs(tvb, 2); proto_tree_add_item(wlccp_tree, hf_wlccp_dstmac, - tvb, 4, 6, ENC_BIG_ENDIAN); + tvb, 4, 6, ENC_NA); proto_tree_add_item(wlccp_tree, hf_wlccp_srcmac, - tvb, 10, 6, ENC_BIG_ENDIAN); + tvb, 10, 6, ENC_NA); if(type == 0x4081) { proto_tree_add_item(wlccp_tree, hf_wlccp_ipv4_address, @@ -1148,7 +1148,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_responder_node_type, @@ -1156,7 +1156,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; proto_tree_add_item(_tree, hf_wlccp_responder, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; if(_relay_flag) @@ -1166,7 +1166,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; proto_tree_add_item(_tree, hf_wlccp_relay_node_id, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; } /* if _relay_flag */ @@ -1178,7 +1178,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x01: { proto_tree_add_item(_tree, hf_wlccp_scm_hop_address, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; /* Decode the SCM Flags Field */ @@ -1244,7 +1244,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* End Decode the SCM Bridge Priority Flags Field */ proto_tree_add_item(_tree, hf_wlccp_scm_node_id, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_scm_unknown_short, @@ -1331,7 +1331,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; proto_tree_add_item(_tree, hf_wlccp_requ_node_id, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; /*kan - according to the patent applicatoin these fields vary based @@ -1415,7 +1415,7 @@ handle things. To be investigated further */ _offset += 2; proto_tree_add_item(_tree, hf_wlccp_requ_node_id, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; /*kan - there's a reserved alignment byte right here*/ @@ -1526,7 +1526,7 @@ static guint dissect_wlccp_rrm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_responder_node_type, @@ -1534,7 +1534,7 @@ static guint dissect_wlccp_rrm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; proto_tree_add_item(_tree, hf_wlccp_responder, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; @@ -1650,7 +1650,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_responder_node_type, @@ -1658,7 +1658,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _offset += 2; proto_tree_add_item(_tree, hf_wlccp_responder, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; @@ -1717,7 +1717,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _offset += 2; proto_tree_add_item(_wlccp_ap_node_id_tree, hf_wlccp_ap_node_id_address, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _offset += 6; break; @@ -2125,13 +2125,13 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_dest_node_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_supp_node_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_NA); _offset += 6; /* skip unused bytes */ @@ -2155,13 +2155,13 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_dest_node_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_src_node_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_src_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_src_node_id, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, ENC_BIG_ENDIAN); @@ -2211,13 +2211,13 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_dest_node_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_supp_node_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_NA); @@ -2274,10 +2274,10 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_sta_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_NA); _offset += 6; break; @@ -2341,7 +2341,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off for (_counter=0; _counter < _count; _counter++) { - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; } /* for _counter=0 */ @@ -2393,10 +2393,10 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_fr_elems_tree, hf_wlccp_rss, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_fr_elems_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_fr_elems_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; - proto_tree_add_item(_fr_elems_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_fr_elems_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_NA); _offset += 6; } /* for _counter=0 */ @@ -2552,7 +2552,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_phy_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_beacon_interval, _tvb, _offset, 2, ENC_BIG_ENDIAN); @@ -2676,10 +2676,10 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_NA); _offset += 6; } /* for _counter=0 */ @@ -2709,7 +2709,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, ENC_BIG_ENDIAN); @@ -2750,7 +2750,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_mfpflags, _tvb, _offset, 2, ENC_BIG_ENDIAN); @@ -2824,13 +2824,13 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs proto_item_append_text(_ti, " nmClientEventIntoWDS"); - proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, ENC_BIG_ENDIAN); @@ -2864,13 +2864,13 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs { proto_item_append_text(_ti, " nmClientEventOutOfWDS"); - proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_wds_reason, _tvb, _offset, 1, ENC_BIG_ENDIAN); @@ -2886,13 +2886,13 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs { proto_item_append_text(_ti, " nmClientEventIntraWDS"); - proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, ENC_BIG_ENDIAN); @@ -2915,13 +2915,13 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs { proto_item_append_text(_ti, " nmClientEventIPAddressUpdate"); - proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_NA); _offset += 6; /* skip some unused bytes */ @@ -2941,13 +2941,13 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs proto_item_append_text(_ti, " nmClientEventRefresh"); - proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_NA); _offset += 6; proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 3129662e65..3c6d4f4368 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1126,7 +1126,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_MAC_ADDRESS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_mac_address, tvb, offset+4, 6, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_mac_address, tvb, offset+4, 6, ENC_NA); hfindex = hf_eapwps_tlv_mac_address; break; @@ -1470,7 +1470,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_subcategory[dev_cat-1], tvb, offset+10, 2, FALSE); } } - + break; case WPS_TLV_TYPE_SECONDARY_DEVICE_TYPE_LIST: |