diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-26 17:02:33 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-26 17:02:33 +0000 |
commit | 3939bdac383f08e26aae314ddd9320cb65d57eb4 (patch) | |
tree | c1af08f356c9ce0bb18c7e1c1ac34e9d295fb067 | |
parent | d7f8619488a9d71202f42d32a5398cebb1f6cb52 (diff) |
Replace TRUE/FALSE with the new ENCAP stuff where appropriate
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38746 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | epan/dissectors/packet-3com-njack.c | 54 | ||||
-rw-r--r-- | epan/dissectors/packet-airopeek.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-cisco-erspan.c | 30 | ||||
-rw-r--r-- | epan/dissectors/packet-cisco-wids.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-extreme.c | 124 | ||||
-rw-r--r-- | epan/dissectors/packet-glbp.c | 78 | ||||
-rw-r--r-- | epan/dissectors/packet-ipsec-tcp.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-mndp.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-skinny.c | 1086 | ||||
-rw-r--r-- | epan/dissectors/packet-tapa.c | 60 | ||||
-rw-r--r-- | epan/dissectors/packet-telkonet.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tftp.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-vines.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-wassp.c | 42 | ||||
-rw-r--r-- | epan/dissectors/packet-wlccp.c | 564 |
15 files changed, 1071 insertions, 1070 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index 2ff40f01ab..dcc86be829 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -374,7 +374,7 @@ dissect_portsettings(tvbuff_t *tvb, proto_tree *port_tree, guint32 offset) * Auto MDI-X */ proto_tree_add_item(port_tree, hf_njack_tlv_data, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_BIG_ENDIAN); return offset; } @@ -391,13 +391,13 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) /* Special cases that don't have a length field */ if (tlv_type == NJACK_CMD_ENDOFPACKET) { proto_tree_add_item(njack_tree, hf_njack_tlv_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; } if (tlv_type == NJACK_CMD_GETALLPARMAMS) { proto_tree_add_item(njack_tree, hf_njack_tlv_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; continue; } @@ -411,63 +411,63 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) tlv_tree = proto_item_add_subtree(tlv_item, ett_njack_tlv_header); proto_tree_add_item(tlv_tree, hf_njack_tlv_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tlv_tree, hf_njack_tlv_length, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (tlv_type) { case NJACK_CMD_STARTOFPARAMS: break; case NJACK_CMD_COUNTERMODE: proto_tree_add_item(tlv_tree, hf_njack_tlv_countermode, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_QUEUEING: proto_tree_add_item(tlv_tree, hf_njack_tlv_scheduling, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_ADDTAGSCHEME: proto_tree_add_item(tlv_tree, hf_njack_tlv_addtagscheme, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_REMOVETAG: proto_tree_add_item(tlv_tree, hf_njack_tlv_portingressmode, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_MAXFRAMESIZE: proto_tree_add_item(tlv_tree, hf_njack_tlv_maxframesize, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_ENABLESNMPWRITE: proto_tree_add_item(tlv_tree, hf_njack_tlv_snmpwrite, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_POWERFORWARDING: proto_tree_add_item(tlv_tree, hf_njack_tlv_powerforwarding, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_DHCPCONTROL: proto_tree_add_item(tlv_tree, hf_njack_tlv_dhcpcontrol, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_CMD_MACADDRESS: proto_tree_add_item(tlv_tree, hf_njack_tlv_devicemac, - tvb, offset, 6, FALSE); + tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; break; case NJACK_CMD_VERSION: /* XXX Don't misuse ip address printing here */ proto_tree_add_item(tlv_tree, hf_njack_tlv_version, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; break; case NJACK_CMD_IPADDRESS: @@ -475,7 +475,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) case NJACK_CMD_MASK: case NJACK_CMD_IPGATEWAY: proto_tree_add_item(tlv_tree, hf_njack_tlv_typeip, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case NJACK_CMD_GROUP: @@ -487,7 +487,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) case NJACK_CMD_PRODUCTNAME: case NJACK_CMD_SERIALNO: proto_tree_add_item(tlv_tree, hf_njack_tlv_typestring, - tvb, offset, tlv_length, FALSE); + tvb, offset, tlv_length, ENC_BIG_ENDIAN); offset += tlv_length; break; case NJACK_CMD_PORT1: @@ -502,7 +502,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) default: if (tlv_length != 0) { proto_tree_add_item(tlv_tree, hf_njack_tlv_data, - tvb, offset, tlv_length, FALSE); + tvb, offset, tlv_length, ENC_BIG_ENDIAN); offset += tlv_length; } break; @@ -581,27 +581,27 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_njack, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); njack_tree = proto_item_add_subtree(ti, ett_njack); proto_tree_add_item(njack_tree, hf_njack_magic, tvb, offset, 5, - FALSE); + ENC_BIG_ENDIAN); offset += 5; proto_tree_add_item(njack_tree, hf_njack_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; switch (packet_type) { case NJACK_TYPE_SET: /* Type 0x07: S -> M, Magic, type, length (16 bit be) */ proto_tree_add_item(njack_tree, hf_njack_set_length, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(njack_tree, hf_njack_set_salt, tvb, offset, - 4, TRUE); + 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(njack_tree, hf_njack_set_authdata, tvb, offset, - 16, FALSE); + 16, ENC_BIG_ENDIAN); offset += 16; offset = dissect_tlvs(tvb, njack_tree, offset); break; @@ -609,7 +609,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Type 0x08: M -> S, Magic, type, setresult (8 bit) */ setresult = tvb_get_guint8(tvb, offset); proto_tree_add_item(njack_tree, hf_njack_setresult, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str(setresult, njack_setresult_vals, "[0x%02x]")); @@ -624,7 +624,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Type 0x0c: M -> S, Magic, type, T(8 bit) L(8 bit) V(L bytes) */ offset = dissect_tlvs(tvb, njack_tree, offset); proto_tree_add_item(njack_tree, hf_njack_getresp_unknown1, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; break; case NJACK_TYPE_DHCPINFO: /* not completely understood */ @@ -633,7 +633,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) remaining = tvb_reported_length_remaining(tvb, offset); if (remaining > 0) { proto_tree_add_item(njack_tree, hf_njack_tlv_data, - tvb, offset, remaining, FALSE); + tvb, offset, remaining, ENC_BIG_ENDIAN); offset += remaining; } break; diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c index 7bb670d6d0..5660ae8777 100644 --- a/epan/dissectors/packet-airopeek.c +++ b/epan/dissectors/packet-airopeek.c @@ -66,17 +66,17 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_airopeek, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_airopeek, tvb, 0, -1, ENC_BIG_ENDIAN); airopeek_tree = proto_item_add_subtree(ti, ett_airopeek); - proto_tree_add_item(airopeek_tree, hf_airopeek_unknown1, tvb, 0, 2, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_unknown2, tvb, 2, 2, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_unknown3, tvb, 4, 2, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_unknown4, tvb, 6, 5, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_timestamp, tvb, 11, 4, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_unknown5, tvb, 15, 2, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_channel, tvb, 17, 1, FALSE); - proto_tree_add_item(airopeek_tree, hf_airopeek_unknown6, tvb, 18, 2, FALSE); + proto_tree_add_item(airopeek_tree, hf_airopeek_unknown1, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_unknown2, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_unknown3, tvb, 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_unknown4, tvb, 6, 5, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_timestamp, tvb, 11, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_unknown5, tvb, 15, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_channel, tvb, 17, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(airopeek_tree, hf_airopeek_unknown6, tvb, 18, 2, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset_remaining(tvb, 20); pinfo->pseudo_header->ieee_802_11.fcs_len = 4; diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 66ef911e39..6cbcc61d32 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -130,12 +130,12 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_erspan, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); erspan_tree = proto_item_add_subtree(ti, ett_erspan); version = tvb_get_ntohs(tvb, offset) >> 12; proto_tree_add_item(erspan_tree, hf_erspan_version, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); if ((version != 1) && (version != 2 )) { unknown_version = proto_tree_add_text(erspan_tree, tvb, 0, 0, "Unknown version, please report"); @@ -143,46 +143,46 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } proto_tree_add_item(erspan_tree, hf_erspan_vlan, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(erspan_tree, hf_erspan_priority, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(erspan_tree, hf_erspan_unknown2, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); if (version == 1) proto_tree_add_item(erspan_tree, hf_erspan_direction, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); else /* version = 2 */ proto_tree_add_item(erspan_tree, hf_erspan_unknown3, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(erspan_tree, hf_erspan_truncated, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(erspan_tree, hf_erspan_spanid, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; if (version == 2) { proto_tree_add_item(erspan_tree, hf_erspan_timestamp, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(erspan_tree, hf_erspan_unknown4, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(erspan_tree, hf_erspan_direction2, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(erspan_tree, hf_erspan_unknown5, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(erspan_tree, hf_erspan_unknown6, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } proto_tree_add_item(erspan_tree, hf_erspan_unknown7, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; } else { diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index c04222fe1c..927a6c0119 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -86,23 +86,23 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cwids_tree = NULL; while(tvb_length_remaining(tvb, offset) > 0) { - ti = proto_tree_add_item(tree, proto_cwids, tvb, offset, 28, FALSE); + ti = proto_tree_add_item(tree, proto_cwids, tvb, offset, 28, ENC_BIG_ENDIAN); cwids_tree = proto_item_add_subtree(ti, ett_cwids); - proto_tree_add_item(cwids_tree, hf_cwids_version, tvb, offset, 2, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cwids_tree, hf_cwids_unknown1, tvb, offset, 7, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_unknown1, tvb, offset, 7, ENC_BIG_ENDIAN); offset += 7; - proto_tree_add_item(cwids_tree, hf_cwids_channel, tvb, offset, 1, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cwids_tree, hf_cwids_unknown2, tvb, offset, 6, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_unknown2, tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; - proto_tree_add_item(cwids_tree, hf_cwids_reallength, tvb, offset, 2, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_reallength, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; capturelen = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(cwids_tree, hf_cwids_capturelen, tvb, offset, 2, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_capturelen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cwids_tree, hf_cwids_unknown3, tvb, offset, 8, FALSE); + proto_tree_add_item(cwids_tree, hf_cwids_unknown3, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; wlan_tvb = tvb_new_subset(tvb, offset, capturelen, capturelen); diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 0da8cc86f9..96d7d8f1a9 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -399,7 +399,7 @@ dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length tlv_tree = proto_item_add_subtree(tlv_item, ett_edp_tlv_header); proto_tree_add_item(tlv_tree, hf_edp_tlv_marker, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_uint(tlv_tree, hf_edp_tlv_type, tvb, offset, 1, @@ -419,7 +419,7 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p guint8 *display_name; display_item = proto_tree_add_item(tree, hf_edp_display, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); display_tree = proto_item_add_subtree(display_item, ett_edp_display); @@ -489,11 +489,11 @@ dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot offset += 2; proto_tree_add_item(info_tree, hf_edp_info_vchassid, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(info_tree, hf_edp_info_reserved, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; /* Begin version subtree */ @@ -504,7 +504,7 @@ dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot ver_tree = proto_item_add_subtree(ver_item, ett_edp_info_version); proto_tree_add_item(ver_tree, hf_edp_info_version, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_uint(ver_tree, hf_edp_info_version_major1, tvb, offset, 1, major1); @@ -524,7 +524,7 @@ dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot /* End of version subtree */ proto_tree_add_item(info_tree, hf_edp_info_vchassconn, tvb, offset, 16, - FALSE); + ENC_BIG_ENDIAN); offset += 16; } @@ -540,7 +540,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot guint8 *vlan_name; vlan_item = proto_tree_add_item(tree, hf_edp_vlan, tvb, - offset, length, FALSE); + offset, length, ENC_BIG_ENDIAN); vlan_tree = proto_item_add_subtree(vlan_item, ett_edp_vlan); @@ -556,16 +556,16 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot return; } flags_item = proto_tree_add_item(vlan_tree, hf_edp_vlan_flags, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_edp_vlan_flags); proto_tree_add_item(flags_tree, hf_edp_vlan_flags_ip, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_edp_vlan_flags_reserved, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_edp_vlan_flags_unknown, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; /* End of flags subtree */ @@ -577,7 +577,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot return; } proto_tree_add_item(vlan_tree, hf_edp_vlan_reserved1, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -603,7 +603,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot return; } proto_tree_add_item(vlan_tree, hf_edp_vlan_reserved2, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -614,7 +614,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot return; } proto_tree_add_item(vlan_tree, hf_edp_vlan_ip, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -643,39 +643,39 @@ 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_proto, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(esrp_tree, hf_edp_esrp_group, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(esrp_tree, hf_edp_esrp_prio, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esrp_tree, hf_edp_esrp_state, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esrp_tree, hf_edp_esrp_ports, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esrp_tree, hf_edp_esrp_virtip, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(esrp_tree, hf_edp_esrp_sysmac, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; proto_tree_add_item(esrp_tree, hf_edp_esrp_hello, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esrp_tree, hf_edp_esrp_reserved, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESRP"); @@ -702,47 +702,47 @@ 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_ver, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(eaps_tree, hf_edp_eaps_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(eaps_tree, hf_edp_eaps_ctrlvlanid, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(eaps_tree, hf_edp_eaps_reserved0, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(eaps_tree, hf_edp_eaps_sysmac, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; proto_tree_add_item(eaps_tree, hf_edp_eaps_hello, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(eaps_tree, hf_edp_eaps_fail, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(eaps_tree, hf_edp_eaps_state, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(eaps_tree, hf_edp_eaps_reserved1, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(eaps_tree, hf_edp_eaps_helloseq, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(eaps_tree, hf_edp_eaps_reserved2, tvb, offset, 38, - FALSE); + ENC_BIG_ENDIAN); offset += 38; col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPS"); @@ -774,90 +774,90 @@ 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_ver, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(esl_tree, hf_edp_esl_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(esl_tree, hf_edp_esl_ctrlvlanid, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(esl_tree, hf_edp_esl_reserved0, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(esl_tree, hf_edp_esl_sysmac, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; length -= 6; proto_tree_add_item(esl_tree, hf_edp_esl_reserved1, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(esl_tree, hf_edp_esl_state, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(esl_tree, hf_edp_esl_linkrole, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(esl_tree, hf_edp_esl_linkid1, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(esl_tree, hf_edp_esl_failed1, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(esl_tree, hf_edp_esl_failed2, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(esl_tree, hf_edp_esl_reserved4, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(esl_tree, hf_edp_esl_linkid2, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(esl_tree, hf_edp_esl_reserved5, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; numlinks = tvb_get_ntohs(tvb, offset); proto_tree_add_item(esl_tree, hf_edp_esl_numlinks, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; for (; numlinks > 0 && length >= 2; numlinks--) { proto_tree_add_item(esl_tree, hf_edp_esl_linklist, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; } proto_tree_add_item(esl_tree, hf_edp_esl_rest, tvb, offset, length, - FALSE); + ENC_BIG_ENDIAN); offset += length; length = 0; @@ -898,17 +898,17 @@ dissect_elsm_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, /* The rest is actually guesswork */ proto_tree_add_item(elsm_tree, hf_edp_elsm_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(elsm_tree, hf_edp_elsm_subtype, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(elsm_tree, hf_edp_elsm_magic, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length -= 2; } @@ -929,7 +929,7 @@ dissect_elrp_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot length -= 4; proto_tree_add_item(elrp_tree, hf_edp_elrp_unknown, tvb, offset, length, - FALSE); + ENC_BIG_ENDIAN); } static void @@ -951,7 +951,7 @@ dissect_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p length -= 4; proto_tree_add_item(unknown_tree, hf_edp_unknown_data, tvb, offset, length, - FALSE); + ENC_BIG_ENDIAN); } static void @@ -976,15 +976,15 @@ dissect_edp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_edp, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); edp_tree = proto_item_add_subtree(ti, ett_edp); proto_tree_add_item(edp_tree, hf_edp_version, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(edp_tree, hf_edp_reserved, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; data_length = tvb_get_ntohs(tvb, offset); @@ -1031,17 +1031,17 @@ dissect_edp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) seqno = tvb_get_ntohs(tvb, offset); proto_tree_add_item(edp_tree, hf_edp_seqno, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; /* Machine ID is 8 bytes, if it starts with 0000, the remaining 6 bytes are a MAC */ proto_tree_add_item(edp_tree, hf_edp_midtype, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(edp_tree, hf_edp_midmac, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; /* Decode the individual TLVs */ diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index cd065831cd..abc95425a4 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -169,30 +169,30 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset, guint8 addrtype; guint8 addrlen; - proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown10, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown10, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; - proto_tree_add_item(tlv_tree, hf_glbp_hello_vgstate, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_vgstate, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; - proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown11, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown11, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; - proto_tree_add_item(tlv_tree, hf_glbp_hello_priority, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_priority, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown12, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown12, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tlv_tree, hf_glbp_hello_helloint, tvb, offset, 4, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_helloint, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tlv_tree, hf_glbp_hello_holdint, tvb, offset, 4, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_holdint, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tlv_tree, hf_glbp_hello_redirect, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_redirect, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tlv_tree, hf_glbp_hello_timeout, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_timeout, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown13, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown13, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tlv_tree, hf_glbp_hello_addrtype, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_addrtype, tvb, offset, 1, ENC_BIG_ENDIAN); addrtype = tvb_get_guint8(tvb, offset); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_hello_addrlen, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_addrlen, tvb, offset, 1, ENC_BIG_ENDIAN); addrlen = tvb_get_guint8(tvb, offset); offset++; switch (addrtype) { @@ -201,17 +201,17 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset, expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Wrong IPv4 address length: %u", addrlen); return offset + addrlen; } - proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv4, tvb, offset, addrlen, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv4, tvb, offset, addrlen, ENC_BIG_ENDIAN); break; case 2: if (addrlen != 16) { expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Wrong IPv6 address length: %u", addrlen); return offset + addrlen; } - proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv6, tvb, offset, addrlen, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv6, tvb, offset, addrlen, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualunk, tvb, offset, addrlen, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualunk, tvb, offset, addrlen, ENC_BIG_ENDIAN); break; } offset += addrlen; @@ -227,19 +227,19 @@ static int dissect_glbp_reqresp(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tlv_tree) { - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_forwarder, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_forwarder, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_vfstate, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_vfstate, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown21, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown21, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_priority, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_priority, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_weight, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_weight, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown22, tvb, offset, 7, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown22, tvb, offset, 7, ENC_BIG_ENDIAN); offset += 7; - proto_tree_add_item(tlv_tree, hf_glbp_reqresp_virtualmac, tvb, offset, 6, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_reqresp_virtualmac, tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; return offset; @@ -252,28 +252,28 @@ dissect_glbp_auth(tvbuff_t *tvb, int offset, guint8 authtype; guint8 authlength; - proto_tree_add_item(tlv_tree, hf_glbp_auth_authtype, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_auth_authtype, tvb, offset, 1, ENC_BIG_ENDIAN); authtype = tvb_get_guint8(tvb, offset); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_auth_authlength, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_auth_authlength, tvb, offset, 1, ENC_BIG_ENDIAN); authlength = tvb_get_guint8(tvb, offset); offset++; switch(authtype) { case 1: - proto_tree_add_item(tlv_tree, hf_glbp_auth_plainpass, tvb, offset, authlength, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_auth_plainpass, tvb, offset, authlength, ENC_BIG_ENDIAN); offset += authlength; break; case 2: - proto_tree_add_item(tlv_tree, hf_glbp_auth_md5hash, tvb, offset, authlength, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_auth_md5hash, tvb, offset, authlength, ENC_BIG_ENDIAN); offset += authlength; break; case 3: - proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainindex, tvb, offset, 4, FALSE); - proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainhash, tvb, offset+4, authlength-4, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainindex, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainhash, tvb, offset+4, authlength-4, ENC_BIG_ENDIAN); offset += authlength; break; default: - proto_tree_add_item(tlv_tree, hf_glbp_auth_authunknown, tvb, offset, authlength, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_auth_authunknown, tvb, offset, authlength, ENC_BIG_ENDIAN); offset += authlength; break; } @@ -285,7 +285,7 @@ static int dissect_glbp_unknown(tvbuff_t *tvb, int offset, guint32 length, packet_info *pinfo _U_, proto_tree *tlv_tree) { - proto_tree_add_item(tlv_tree, hf_glbp_unknown_data, tvb, offset, length, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_unknown_data, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; return offset; @@ -309,19 +309,19 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "G: %d", group); if (tree) { - ti = proto_tree_add_item(tree, proto_glbp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_glbp, tvb, 0, -1, ENC_BIG_ENDIAN); glbp_tree = proto_item_add_subtree(ti, ett_glbp); /* glbp header? */ - proto_tree_add_item(glbp_tree, hf_glbp_version, tvb, offset, 1, FALSE); + proto_tree_add_item(glbp_tree, hf_glbp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(glbp_tree, hf_glbp_unknown1, tvb, offset, 1, FALSE); + proto_tree_add_item(glbp_tree, hf_glbp_unknown1, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(glbp_tree, hf_glbp_group, tvb, offset, 2, FALSE); + proto_tree_add_item(glbp_tree, hf_glbp_group, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(glbp_tree, hf_glbp_unknown2, tvb, offset, 2, FALSE); + proto_tree_add_item(glbp_tree, hf_glbp_unknown2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(glbp_tree, hf_glbp_ownerid, tvb, offset, 6, FALSE); + proto_tree_add_item(glbp_tree, hf_glbp_ownerid, tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; while (tvb_length_remaining(tvb, offset) > 0) { @@ -333,14 +333,14 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } length -= 2; - ti = proto_tree_add_item(glbp_tree, hf_glbp_tlv, tvb, offset, length+2, FALSE); + ti = proto_tree_add_item(glbp_tree, hf_glbp_tlv, tvb, offset, length+2, ENC_BIG_ENDIAN); tlv_tree = proto_item_add_subtree(ti, ett_glbp_tlv); proto_item_append_text(ti, " l=%d, t=%s", length+2, val_to_str(type, glbp_type_vals, "%d")); - proto_tree_add_item(tlv_tree, hf_glbp_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tlv_tree, hf_glbp_length, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_glbp_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(type, glbp_type_vals, "%d")); diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index cbaa06528c..50a59da136 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -138,25 +138,25 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - tree_item = proto_tree_add_item(tree, proto_tcpencap, tvb, 0, -1, FALSE); + tree_item = proto_tree_add_item(tree, proto_tcpencap, tvb, 0, -1, ENC_BIG_ENDIAN); tcpencap_tree = proto_item_add_subtree(tree_item, ett_tcpencap); /* Dissect the trailer following the encapsulated IPSEC/ISAKMP packet */ offset = reported_length - TRAILERLENGTH; unknown_item = proto_tree_add_item(tcpencap_tree, hf_tcpencap_unknown, tvb, - offset, TRAILERLENGTH, FALSE); + offset, TRAILERLENGTH, ENC_BIG_ENDIAN); /* Try to guess the contents of the trailer */ tcpencap_unknown_tree = proto_item_add_subtree(unknown_item, ett_tcpencap_unknown); - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_zero, tvb, offset + 0, 4, FALSE); - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_seq, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_zero, tvb, offset + 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_seq, tvb, offset + 4, 2, ENC_BIG_ENDIAN); if (protocol == TCP_ENCAP_P_UDP) { - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_ike_direction, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_ike_direction, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_esp_zero, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_esp_zero, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic, tvb, offset + 8, 5, FALSE); - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_proto, tvb, offset + 13, 1, FALSE); - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic2, tvb, offset + 14, 2, FALSE); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic, tvb, offset + 8, 5, ENC_BIG_ENDIAN); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_proto, tvb, offset + 13, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic2, tvb, offset + 14, 2, ENC_BIG_ENDIAN); } /* Create the tvbuffer for the next dissector */ diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c index e06d4c44ae..2dbbd85249 100644 --- a/epan/dissectors/packet-mndp.c +++ b/epan/dissectors/packet-mndp.c @@ -168,13 +168,13 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mndp_tree, tlv_tree = proto_item_add_subtree(tlv_item, ett_mndp_tlv_header); type_item = proto_tree_add_item(tlv_tree, hf_mndp_tlv_type, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(type_item, " = %s", extval_to_str_idx(tlv_type, value_array, &type_index, "Unknown")); offset += 2; proto_tree_add_item(tlv_tree, hf_mndp_tlv_length, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* tlv_length -= 4; */ @@ -185,6 +185,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mndp_tree, tlv_end = offset + tlv_length; /* Make hf_ handling independent of specialfuncion */ + /* FIXME: Properly handle encoding info */ if ( type_index != -1 && !value_array[type_index].specialfunction && value_array[type_index].evs != NULL @@ -199,7 +200,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mndp_tree, tvb, offset, tlv_length, encoding_info); } else { proto_tree_add_item(tlv_tree, hf_mndp_tlv_data, - tvb, offset, tlv_length, FALSE); + tvb, offset, tlv_length, ENC_BIG_ENDIAN); } if ( type_index != -1 && value_array[type_index].specialfunction ) { guint32 newoffset; @@ -231,14 +232,14 @@ dissect_mndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Header dissection */ ti = proto_tree_add_item(tree, proto_mndp, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); mndp_tree = proto_item_add_subtree(ti, ett_mndp); proto_tree_add_item(mndp_tree, hf_mndp_header_unknown, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(mndp_tree, hf_mndp_header_seqno, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; while (offset < packet_length) diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 804e71269b..a1790cb42f 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -1324,7 +1324,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* In the interest of speed, if "tree" is NULL, don't do any work not * necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_skinny, tvb, offset, hdr_data_length+8, FALSE); + ti = proto_tree_add_item(tree, proto_skinny, tvb, offset, hdr_data_length+8, ENC_BIG_ENDIAN); skinny_tree = proto_item_add_subtree(ti, ett_skinny); proto_tree_add_uint(skinny_tree, hf_skinny_data_length, tvb, offset, 4, hdr_data_length); proto_tree_add_uint(skinny_tree, hf_skinny_hdr_version, tvb, offset+4, 4, hdr_version); @@ -1346,45 +1346,45 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0001: /* RegisterMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+36, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_deviceType, tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_maxStreams, tvb, offset+44, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+36, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_deviceType, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_maxStreams, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); break; case 0x0002: /* IpPortMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_stationIpPort, tvb, offset+12, 2, FALSE); + proto_tree_add_item(skinny_tree, hf_skinny_stationIpPort, tvb, offset+12, 2, ENC_BIG_ENDIAN); break; case 0x0003: /* KeypadButtonMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_stationKeypadButton, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_stationKeypadButton, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); if (hdr_data_length > 8) { - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); } break; case 0x0004: /* EnblocCallMessage -- This decode NOT verified*/ - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); break; case 0x0005: /* StimulusMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_stimulus, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_stimulusInstance, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_stimulus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_stimulusInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); if (hdr_data_length > 12) { - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, offset+20); } break; case 0x0006: /* OffHookMessage */ if (hdr_data_length > 4) { - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); si->callId = tvb_get_letohl(tvb, offset+16); } @@ -1392,8 +1392,8 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x0007: /* OnHookMessage */ if (hdr_data_length > 4) { - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); si->callId = tvb_get_letohl(tvb, offset+16); } @@ -1403,15 +1403,15 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0009: /* ForwardStatReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x000a: /* SpeedDialStatReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_speedDialNumber, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_speedDialNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x000b: /* LineStatReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x000c: /* ConfigStatReqMessage */ @@ -1437,8 +1437,8 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) capCount = tvb_get_letohl(tvb, offset+12); proto_tree_add_uint(skinny_tree, hf_skinny_capCount, tvb, offset+12, 4, capCount); for (i = 0; i < capCount; i++) { - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+(i*16)+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+(i*16)+20, 2, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+(i*16)+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+(i*16)+20, 2, ENC_LITTLE_ENDIAN); /* FIXME -- decode the union under here as required, is always 0 on my equipment */ } break; @@ -1450,24 +1450,24 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0020: /* AlarmMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_alarmSeverity, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxAlarmMessageSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_alarmParam1, tvb, offset+96, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_alarmParam2, tvb, offset+100, 4, FALSE); + proto_tree_add_item(skinny_tree, hf_skinny_alarmSeverity, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxAlarmMessageSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_alarmParam1, tvb, offset+96, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_alarmParam2, tvb, offset+100, 4, ENC_BIG_ENDIAN); break; case 0x0021: /* MulticastMediaReceptionAck - This decode NOT verified */ - proto_tree_add_item(skinny_tree, hf_skinny_receptionStatus, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_receptionStatus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x0022: /* OpenReceiveChannelAck */ if (hdr_version == BASIC_MSG_TYPE) { - proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+16, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); if (rtp_handle) { address src_addr; guint32 ipv4_address; @@ -1480,12 +1480,12 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } si->passThruId = tvb_get_letohl(tvb, offset+24); } else if (hdr_version == CM7_MSG_TYPE_A || hdr_version == CM7_MSG_TYPE_B) { - proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); /* unknown uint32_t stuff */ - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+20, 4, FALSE); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+20, 4, ENC_BIG_ENDIAN); /* 3x unknown uint32_t stuff, space for IPv6 maybe */ - proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+40, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); if (rtp_handle) { address src_addr; guint32 ipv4_address; @@ -1501,30 +1501,30 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0023: /* ConnectionStatisticsRes */ - proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, offset+12, StationMaxDirnumSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_statsProcessingType, tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_packetsSent, tvb, offset+44, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_octetsSent, tvb, offset+48, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_packetsRecv, tvb, offset+52, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_octetsRecv, tvb, offset+56, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_packetsLost, tvb, offset+60, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_jitter, tvb, offset+64, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_latency, tvb, offset+68, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_statsProcessingType, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_packetsSent, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_octetsSent, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_packetsRecv, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_octetsRecv, tvb, offset+56, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_packetsLost, tvb, offset+60, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_jitter, tvb, offset+64, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_latency, tvb, offset+68, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, offset+36); break; case 0x0024: /* OffHookWithCgpnMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12,StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12,StationMaxDirnumSize, ENC_LITTLE_ENDIAN); break; case 0x0025: /* SoftKeySetReqMessage */ break; case 0x0026: /* SoftKeyEventMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_softKeyEvent, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_softKeyEvent, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; @@ -1536,45 +1536,45 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0029: /* RegisterTokenReq */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); i = offset+12+StationMaxDeviceNameSize; - proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, i, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, i+4, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, i+8, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_deviceType, tvb, i+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, i, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, i+4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, i+8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_deviceType, tvb, i+12, 4, ENC_LITTLE_ENDIAN); break; case 0x002A: /* MediaTransmissionFailure */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+20, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+28); break; case 0x002B: /* HeadsetStatusMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_headsetMode, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_headsetMode, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x002C: /* MediaResourceNotification */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceType, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberOfInServiceStreams, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_maxStreamsPerConf, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberOfOutOfServiceStreams, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceType, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfInServiceStreams, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_maxStreamsPerConf, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfOutOfServiceStreams, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); break; case 0x002D: /* RegisterAvailableLinesMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_numberLines, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_numberLines, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x002E: /* DeviceToUserDataMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+28); dissect_skinny_xml(skinny_tree, tvb, pinfo, offset+30, count); si->lineId = tvb_get_letohl(tvb, offset+16); @@ -1582,11 +1582,11 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x002F: /* DeviceToUserDataResponseMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+28); dissect_skinny_xml(skinny_tree, tvb, pinfo, offset+30, count); si->lineId = tvb_get_letohl(tvb, offset+12); @@ -1596,63 +1596,63 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x0030: /* UpdateCapabilitiesMessage */ /* to do - this message is very large and will span multiple packets, it would be nice to someday */ /* find out a way to join the next packet and get the complete message to decode */ - proto_tree_add_item(skinny_tree, hf_skinny_audioCapCount, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_videoCapCount, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dataCapCount, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_RTPPayloadFormat, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_customPictureFormatCount, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_audioCapCount, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_videoCapCount, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dataCapCount, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_RTPPayloadFormat, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_customPictureFormatCount, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = offset+32; for ( i = 0; i < MAX_CUSTOM_PICTURES; i++ ) { ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 20, "customPictureFormat[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureWidth, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureWidth, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureHeight, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureHeight, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_pixelAspectRatio, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pixelAspectRatio, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_clockConversionCode, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_clockConversionCode, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_clockDivisor, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_clockDivisor, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; } ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "confResources"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_activeStreamsOnRegistration, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_activeStreamsOnRegistration, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBW, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBW, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_serviceResourceCount, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_serviceResourceCount, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; skinny_sub_tree_sav = skinny_sub_tree; for ( i = 0; i < MAX_SERVICE_TYPE; i++ ) { ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 20, "serviceResource[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_layoutCount, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_layoutCount, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; skinny_sub_tree_sav_sav = skinny_sub_tree_sav; for ( t = 0; t < MAX_LAYOUT_WITH_SAME_SERVICE; t++ ) { ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 20, "layouts[%d]", t); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_layout, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_layout, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; } skinny_sub_tree = skinny_sub_tree_sav_sav; - proto_tree_add_item(skinny_sub_tree, hf_skinny_serviceNum, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_serviceNum, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxStreams, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxStreams, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxConferences, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxConferences, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_activeConferenceOnRegistration, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_activeConferenceOnRegistration, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; } for ( i = 0; i < StationMaxCapabilities; i++ ) { ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 20, "audiocaps[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_payloadCapability, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_payloadCapability, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxFramesPerPacket, tvb, count, 2, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxFramesPerPacket, tvb, count, 2, ENC_LITTLE_ENDIAN); count+= 4; /* skip past union it is only for G723 */ count+= 8; @@ -1660,27 +1660,27 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for ( i = 0; i < StationMaxVideoCapabilities; i++ ) { ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 20, "vidCaps[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_payloadCapability, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_payloadCapability, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_transmitOrReceive, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_transmitOrReceive, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_levelPreferenceCount, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_levelPreferenceCount, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; skinny_sub_tree_sav = skinny_sub_tree; for ( t = 0; t < MAX_LEVEL_PREFERENCE; t++ ) { ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 20, "levelPreference[%d]", t); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_transmitPreference, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_transmitPreference, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_format, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_format, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_minBitRate, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_minBitRate, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_MPI, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_MPI, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_serviceNumber, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_serviceNumber, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; } val = count; @@ -1688,108 +1688,108 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* H.261 */ ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "h261VideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOffCapability, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOffCapability, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_stillImageTransmission, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_stillImageTransmission, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; /* H.263 */ count = val; ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "h263VideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_h263_capability_bitfield, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_h263_capability_bitfield, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_annexNandWFutureUse, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_annexNandWFutureUse, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; /* Video */ count = val; ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "vieoVideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_modelNumber, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_modelNumber, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_bandwidth, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_bandwidth, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; } for ( i = 0; i < StationMaxDataCapabilities; i++ ) { ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 20, "dataCaps[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_payloadCapability, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_payloadCapability, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_transmitOrReceive, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_transmitOrReceive, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_protocolDependentData, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_protocolDependentData, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, count, 4, ENC_LITTLE_ENDIAN); count+= 4; } break; case 0x0031: /* OpenMultiMediaReceiveChannelAckMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+16, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+24); si->callId = tvb_get_letohl(tvb, offset+28); break; case 0x0032: /* ClearConferenceMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_serviceNum, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_serviceNum, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; case 0x0033: /* ServiceURLStatReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_serviceURLIndex, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_serviceURLIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0034: /* FeatureStatReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_featureIndex, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_featureIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0035: /* CreateConferenceResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_createConfResults, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_createConfResults, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+20); proto_tree_add_uint(skinny_tree, hf_skinny_passThruData, tvb, offset+24, 1, count); break; case 0x0036: /* DeleteConferenceResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_deleteConfResults, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_deleteConfResults, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; case 0x0037: /* ModifyConferenceResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_modifyConfResults, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_modifyConfResults, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+20); proto_tree_add_uint(skinny_tree, hf_skinny_passThruData, tvb, offset+24, 1, count); break; case 0x0038: /* AddParticipantResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_addParticipantResults, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_addParticipantResults, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, offset+16); break; case 0x0039: /* AuditConferenceResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_last, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberOfEntries, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_last, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfEntries, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); count = offset+20; for ( i = 0; i < StationMaxConference; i++ ) { - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_resourceTypes, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_resourceTypes, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_numberOfReservedParticipants, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfReservedParticipants, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_numberOfActiveParticipants, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfActiveParticipants, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_appID, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_appID, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; proto_tree_add_uint(skinny_tree, hf_skinny_appConfID, tvb, count, 1, AppConferenceIDSize); count += AppConferenceIDSize; @@ -1799,55 +1799,55 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0040: /* AuditParticipantResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_auditParticipantResults, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_last, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberOfEntries, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_auditParticipantResults, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_last, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfEntries, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+24); for ( i = 0; i < count; i++ ) { - proto_tree_add_item(skinny_tree, hf_skinny_participantEntry, tvb, offset+28+(i*4), 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_participantEntry, tvb, offset+28+(i*4), 4, ENC_LITTLE_ENDIAN); } break; case 0x0041: /* DeviceToUserDataVersion1Message */ - proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+28); - proto_tree_add_item(skinny_tree, hf_skinny_sequenceFlag, tvb, offset+30, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_displayPriority, tvb, offset+34, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+38, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_appInstanceID, tvb, offset+42, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_routingID, tvb, offset+46, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_sequenceFlag, tvb, offset+30, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_displayPriority, tvb, offset+34, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+38, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_appInstanceID, tvb, offset+42, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_routingID, tvb, offset+46, 4, ENC_LITTLE_ENDIAN); dissect_skinny_xml(skinny_tree, tvb, pinfo, offset+50, count); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x0042: /* DeviceToUserDataResponseVersion1Message */ - proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+28); - proto_tree_add_item(skinny_tree, hf_skinny_sequenceFlag, tvb, offset+30, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_displayPriority, tvb, offset+34, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+38, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_appInstanceID, tvb, offset+42, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_routingID, tvb, offset+46, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_sequenceFlag, tvb, offset+30, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_displayPriority, tvb, offset+34, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+38, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_appInstanceID, tvb, offset+42, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_routingID, tvb, offset+46, 4, ENC_LITTLE_ENDIAN); dissect_skinny_xml(skinny_tree, tvb, pinfo, offset+50, count); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x0048: /* DialedPhoneBookMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_directoryIndex, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_directoryPhoneNumber, tvb, offset+24, 256, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_directoryIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_directoryPhoneNumber, tvb, offset+24, 256, ENC_LITTLE_ENDIAN); break; @@ -1857,17 +1857,17 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * */ case 0x0081: /* RegisterAckMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_keepAliveInterval, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateTemplate, tvb, offset+16, StationDateTemplateSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_secondaryKeepAliveInterval, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_keepAliveInterval, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateTemplate, tvb, offset+16, StationDateTemplateSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_secondaryKeepAliveInterval, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); break; case 0x0082: /* StartToneMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); /* offset 16 to 19: reserved */ if (hdr_data_length > 12) { - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+20); si->callId = tvb_get_letohl(tvb, offset+24); } @@ -1875,56 +1875,56 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x0083: /* StopToneMessage */ if (hdr_data_length > 4) { - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); si->callId = tvb_get_letohl(tvb, offset+16); } break; case 0x0085: /* SetRingerMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_ringType, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ringMode, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_ringType, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ringMode, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); if (hdr_data_length > 12) { - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+20); si->callId = tvb_get_letohl(tvb, offset+24); } break; case 0x0086: /* SetLampMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_stimulus, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_stimulusInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lampMode, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_stimulus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_stimulusInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lampMode, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); break; case 0x0087: /* SetHookFlashDetectModeMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_hookFlashDetectMode, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_detectInterval, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_hookFlashDetectMode, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_detectInterval, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; case 0x0088: /* SetSpeakerModeMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_speakerMode, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_speakerMode, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0089: /* SetMicroModeMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_microphoneMode, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_microphoneMode, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x008a: /* StartMediaTransmission */ if (hdr_version == BASIC_MSG_TYPE) { - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+20, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_remotePortNumber, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_precedenceValue, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_silenceSuppression, tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+44, 2, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+48, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_remotePortNumber, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_precedenceValue, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_silenceSuppression, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+44, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); if (rtp_handle) { address src_addr; guint32 ipv4_address; @@ -1939,19 +1939,19 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (hdr_version == CM7_MSG_TYPE_A || hdr_version == CM7_MSG_TYPE_B) { - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); /* unknown uint32_t stuff */ - proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+24, 4, FALSE); + proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+24, 4, ENC_BIG_ENDIAN); /* 3x unknown uint32_t stuff, space for IPv6 maybe */ - proto_tree_add_item(skinny_tree, hf_skinny_remotePortNumber, tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+44, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+48, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_remotePortNumber, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); /* There is some more... */ - /* proto_tree_add_item(skinny_tree, hf_skinny_precedenceValue, tvb, offset+52, 4, TRUE); */ - /* proto_tree_add_item(skinny_tree, hf_skinny_silenceSuppression, tvb, offset+56, 4, TRUE); */ - /* proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+60, 2, TRUE); */ - /* proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+62, 4, TRUE); */ + /* proto_tree_add_item(skinny_tree, hf_skinny_precedenceValue, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); */ + /* proto_tree_add_item(skinny_tree, hf_skinny_silenceSuppression, tvb, offset+56, 4, ENC_LITTLE_ENDIAN); */ + /* proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+60, 2, ENC_LITTLE_ENDIAN); */ + /* proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+62, 4, ENC_LITTLE_ENDIAN); */ if (rtp_handle) { address src_addr; guint32 ipv4_address; @@ -1967,8 +1967,8 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x008b: /* StopMediaTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; @@ -1980,47 +1980,47 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x008f: /* CallInfoMessage */ i = offset+12; - proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, StationMaxNameSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxNameSize; si->callingParty = g_strdup(tvb_format_stringzpad(tvb, i, StationMaxDirnumSize)); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN); i += StationMaxNameSize; - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); si->calledParty = g_strdup(tvb_format_stringzpad(tvb, i, StationMaxDirnumSize)); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, i, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, i); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, i, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, i); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_callType, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callType, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN); i += StationMaxNameSize; - proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN); i += StationMaxNameSize; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingReason, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingReason, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_cast_callInstance, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_callInstance, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_cast_callSecurityStatus, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_callSecurityStatus, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; val = tvb_get_letohl( tvb, i); ti_sub = proto_tree_add_text(skinny_tree, tvb, i, 8, "partyPIRestrictionBits"); @@ -2044,68 +2044,68 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0090: /* ForwardStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_activeForward, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_forwardAllActive, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, offset+24, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_activeForward, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_forwardAllActive, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, offset+24, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i = offset+24+StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_skinny_forwardBusyActive, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_forwardBusyActive, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i += StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_skinny_forwardNoAnswerActive, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_forwardNoAnswerActive, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); break; case 0x0091: /* SpeedDialStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_speedDialNumber, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_speedDialDirNumber, tvb, offset+16, StationMaxDirnumSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_speedDialDisplayName, tvb, offset+40, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_speedDialNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_speedDialDirNumber, tvb, offset+16, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_speedDialDisplayName, tvb, offset+40, StationMaxNameSize, ENC_LITTLE_ENDIAN); break; case 0x0092: /* LineStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineDirNumber, tvb, offset+16, StationMaxDirnumSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineFullyQualifiedDisplayName, tvb, offset+16+StationMaxDirnumSize, StationMaxNameSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineDisplayName, tvb, offset+16+StationMaxDirnumSize+StationMaxNameSize, StationMaxDisplayNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineDirNumber, tvb, offset+16, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineFullyQualifiedDisplayName, tvb, offset+16+StationMaxDirnumSize, StationMaxNameSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineDisplayName, tvb, offset+16+StationMaxDirnumSize+StationMaxNameSize, StationMaxDisplayNameSize, ENC_LITTLE_ENDIAN); break; case 0x0093: /* ConfigStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, ENC_LITTLE_ENDIAN); i = offset+12+StationMaxDeviceNameSize; - proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(skinny_tree, hf_skinny_userName, tvb, i, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_userName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN); i += StationMaxNameSize; - proto_tree_add_item(skinny_tree, hf_skinny_serverName, tvb, i, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_serverName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN); i += StationMaxNameSize; - proto_tree_add_item(skinny_tree, hf_skinny_numberLines, tvb, i, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberSpeedDials, tvb, i+4, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_numberLines, tvb, i, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberSpeedDials, tvb, i+4, 4, ENC_LITTLE_ENDIAN); break; case 0x0094: /* DefineTimeDate */ - proto_tree_add_item(skinny_tree, hf_skinny_dateYear, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateMonth, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dayOfWeek, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateDay, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateHour, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateMinute, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateSeconds,tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_dateMilliseconds,tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_timeStamp, tvb, offset+44, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_dateYear, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateMonth, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dayOfWeek, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateDay, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateHour, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateMinute, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateSeconds,tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_dateMilliseconds,tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_timeStamp, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); break; case 0x0095: /* StartSessionTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+12, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_sessionType, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_sessionType, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; case 0x0096: /* StopSessionTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+12, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_sessionType, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_sessionType, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; case 0x0097: /* ButtonTemplateMessage */ @@ -2115,21 +2115,21 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * note to self: uint8 != 4 kk thx info ^_^ * */ - proto_tree_add_item(skinny_tree, hf_skinny_buttonOffset, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_buttonCount, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_totalButtonCount, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_buttonOffset, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_buttonCount, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_totalButtonCount, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); for (i = 0; i < StationMaxButtonTemplateSize; i++) { - proto_tree_add_item(skinny_tree, hf_skinny_buttonInstanceNumber, tvb, offset+(i*2)+24, 1, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_buttonDefinition, tvb, offset+(i*2)+25, 1, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_buttonInstanceNumber, tvb, offset+(i*2)+24, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_buttonDefinition, tvb, offset+(i*2)+25, 1, ENC_LITTLE_ENDIAN); } break; case 0x0098: /* VersionMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_version, tvb, offset+12, StationMaxVersionSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_version, tvb, offset+12, StationMaxVersionSize, ENC_LITTLE_ENDIAN); break; case 0x0099: /* DisplayTextMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, ENC_LITTLE_ENDIAN); break; case 0x009a: /* ClearDisplay */ @@ -2139,112 +2139,112 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x009c: /* EnunciatorCommandMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_mediaEnunciationType, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_mediaEnunciationType, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); for (i = 0; i < StationMaxDirnumSize; i++) { - proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+16+(i*4), 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+16+(i*4), 4, ENC_LITTLE_ENDIAN); } i = offset+16+StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_skinny_mediaEnunciationType, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_mediaEnunciationType, tvb, i, 4, ENC_LITTLE_ENDIAN); break; case 0x009d: /* RegisterRejectMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, ENC_LITTLE_ENDIAN); break; case 0x009e: /* ServerResMessage */ for (i = 0; i < StationMaxServers; i++) { - proto_tree_add_item(skinny_tree, hf_skinny_serverIdentifier, tvb, offset+12+(i*StationMaxServers), StationMaxServerNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_serverIdentifier, tvb, offset+12+(i*StationMaxServers), StationMaxServerNameSize, ENC_LITTLE_ENDIAN); } j = offset+12+(i*StationMaxServers); for (i = 0; i < StationMaxServers; i++) { - proto_tree_add_item(skinny_tree, hf_skinny_serverListenPort, tvb, j+(i*4), 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_serverListenPort, tvb, j+(i*4), 4, ENC_LITTLE_ENDIAN); } j = j+(i*4); for (i = 0; i < StationMaxServers; i++) { - proto_tree_add_item(skinny_tree, hf_skinny_serverIpAddress, tvb, j+(i*4), 4, FALSE); + proto_tree_add_item(skinny_tree, hf_skinny_serverIpAddress, tvb, j+(i*4), 4, ENC_BIG_ENDIAN); } break; case 0x009f: /* Reset */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceResetType, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceResetType, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0100: /* KeepAliveAckMessage */ break; case 0x0101: /* StartMulticastMediaReception */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_multicastIpAddress, tvb, offset+20, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_multicastPort, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_echoCancelType, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+40, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_multicastIpAddress, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_multicastPort, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_echoCancelType, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x0102: /* StartMulticastMediaTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_multicastIpAddress, tvb, offset+20, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_multicastPort, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_precedenceValue, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_silenceSuppression, tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+44, 2, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+48, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_multicastIpAddress, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_multicastPort, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_precedenceValue, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_silenceSuppression, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_maxFramesPerPacket, tvb, offset+44, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x0103: /* StopMulticastMediaReception */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x0104: /* StopMulticastMediaTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x105: /* OpenReceiveChannel */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_echoCancelType, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+32, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_echoCancelType, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x0106: /* CloseReceiveChannel */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); break; case 0x0107: /* ConnectionStatisticsReq */ i = 12; - proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, i, StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); i = 12 + StationMaxDirnumSize; - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, i, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, i); i = i+4; - proto_tree_add_item(skinny_tree, hf_skinny_statsProcessingType, tvb, i, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_statsProcessingType, tvb, i, 4, ENC_LITTLE_ENDIAN); break; case 0x0108: /* SoftKeyTemplateResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_softKeyOffset, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_softKeyOffset, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); softKeyCount = tvb_get_letohl(tvb, offset+16); proto_tree_add_uint(skinny_tree, hf_skinny_softKeyCount, tvb, offset+16, 4, softKeyCount); - proto_tree_add_item(skinny_tree, hf_skinny_totalSoftKeyCount, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_totalSoftKeyCount, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); for (i = 0; ((i < StationMaxSoftKeyDefinition) && (i < softKeyCount)); i++){ - proto_tree_add_item(skinny_tree, hf_skinny_softKeyLabel, tvb, offset+(i*20)+24, StationMaxSoftKeyLabelSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_softKeyEvent, tvb, offset+(i*20)+40, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_softKeyLabel, tvb, offset+(i*20)+24, StationMaxSoftKeyLabelSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_softKeyEvent, tvb, offset+(i*20)+40, 4, ENC_LITTLE_ENDIAN); } /* there is more data here, but it doesn't make a whole lot of sense, I imagine * it's just some not zero'd out stuff in the packet or... @@ -2252,25 +2252,25 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0109: /* SoftKeySetResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_softKeySetOffset, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_softKeySetOffset, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); softKeySetCount = tvb_get_letohl(tvb, offset+16); proto_tree_add_uint(skinny_tree, hf_skinny_softKeySetCount, tvb, offset+16, 4, softKeySetCount); - proto_tree_add_item(skinny_tree, hf_skinny_totalSoftKeySetCount, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_totalSoftKeySetCount, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); for (i = 0; ((i < StationMaxSoftKeySetDefinition) && (i < softKeySetCount)); i++) { proto_tree_add_uint(skinny_tree, hf_skinny_softKeySetDescription, tvb, offset+24+(i*48) , 1, i); for (j = 0; j < StationMaxSoftKeyIndex; j++) { - proto_tree_add_item(skinny_tree, hf_skinny_softKeyTemplateIndex, tvb, offset+24+(i*48)+j, 1, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_softKeyTemplateIndex, tvb, offset+24+(i*48)+j, 1, ENC_LITTLE_ENDIAN); } for (j = 0; j < StationMaxSoftKeyIndex; j++) { - proto_tree_add_item(skinny_tree, hf_skinny_softKeyInfoIndex, tvb, offset+24+(i*48)+StationMaxSoftKeyIndex+(j*2), 2, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_softKeyInfoIndex, tvb, offset+24+(i*48)+StationMaxSoftKeyIndex+(j*2), 2, ENC_LITTLE_ENDIAN); } } break; case 0x0110: /* SelectSoftKeysMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_softKeySetDescription, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_softKeySetDescription, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); validKeyMask = tvb_get_letohs(tvb, offset + 24); skm = proto_tree_add_uint(skinny_tree, hf_skinny_softKeyMap, tvb, offset + 24, 4, validKeyMask); skm_tree = proto_item_add_subtree(skm, ett_skinny_softKeyMap); @@ -2295,40 +2295,40 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0111: /* CallStateMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_callState, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callState, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); si->callState = tvb_get_letohl(tvb, offset+12); break; case 0x0112: /* DisplayPromptStatusMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayPromptStatusSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+48, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+52, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayPromptStatusSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+48); si->callId = tvb_get_letohl(tvb, offset+52); break; case 0x0113: /* ClearPromptStatusMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance , tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance , tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); si->callId = tvb_get_letohl(tvb, offset+16); break; case 0x0114: /* DisplayNotifyMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayNotifySize , TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayNotifySize , ENC_LITTLE_ENDIAN); break; case 0x0115: /* ClearNotifyMessage */ break; case 0x0116: /* ActivateCallPlaneMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); break; @@ -2336,12 +2336,12 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x0118: /* UnregisterAckMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceUnregisterStatus, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceUnregisterStatus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0119: /* BackSpaceReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); si->callId = tvb_get_letohl(tvb, offset+16); break; @@ -2350,35 +2350,35 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x011B: /* RegisterTokenReject */ - proto_tree_add_item(skinny_tree, hf_skinny_tokenRejWaitTime, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_tokenRejWaitTime, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x011C: /* StartMediaFailureDetection */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_echoCancelType, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+34, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_millisecondPacketSize, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_echoCancelType, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_g723BitRate, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+34, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+34); break; case 0x011D: /* DialedNumberMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12+StationMaxDirnumSize, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+12+StationMaxDirnumSize+4, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12+StationMaxDirnumSize, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+12+StationMaxDirnumSize+4, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12+StationMaxDirnumSize); si->callId = tvb_get_letohl(tvb, offset+16+StationMaxDirnumSize); break; case 0x011E: /* UserToDeviceDataMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+28); dissect_skinny_xml(skinny_tree, tvb, pinfo, offset+30, count); si->lineId = tvb_get_letohl(tvb, offset+16); @@ -2386,134 +2386,134 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x011F: /* FeatureStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_featureIndex, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_featureID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_featureTextLabel, tvb, offset+20, StationMaxNameSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_featureStatus, tvb, offset+20+StationMaxNameSize, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_featureIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_featureID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_featureTextLabel, tvb, offset+20, StationMaxNameSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_featureStatus, tvb, offset+20+StationMaxNameSize, 4, ENC_LITTLE_ENDIAN); break; case 0x0120: /* DisplayPriNotifyMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_priority, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_notify, tvb, offset+16, StationMaxDisplayNotifySize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_priority, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_notify, tvb, offset+16, StationMaxDisplayNotifySize, ENC_LITTLE_ENDIAN); break; case 0x0121: /* ClearPriNotifyMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_priority, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_priority, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0122: /* StartAnnouncementMessage */ count = offset+12; for ( i = 0; i < MaxAnnouncementList; i++ ) { - proto_tree_add_item(skinny_tree, hf_skinny_locale, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_locale, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_country, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_country, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; } - proto_tree_add_item(skinny_tree, hf_skinny_endOfAnnAck, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_endOfAnnAck, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; for ( i = 0; i < StationMaxMonitorParties; i++ ) { - proto_tree_add_item(skinny_tree, hf_skinny_matrixConfPartyID, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_matrixConfPartyID, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; } - proto_tree_add_item(skinny_tree, hf_skinny_hearingConfPartyMask, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_hearingConfPartyMask, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_tree, hf_skinny_annPlayMode, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_annPlayMode, tvb, count, 4, ENC_LITTLE_ENDIAN); break; case 0x0123: /* StopAnnouncementMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0124: /* AnnouncementFinishMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_annPlayStatus, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_annPlayStatus, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; case 0x0127: /* NotifyDtmfToneMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x0128: /* SendDtmfToneMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_deviceTone, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x0129: /* SubscribeDtmfPayloadReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x012A: /* SubscribeDtmfPayloadResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x012B: /* SubscribeDtmfPayloadErrMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x012C: /* UnSubscribeDtmfPayloadReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x012D: /* UnSubscribeDtmfPayloadResMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x012E: /* UnSubscribeDtmfPayloadErrMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_payloadDtmf, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+20); break; case 0x012F: /* ServiceURLStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_serviceURLIndex, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_serviceURL, tvb, offset+16, StationMaxServiceURLSize, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_serviceURLDisplayName, tvb, offset+16+StationMaxServiceURLSize, StationMaxNameSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_serviceURLIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_serviceURL, tvb, offset+16, StationMaxServiceURLSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_serviceURLDisplayName, tvb, offset+16+StationMaxServiceURLSize, StationMaxNameSize, ENC_LITTLE_ENDIAN); break; case 0x0130: /* CallSelectStatMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_callSelectStat, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callSelectStat, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x0131: /* OpenMultiMediaChannelMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payload_rfc_number, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadType, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_isConferenceCreator, tvb, offset+40, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payload_rfc_number, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadType, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_isConferenceCreator, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->lineId = tvb_get_letohl(tvb, offset+24); si->callId = tvb_get_letohl(tvb, offset+28); @@ -2521,143 +2521,143 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add audio part of union */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 12, "audioParameters"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_millisecondPacketSize, tvb, offset+44, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_echoCancelType, tvb, offset+48, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_g723BitRate, tvb, offset+52, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_millisecondPacketSize, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_echoCancelType, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_g723BitRate, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); /* add video part of union */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 30, "vidParameters"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_bitRate, tvb, offset+44, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureFormatCount, tvb, offset+48, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_bitRate, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureFormatCount, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); skinny_sub_tree_sav = skinny_sub_tree; count = offset+52; for ( i = 0; i < MAX_PICTURE_FORMAT; i++ ) { ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8 * MAX_PICTURE_FORMAT, "pictureFormat[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_format, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_format, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_MPI, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_MPI, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; } skinny_sub_tree = skinny_sub_tree_sav; - proto_tree_add_item(skinny_sub_tree, hf_skinny_confServiceNum, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_confServiceNum, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; val = count; /* add H261 part of union */ ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "h261VideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOffCapability, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOffCapability, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_stillImageTransmission, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_stillImageTransmission, tvb, count, 4, ENC_LITTLE_ENDIAN); /* add H263 part of union */ count = val; ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "h263VideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_h263_capability_bitfield, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_h263_capability_bitfield, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_annexNandWFutureUse, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_annexNandWFutureUse, tvb, count, 4, ENC_LITTLE_ENDIAN); /* add Vieo part of union */ count = val; ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "vieoVideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_modelNumber, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_modelNumber, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_bandwidth, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_bandwidth, tvb, count, 4, ENC_LITTLE_ENDIAN); /* add data part of union */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "dataParameters"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_protocolDependentData, tvb, offset+44, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, offset+48, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_protocolDependentData, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); break; case 0x0132: /* StartMultiMediaTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+24, 4, FALSE); - proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payload_rfc_number, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_payloadType, tvb, offset+40, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_DSCPValue, tvb, offset+44, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadCapability, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payload_rfc_number, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_payloadType, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_DSCPValue, tvb, offset+44, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+32); /* add audio part of union */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 12, "audioParameters"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_millisecondPacketSize, tvb, offset+48, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_echoCancelType, tvb, offset+52, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_g723BitRate, tvb, offset+56, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_millisecondPacketSize, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_echoCancelType, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_g723BitRate, tvb, offset+56, 4, ENC_LITTLE_ENDIAN); /* add video part of union */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 30, "vidParameters"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_bitRate, tvb, offset+48, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureFormatCount, tvb, offset+52, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_bitRate, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureFormatCount, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); skinny_sub_tree_sav = skinny_sub_tree; count = offset+56; for ( i = 0; i < MAX_PICTURE_FORMAT; i++ ) { ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8 * MAX_PICTURE_FORMAT, "pictureFormat[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_format, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_format, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_MPI, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_MPI, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; } skinny_sub_tree = skinny_sub_tree_sav; - proto_tree_add_item(skinny_sub_tree, hf_skinny_confServiceNum, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_confServiceNum, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; val = count; /* add H261 part of union */ ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "h261VideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOffCapability, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOffCapability, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_stillImageTransmission, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_stillImageTransmission, tvb, count, 4, ENC_LITTLE_ENDIAN); /* add H263 part of union */ count = val; ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "h263VideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_h263_capability_bitfield, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_h263_capability_bitfield, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_annexNandWFutureUse, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_annexNandWFutureUse, tvb, count, 4, ENC_LITTLE_ENDIAN); /* add Vieo part of union */ count = val; ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "vieoVideoCapability"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_modelNumber, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_modelNumber, tvb, count, 4, ENC_LITTLE_ENDIAN); count += 4; - proto_tree_add_item(skinny_sub_tree, hf_skinny_bandwidth, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_bandwidth, tvb, count, 4, ENC_LITTLE_ENDIAN); /* add data part of union */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "dataParameters"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_protocolDependentData, tvb, offset+48, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, offset+52, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_protocolDependentData, tvb, offset+48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_maxBitRate, tvb, offset+52, 4, ENC_LITTLE_ENDIAN); break; case 0x0133: /* StopMultiMediaTransmission */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x0134: /* MiscellaneousCommandMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_miscCommandType, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_miscCommandType, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); @@ -2670,109 +2670,109 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* show videoFastUpdateGOB */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "videoFastUpdateGOB"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_firstGOB, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_numberOfGOBs, tvb, offset+32, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_firstGOB, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_numberOfGOBs, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); /* show videoFastUpdateMB */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "videoFastUpdateGOB"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_firstGOB, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_firstMB, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_numberOfMBs, tvb, offset+36, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_firstGOB, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_firstMB, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_numberOfMBs, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); /* show lostPicture */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "lostPicture"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureNumber, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_longTermPictureIndex, tvb, offset+32, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureNumber, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_longTermPictureIndex, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); /* show lostPartialPicture */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "lostPartialPicture"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureNumber, tvb, offset+28, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_longTermPictureIndex, tvb, offset+32, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_firstMB, tvb, offset+36, 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_numberOfMBs, tvb, offset+40, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureNumber, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_longTermPictureIndex, tvb, offset+32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_firstMB, tvb, offset+36, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_numberOfMBs, tvb, offset+40, 4, ENC_LITTLE_ENDIAN); /* show recoveryReferencePicture */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "recoveryReferencePicture"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_recoveryReferencePictureCount, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_recoveryReferencePictureCount, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); skinny_sub_tree_sav = skinny_sub_tree; for ( i = 0; i < MAX_REFERENCE_PICTURE; i++ ) { ti_sub = proto_tree_add_text(skinny_sub_tree_sav, tvb, offset, 8, "recoveryReferencePicture[%d]", i); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureNumber, tvb, offset+32+(i*8), 4, TRUE); - proto_tree_add_item(skinny_sub_tree, hf_skinny_longTermPictureIndex, tvb, offset+36+(i*8), 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_pictureNumber, tvb, offset+32+(i*8), 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_sub_tree, hf_skinny_longTermPictureIndex, tvb, offset+36+(i*8), 4, ENC_LITTLE_ENDIAN); } /* show temporalSpatialTradeOff */ ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 4, "temporalSpatialTradeOff"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOff, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_sub_tree, hf_skinny_temporalSpatialTradeOff, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); break; case 0x0135: /* FlowControlCommandMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_maxBitRate, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_maxBitRate, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x0136: /* CloseMultiMediaReceiveChannel */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->passThruId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x0137: /* CreateConferenceReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberOfReservedParticipants, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_resourceTypes, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_appID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfReservedParticipants, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_resourceTypes, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_appID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); count = offset+24; proto_tree_add_uint(skinny_tree, hf_skinny_appConfID, tvb, count, 1, AppConferenceIDSize); count += AppConferenceIDSize; proto_tree_add_uint(skinny_tree, hf_skinny_appData, tvb, count, 1, AppDataSize); count += AppDataSize; - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, count, 4, ENC_LITTLE_ENDIAN); val = tvb_get_letohl( tvb, count); count += 4; proto_tree_add_uint(skinny_tree, hf_skinny_passThruData, tvb, count, 1, val); break; case 0x0138: /* DeleteConferenceReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x0139: /* ModifyConferenceReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_numberOfReservedParticipants, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_appID, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_numberOfReservedParticipants, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_appID, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); count = offset+24; proto_tree_add_uint(skinny_tree, hf_skinny_appConfID, tvb, count, 1, AppConferenceIDSize); count += AppConferenceIDSize; proto_tree_add_uint(skinny_tree, hf_skinny_appData, tvb, count, 1, AppDataSize); count += AppDataSize; - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, count, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, count, 4, ENC_LITTLE_ENDIAN); val = tvb_get_letohl( tvb, count); count += 4; proto_tree_add_uint(skinny_tree, hf_skinny_passThruData, tvb, count, 1, val); break; case 0x013A: /* AddParticipantReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, offset+16); break; case 0x013B: /* DropParticipantReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(tvb, offset+16); break; @@ -2780,30 +2780,30 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x013D: /* AuditParticipantReqMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); break; case 0x013F: /* UserToDeviceDataVersion1Message */ - proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_applicationID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_transactionID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_data_length, tvb, offset+28, 4, ENC_LITTLE_ENDIAN); count = tvb_get_letohl( tvb, offset+28); - proto_tree_add_item(skinny_tree, hf_skinny_sequenceFlag, tvb, offset+30, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_displayPriority, tvb, offset+34, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+38, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_appInstanceID, tvb, offset+42, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_routingID, tvb, offset+46, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_sequenceFlag, tvb, offset+30, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_displayPriority, tvb, offset+34, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+38, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_appInstanceID, tvb, offset+42, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_routingID, tvb, offset+46, 4, ENC_LITTLE_ENDIAN); dissect_skinny_xml(skinny_tree, tvb, pinfo, offset+50, count); si->lineId = tvb_get_letohl(tvb, offset+16); si->callId = tvb_get_letohl(tvb, offset+20); break; case 0x014A: /* CM5CallInfoMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_callType, tvb, offset+20, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_callType, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); si->lineId = tvb_get_letohl(tvb, offset+12); /* 5x unknown uint32_t stuff */ /* strings */ @@ -2813,90 +2813,90 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* 8x party numbers */ count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; /* 4x party names */ count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); } else if(hdr_version == CM7_MSG_TYPE_B || hdr_version == CM7_MSG_TYPE_A) {/* I'm not sure. Not enough examples. */ /* 8x party numbers */ count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; /* 4x party names */ count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); i += count; count = tvb_strnlen(tvb, i, -1)+1; - proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, TRUE); + proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN); } } break; case 0x0152: /* DialedPhoneBookAckMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_directoryIndex, tvb, offset+12, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+20, 4, TRUE); - proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+24, 4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_directoryIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+24, 4, ENC_LITTLE_ENDIAN); break; case 0x015A: /* XMLAlarmMessage */ @@ -2904,7 +2904,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_item(skinny_tree, hf_skinny_rawData, tvb, offset+12, hdr_data_length-4, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_rawData, tvb, offset+12, hdr_data_length-4, ENC_LITTLE_ENDIAN); break; } } diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 1bc7bc388e..4a658d841a 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -153,7 +153,7 @@ static int dissect_tapa_discover_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_discover_tree, guint32 offset, gint remaining) { proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_switchip, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", Switch: %s", @@ -162,16 +162,16 @@ dissect_tapa_discover_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_ offset += 4; proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_unused, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_bias, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; remaining -= 6; proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_pad, tvb, offset, remaining, - FALSE); + ENC_BIG_ENDIAN); offset += remaining; return offset; @@ -206,18 +206,18 @@ dissect_tapa_discover_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_di tapa_discover_item_tree = proto_item_add_subtree(item, ett_tapa_discover_req); proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_req_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_req_pad, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_req_length, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_req_value, tvb, offset, item_length, - FALSE); + ENC_BIG_ENDIAN); offset += item_length; remaining -= (item_length + 4); @@ -260,23 +260,23 @@ dissect_tapa_discover_unknown_new_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_t tapa_discover_item_tree = proto_item_add_subtree(item, ett_tapa_discover_req); proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_pad, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_length, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; if (is_ascii) proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuetext, - tvb, offset, item_length, FALSE); + tvb, offset, item_length, ENC_BIG_ENDIAN); else proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuehex, - tvb, offset, item_length, FALSE); + tvb, offset, item_length, ENC_BIG_ENDIAN); offset += item_length; remaining -= (item_length + 4); @@ -305,19 +305,19 @@ dissect_tapa_discover(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_tapa, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); tapa_discover_tree = proto_item_add_subtree(ti, ett_tapa_discover); proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_flags, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_length, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; switch (packet_type) { @@ -334,7 +334,7 @@ dissect_tapa_discover(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_unknown, tvb, offset, - remaining, FALSE); + remaining, ENC_BIG_ENDIAN); offset += 1; break; @@ -364,49 +364,49 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_tapa, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); tapa_tunnel_tree = proto_item_add_subtree(ti, ett_tapa_tunnel); proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_version, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_five, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_zero, tvb, offset, 8, - FALSE); + ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_dmac, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_smac, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; switch (type) { case TAPA_TUNNEL_TYPE_0: proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_0804, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_tagsetc, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; break; case TAPA_TUNNEL_TYPE_1: proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_seqno, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_length, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; break; default: @@ -416,7 +416,7 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* FIXME: This is just to help figuring out what the bytes mean */ proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_remaining, tvb, - offset, remaining - offset, FALSE); + offset, remaining - offset, ENC_BIG_ENDIAN); offset = remaining; } diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index f84eacfc80..4f754e6c32 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -74,10 +74,10 @@ dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) telkonet_tree = NULL; - ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, FALSE); + ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, ENC_BIG_ENDIAN); telkonet_tree = proto_item_add_subtree(ti, ett_telkonet); - proto_tree_add_item(telkonet_tree, hf_telkonet_type, tvb, 0, 8, FALSE); + proto_tree_add_item(telkonet_tree, hf_telkonet_type, tvb, 0, 8, ENC_BIG_ENDIAN); offset += 8; if (type == TELKONET_TYPE_TUNNEL) diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 3930da28bc..17f2f401b6 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -138,9 +138,9 @@ tftp_dissect_options(tvbuff_t *tvb, packet_info *pinfo, int offset, opt_tree = proto_item_add_subtree(opt_item, ett_tftp_option); proto_tree_add_item(opt_tree, hf_tftp_option_name, tvb, offset, - option_len, FALSE); + option_len, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_tftp_option_value, tvb, value_offset, - value_len, FALSE); + value_len, ENC_BIG_ENDIAN); offset += option_len + value_len; @@ -182,7 +182,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, val_to_str(opcode, tftp_opcode_vals, "Unknown (0x%04x)")); if (tree) { - ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, ENC_BIG_ENDIAN); tftp_tree = proto_item_add_subtree(ti, ett_tftp); if (tftp_info->source_file) { @@ -207,7 +207,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, case TFTP_RRQ: i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_source_file, - tvb, offset, i1, FALSE); + tvb, offset, i1, ENC_BIG_ENDIAN); tftp_info->source_file = tvb_get_seasonal_string(tvb, offset, i1); @@ -218,7 +218,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_transfer_type, - tvb, offset, i1, FALSE); + tvb, offset, i1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s", tvb_format_stringzpad(tvb, offset, i1)); @@ -232,7 +232,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, case TFTP_WRQ: i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_destination_file, - tvb, offset, i1, FALSE); + tvb, offset, i1, ENC_BIG_ENDIAN); tftp_info->destination_file = tvb_get_seasonal_string(tvb, offset, i1); @@ -244,7 +244,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_transfer_type, - tvb, offset, i1, FALSE); + tvb, offset, i1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s", tvb_format_stringzpad(tvb, offset, i1)); @@ -300,7 +300,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_error_string, tvb, offset, - i1, FALSE); + i1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, ", Message: %s", tvb_format_stringzpad(tvb, offset, i1)); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index cc8308622c..e889f03e8a 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -213,7 +213,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_frp, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); vines_frp_tree = proto_item_add_subtree(ti, ett_vines_frp); vines_frp_ctrl = tvb_get_guint8(tvb, 0); @@ -315,7 +315,7 @@ dissect_vines_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Unknown protocol 0x%02x")); if (tree) { ti = proto_tree_add_item(tree, proto_vines_llc, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); vines_llc_tree = proto_item_add_subtree(ti, ett_vines_llc); proto_tree_add_text(vines_llc_tree, tvb, 0, 1, @@ -429,7 +429,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_ip, tvb, offset, viph.vip_pktlen, - FALSE); + ENC_BIG_ENDIAN); vip_tree = proto_item_add_subtree(ti, ett_vines_ip); proto_tree_add_text(vip_tree, tvb, offset, 2, "Packet checksum: 0x%04x", @@ -539,7 +539,7 @@ dissect_vines_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_echo, tvb, 0, -1, - FALSE); + ENC_BIG_ENDIAN); vines_echo_tree = proto_item_add_subtree(ti, ett_vines_echo); proto_tree_add_text(vines_echo_tree, tvb, 0, -1, "Data"); } @@ -665,7 +665,7 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_ipc, tvb, offset, - sizeof(viph), FALSE); + sizeof(viph), ENC_BIG_ENDIAN); vipc_tree = proto_item_add_subtree(ti, ett_vines_ipc); proto_tree_add_text(vipc_tree, tvb, offset, 2, "Source port: 0x%04x", viph.vipc_sport); @@ -836,7 +836,7 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_spp, tvb, offset, - sizeof(viph), FALSE); + sizeof(viph), ENC_BIG_ENDIAN); vspp_tree = proto_item_add_subtree(ti, ett_vines_spp); proto_tree_add_text(vspp_tree, tvb, offset, 2, "Source port: 0x%04x", viph.vspp_sport); @@ -960,7 +960,7 @@ dissect_vines_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_arp, tvb, 0, -1, - FALSE); + ENC_BIG_ENDIAN); vines_arp_tree = proto_item_add_subtree(ti, ett_vines_arp); } @@ -1138,7 +1138,7 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_rtp, tvb, 0, -1, - FALSE); + ENC_BIG_ENDIAN); vines_rtp_tree = proto_item_add_subtree(ti, ett_vines_rtp); } @@ -1643,7 +1643,7 @@ dissect_vines_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_icp, tvb, 0, -1, - FALSE); + ENC_BIG_ENDIAN); vines_icp_tree = proto_item_add_subtree(ti, ett_vines_icp); } diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index d6146e0dde..315fd63214 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -775,7 +775,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, tvbuff_t *snmp_tvb; /* Don't add SNMP stuff to the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_writable(pinfo->cinfo, FALSE); snmp_tvb = tvb_new_subset(tvb, offset, length, length); @@ -792,7 +792,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, " [Malformed or short SNMP subpacket] " ); } ENDTRY; - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_writable(pinfo->cinfo, TRUE); offset += length; @@ -807,7 +807,7 @@ dissect_ieee80211(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, tvbuff_t *ieee80211_tvb; /* Don't add IEEE 802.11 stuff to the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_writable(pinfo->cinfo, FALSE); ieee80211_tvb = tvb_new_subset(tvb, offset, length, length); @@ -824,7 +824,7 @@ dissect_ieee80211(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, " [Malformed or short IEEE 802.11 subpacket] " ); } ENDTRY; - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_writable(pinfo->cinfo, TRUE); offset += length; @@ -856,13 +856,13 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, tlv_tree = proto_item_add_subtree(tlv_item, ett_wassp_tlv_header); type_item = proto_tree_add_item(tlv_tree, hf_wassp_tlv_type, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(type_item, " = %s", extval_to_str_idx(tlv_type, value_array, &type_index, "Unknown")); offset += 2; proto_tree_add_item(tlv_tree, hf_wassp_tlv_length, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; tlv_length -= 4; @@ -876,10 +876,10 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, if ( type_index != -1 && value_array[type_index].hf_element) { proto_tree_add_item(tlv_tree, *(value_array[type_index].hf_element), - tvb, offset, tlv_length, FALSE); + tvb, offset, tlv_length, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tlv_tree, hf_wassp_tlv_data, - tvb, offset, tlv_length, FALSE); + tvb, offset, tlv_length, ENC_BIG_ENDIAN); } if ( type_index != -1 && value_array[type_index].specialfunction ) { guint32 newoffset; @@ -915,62 +915,62 @@ dissect_wassp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Header dissection */ ti = proto_tree_add_item(tree, proto_wassp, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); wassp_tree = proto_item_add_subtree(ti, ett_wassp); proto_tree_add_item(wassp_tree, hf_wassp_version, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(wassp_tree, hf_wassp_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; switch (packet_type) { case 1: /* Discover ??? */ proto_tree_add_item(wassp_tree, hf_wassp_discover1, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; packet_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(wassp_tree, hf_wassp_length, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(wassp_tree, hf_wassp_discover2, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; subtype = tvb_get_ntohs(tvb, offset); proto_tree_add_item(wassp_tree, hf_wassp_subtype, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; switch (subtype) { case 1: proto_tree_add_item(wassp_tree, hf_wassp_ether, tvb, offset, 6, - FALSE); + ENC_BIG_ENDIAN); offset += 6; break; case 2: proto_tree_add_item(wassp_tree, hf_wassp_discover3, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; break; } break; default: proto_tree_add_item(wassp_tree, hf_wassp_seqno, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(wassp_tree, hf_wassp_flags, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(wassp_tree, hf_wassp_sessionid, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; packet_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(wassp_tree, hf_wassp_length, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; break; diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index a07dc1f2c3..8e84bc85c4 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -801,11 +801,11 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_wlccp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_wlccp, tvb, 0, -1, ENC_BIG_ENDIAN); wlccp_tree = proto_item_add_subtree(ti, ett_wlccp); proto_tree_add_item(wlccp_tree, hf_wlccp_version, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* interpretation of the packet is determined by WLCCP version */ version = tvb_get_guint8(tvb, 0); @@ -813,24 +813,24 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(version == 0x0) { proto_tree_add_item(wlccp_tree, hf_wlccp_length, - tvb, 1, 1, FALSE); + tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(wlccp_tree, hf_wlccp_type, - tvb, 2, 2, FALSE); + tvb, 2, 2, ENC_BIG_ENDIAN); type = tvb_get_ntohs(tvb, 2); proto_tree_add_item(wlccp_tree, hf_wlccp_dstmac, - tvb, 4, 6, FALSE); + tvb, 4, 6, ENC_BIG_ENDIAN); proto_tree_add_item(wlccp_tree, hf_wlccp_srcmac, - tvb, 10, 6, FALSE); + tvb, 10, 6, ENC_BIG_ENDIAN); if(type == 0x4081) { proto_tree_add_item(wlccp_tree, hf_wlccp_ipv4_address, - tvb, 38, 4, FALSE); + tvb, 38, 4, ENC_BIG_ENDIAN); proto_tree_add_item(wlccp_tree, hf_wlccp_hostname, - tvb, 44, 28, FALSE); + tvb, 44, 28, ENC_BIG_ENDIAN); } /* if type = 0x4081 */ } /* if version == 0x00 */ @@ -839,14 +839,14 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* SAP Field */ ti = proto_tree_add_item(wlccp_tree, hf_wlccp_sap, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); wlccp_sap_tree = proto_item_add_subtree(ti, ett_wlccp_sap_tree); proto_tree_add_item(wlccp_sap_tree, hf_wlccp_sap_version, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(wlccp_sap_tree, hf_wlccp_sap_id, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); sap_id = tvb_get_guint8(tvb,offset) & SAP_VALUE_MASK; @@ -855,22 +855,22 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* SAP Field */ proto_tree_add_item(wlccp_tree, hf_wlccp_destination_node_type, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(wlccp_tree, hf_wlccp_length, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; { /* Message Type Field */ ti = proto_tree_add_item(wlccp_tree, hf_wlccp_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); wlccp_type_tree = proto_item_add_subtree(ti, ett_wlccp_type); proto_tree_add_item(wlccp_type_tree, hf_wlccp_subtype, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); switch (sap_id) { @@ -879,7 +879,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_0, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -888,7 +888,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WLCCP_SAP_SEC: { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_1, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -897,7 +897,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WLCCP_SAP_RRM: { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_2, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -906,7 +906,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WLCCP_SAP_QOS: { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_3, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -915,7 +915,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WLCCP_SAP_NM: { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_4, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -924,7 +924,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WLCCP_SAP_MIP: { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_5, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -934,7 +934,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_unknown, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; @@ -1091,50 +1091,50 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off guint16 _eap_msg_length=0; proto_tree_add_item(_tree, hf_wlccp_hops, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_msg_id, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; /* Decode the CM Flags Field */ _ti = proto_tree_add_item(_tree, hf_wlccp_flags, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _wlccp_cm_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_cm_flags); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_retry_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_response_request_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_tlv_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _tlv_flag = (tvb_get_ntohs(_tvb, _offset)>>13) & 1; set_tlv_flag(_tlv_flag); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_inbound_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_outbound_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_hopwise_routing_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_root_cm_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_relay_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _relay_flag = (tvb_get_ntohs(_tvb, _offset)>>8) & 1; proto_tree_add_item(_wlccp_cm_flags_tree, hf_wlccp_mic_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _mic_flag = (tvb_get_ntohs(_tvb, _offset)>>7) & 1; set_mic_flag(_mic_flag); @@ -1144,29 +1144,29 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_originator_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_responder_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_responder, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; if(_relay_flag) { proto_tree_add_item(_tree, hf_wlccp_relay_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_relay_node_id, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; } /* if _relay_flag */ @@ -1178,50 +1178,50 @@ 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, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; /* Decode the SCM Flags Field */ _ti = proto_tree_add_item(_tree, hf_wlccp_scm_flags, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _wlccp_scm_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_scm_flags); proto_tree_add_item(_wlccp_scm_flags_tree, hf_wlccp_scm_layer2update_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_scm_flags_tree, hf_wlccp_scm_unattached_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_scm_flags_tree, hf_wlccp_scm_unscheduled_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_scm_flags_tree, hf_wlccp_scm_active_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; /* End Decode the SCM Flags Field */ proto_tree_add_item(_tree, hf_wlccp_scm_election_group, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_scm_attach_count, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* Decode the SCM Priority Flags Field */ _ti = proto_tree_add_item(_tree, hf_wlccp_scm_priority_flags, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _wlccp_scm_priority_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_scm_priority_flags); proto_tree_add_item(_wlccp_scm_priority_flags_tree, hf_wlccp_scm_priority, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_scm_priority_flags_tree, hf_wlccp_scm_preferred_flag, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; @@ -1230,41 +1230,41 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* Decode the SCM Bridge Priority Flags Field */ _ti = proto_tree_add_item(_tree, hf_wlccp_scm_bridge_priority_flags, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _wlccp_scm_bridge_priority_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_scm_bridge_priority_flags); proto_tree_add_item(_wlccp_scm_bridge_priority_flags_tree, hf_wlccp_scm_bridge_priority, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_scm_bridge_priority_flags_tree, hf_wlccp_scm_bridge_disable_flag, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* End Decode the SCM Bridge Priority Flags Field */ proto_tree_add_item(_tree, hf_wlccp_scm_node_id, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_scm_unknown_short, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_scm_instance_age, - _tvb, _offset, 4, FALSE); + _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; proto_tree_add_item(_tree, hf_wlccp_scm_path_cost, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_scm_hop_count, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_scm_advperiod, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; break; @@ -1327,11 +1327,11 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x0b: /* cmAAA */ { proto_tree_add_item(_tree, hf_wlccp_requ_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_requ_node_id, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; /*kan - according to the patent applicatoin these fields vary based @@ -1340,20 +1340,20 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off the rest */ proto_tree_add_item(_tree, hf_wlccp_aaa_msg_type, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _aaa_msg_type=tvb_get_guint8(_tvb,_offset); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_aaa_auth_type, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_keymgmt_type, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_status, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* kan - I'm pretty sure this EAPOL tree only applies sometimes, but it's the only complete example that I have @@ -1364,7 +1364,7 @@ handle things. To be investigated further */ if (_aaa_msg_type == 0x2) /*EAPOL*/ { _ti = proto_tree_add_item(_tree, hf_wlccp_eapol_msg, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _wlccp_eapol_msg_tree = proto_item_add_subtree( _ti, ett_wlccp_eapol_msg_tree); @@ -1375,24 +1375,24 @@ handle things. To be investigated further */ _offset += 2; proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eapol_version, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eapol_type, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _eapol_type=tvb_get_guint8(_tvb, _offset); _offset += 1; if (_eapol_type == 0) { proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eap_msg_length, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _eap_msg_length=tvb_get_ntohs(_tvb, _offset); _offset += 2; proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eap_msg, - _tvb, _offset, _eap_msg_length, FALSE); + _tvb, _offset, _eap_msg_length, ENC_BIG_ENDIAN); _offset += _eap_msg_length; } /* if _eapol_type == 0 */ @@ -1402,7 +1402,7 @@ handle things. To be investigated further */ if (_aaa_msg_type == 0x3) /*Cisco proprietary message*/ { proto_tree_add_item(_tree, hf_wlccp_cisco_acctg_msg, - _tvb, _offset, -1, FALSE); + _tvb, _offset, -1, ENC_BIG_ENDIAN); } /* if aaa_msg_type == 0x3 */ break; @@ -1411,20 +1411,20 @@ handle things. To be investigated further */ case 0x0c: /* cmPathInit */ { proto_tree_add_item(_tree, hf_wlccp_requ_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_requ_node_id, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; /*kan - there's a reserved alignment byte right here*/ proto_tree_add_item(_tree, hf_wlccp_path_init_rsvd, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_status, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset +=1; break; @@ -1433,11 +1433,11 @@ handle things. To be investigated further */ case 0x0f: /* cmWIDS */ { proto_tree_add_item(_tree, hf_wlccp_wids_msg_type, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_status, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset +=1; break; @@ -1497,12 +1497,12 @@ static guint dissect_wlccp_rrm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* Decode the RM Flags Field */ _ti = proto_tree_add_item(_tree, hf_wlccp_rm_flags, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _wlccp_rm_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_rm_flags); proto_tree_add_item(_wlccp_rm_flags_tree, hf_wlccp_rm_mic_flag, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _mic_flag = (tvb_get_guint8(_tvb, _offset) & RM_F_MIC) >> 1; @@ -1511,30 +1511,30 @@ static guint dissect_wlccp_rrm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off set_tlv_flag(TRUE); proto_tree_add_item(_wlccp_rm_flags_tree, hf_wlccp_rm_request_reply_flag, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* End Decode the RM Flags Field */ proto_tree_add_item(_tree, hf_wlccp_msg_id, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_responder_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_responder, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; @@ -1609,34 +1609,34 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs proto_tree_add_item(_tree, hf_wlccp_nm_version, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_msg_id, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; /* Decode the NM Flags Field */ _ti = proto_tree_add_item(_tree, hf_wlccp_flags, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _wlccp_nm_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_nm_flags); proto_tree_add_item(_wlccp_nm_flags_tree, hf_wlccp_retry_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_nm_flags_tree, hf_wlccp_ack_required_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_wlccp_nm_flags_tree, hf_wlccp_tlv_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _tlv_flag = (tvb_get_ntohs(_tvb, _offset)>>13) & 1; set_tlv_flag(_tlv_flag); proto_tree_add_item(_wlccp_nm_flags_tree, hf_wlccp_mic_flag, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _mic_flag = (tvb_get_ntohs(_tvb, _offset)>>7) & 1; set_mic_flag(_mic_flag); @@ -1646,19 +1646,19 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs proto_tree_add_item(_tree, hf_wlccp_originator_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_originator, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; proto_tree_add_item(_tree, hf_wlccp_responder_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_tree, hf_wlccp_responder, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; @@ -1673,7 +1673,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x10: /* nmConfigRequest */ { proto_tree_add_item(_tree, hf_wlccp_nmconfig, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* kan - there appears to be some padding or other unknowns here */ @@ -1685,7 +1685,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x11: /* nmConfigReply */ { proto_tree_add_item(_tree, hf_wlccp_nmconfig, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* kan - there appears to be some padding or other unknowns here */ @@ -1697,27 +1697,27 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x20: /* nmApRegistration */ { proto_tree_add_item(_tree, hf_wlccp_timestamp, - _tvb, _offset, 8, FALSE); + _tvb, _offset, 8, ENC_BIG_ENDIAN); _offset += 8; proto_tree_add_item(_tree, hf_wlccp_apregstatus, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; _offset += 3; /*kan - skip some apparently unused bytes */ _ti = proto_tree_add_item(_tree, hf_wlccp_ap_node_id, - _tvb, _offset, 8, FALSE); + _tvb, _offset, 8, ENC_BIG_ENDIAN); _wlccp_ap_node_id_tree = proto_item_add_subtree( _ti, ett_wlccp_ap_node_id); proto_tree_add_item(_wlccp_ap_node_id_tree, hf_wlccp_ap_node_type, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; proto_tree_add_item(_wlccp_ap_node_id_tree, hf_wlccp_ap_node_id_address, - _tvb, _offset, 6, FALSE); + _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; break; @@ -1726,15 +1726,15 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x21: /* nmScmStateChange */ { proto_tree_add_item(_tree, hf_wlccp_timestamp, - _tvb, _offset, 8, FALSE); + _tvb, _offset, 8, ENC_BIG_ENDIAN); _offset += 8; proto_tree_add_item(_tree, hf_wlccp_scmstate_change, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_scmstate_change_reason, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /*kan - skip some apparently unused bytes */ @@ -1746,15 +1746,15 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x22: /* nmScmKeepActive */ { proto_tree_add_item(_tree, hf_wlccp_scmattach_state, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_nmconfig, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; proto_tree_add_item(_tree, hf_wlccp_nmcapability, - _tvb, _offset, 1, FALSE); + _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /*kan - skip some apparently unused bytes */ @@ -1766,7 +1766,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x30: /* nmClientEventReport */ { proto_tree_add_item(_tree, hf_wlccp_timestamp, - _tvb, _offset, 8, FALSE); + _tvb, _offset, 8, ENC_BIG_ENDIAN); _offset += 8; break; @@ -1775,7 +1775,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs case 0x31: /* nmAllClientRefreshRequest */ { proto_tree_add_item(_tree, hf_wlccp_refresh_req_id, - _tvb, _offset, 4, FALSE); + _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; break; @@ -1846,7 +1846,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse _tlv_end = _offset + _length; /* this TLV is _length bytes long */ - _ti = proto_tree_add_item(_tree, hf_wlccp_tlv, _tvb, _offset, _length, FALSE); + _ti = proto_tree_add_item(_tree, hf_wlccp_tlv, _tvb, _offset, _length, ENC_BIG_ENDIAN); /* create the TLV sub tree */ _tlv_tree = proto_item_add_subtree(_ti, ett_wlccp_tlv_tree); @@ -1859,7 +1859,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse DISSECTOR_ASSERT(_depth < 100); /* add the flags field to the tlv_tree */ - _ti = proto_tree_add_item(_tlv_tree, hf_tlv_flags, _tvb, _offset, 2, FALSE); + _ti = proto_tree_add_item(_tlv_tree, hf_tlv_flags, _tvb, _offset, 2, ENC_BIG_ENDIAN); _tlv_flags_tree = proto_item_add_subtree(_ti, ett_tlv_flags_tree); /* @@ -1878,54 +1878,54 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse _type_id = (tvb_get_ntohs(_tvb,_offset) & TLV_TYPE_ID); /* add the flags to the tree */ - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_container_flag, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_encrypted_flag, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_reserved_bit, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_group, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_request_flag, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_container_flag, _tvb, _offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_encrypted_flag, _tvb, _offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_reserved_bit, _tvb, _offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_group, _tvb, _offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_request_flag, _tvb, _offset, 2, ENC_BIG_ENDIAN); /* a hack to show the right string representation of the type_id in the tree */ switch (_group_id) { case WLCCP_TLV_GROUP_WLCCP: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type0, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type0, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case WLCCP_TLV_GROUP_WLCCP */ case WLCCP_TLV_GROUP_SEC: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type1, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type1, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case WLCCP_TLV_GROUP_SEC */ case WLCCP_TLV_GROUP_RRM: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type2, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type2, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case WLCCP_TLV_GROUP_RRM */ case WLCCP_TLV_GROUP_QOS: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type3, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type3, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case WLCCP_TLV_GROUP_QOS */ case WLCCP_TLV_GROUP_NM: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type4, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type4, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case WLCCP_TLV_GROUP_NM */ case WLCCP_TLV_GROUP_MIP: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type5, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type5, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case WLCCP_TLV_GROUP_MIP */ default: { - proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_flags_tree, hf_wlccp_tlv_type, _tvb, _offset, 2, ENC_BIG_ENDIAN); break; } /* case default for switch _group_id */ @@ -1942,7 +1942,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse /* finished with the flags field */ /* add the length field to the tlv_tree */ - proto_tree_add_item(_tlv_tree, hf_wlccp_tlv_length, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tlv_tree, hf_wlccp_tlv_length, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; /* finished with the length field */ @@ -2052,7 +2052,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x00: /* NULL TLV */ { proto_item_append_text(_ti, " NULL TLV"); - proto_tree_add_item(_tree, hf_wlccp_null_tlv , _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_null_tlv , _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; @@ -2063,7 +2063,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x09: /* ipv4Address */ { proto_item_append_text(_ti, " IPv4Address"); - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; break; @@ -2076,7 +2076,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; @@ -2104,7 +2104,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_path_length, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_path_length, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ @@ -2119,28 +2119,28 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " inSecureContextReq"); - proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_dest_node_type, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_supp_node_type, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; /* skip unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, FALSE); + proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_BIG_ENDIAN); _offset += 32; break; @@ -2152,28 +2152,28 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " authenticator"); - proto_tree_add_item(_tree, hf_wlccp_dest_node_type, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_src_node_type, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_src_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; /* skip unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, FALSE); + proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_BIG_ENDIAN); _offset += 32; break; @@ -2186,14 +2186,14 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " mic"); - proto_tree_add_item(_tree, hf_wlccp_mic_msg_seq_count, _tvb, _offset, 8, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mic_msg_seq_count, _tvb, _offset, 8, ENC_BIG_ENDIAN); _offset += 8; - proto_tree_add_item(_tree, hf_wlccp_mic_length, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mic_length, _tvb, _offset, 2, ENC_BIG_ENDIAN); _mic_length = tvb_get_ntohs(_tvb,_offset); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_mic_value, _tvb, _offset, _mic_length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mic_value, _tvb, _offset, _mic_length, ENC_BIG_ENDIAN); _offset += _mic_length; break; @@ -2205,25 +2205,25 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " inSecureContextReply"); - proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_seq_count, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_dest_node_type, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_dest_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_supp_node_type, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, FALSE); + proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_BIG_ENDIAN); _offset += 32; - proto_tree_add_item(_tree, hf_wlccp_session_timeout, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_session_timeout, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; break; @@ -2235,7 +2235,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; @@ -2257,10 +2257,10 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x02: /* aggrRmReq */ { proto_item_append_text(_ti, " aggrRmReq"); - proto_tree_add_item(_tree, hf_wlccp_token2, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token2, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_interval, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_interval, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2271,13 +2271,13 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " rmReport"); - proto_tree_add_item(_tree, hf_wlccp_sta_type, _tvb, _offset, 1, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, FALSE); + proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; break; @@ -2296,19 +2296,19 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " beaconRequest"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_scan_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_scan_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; @@ -2322,26 +2322,26 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " frameRequest"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_count, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_count, _tvb, _offset, 1, ENC_BIG_ENDIAN); _count = tvb_get_guint8(_tvb,_offset); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; for (_counter=0; _counter < _count; _counter++) { - proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, FALSE); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; } /* for _counter=0 */ @@ -2361,19 +2361,19 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " frameReport"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; _arraylen=(_length-10)/14; @@ -2381,22 +2381,22 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off if (_arraylen > 0) { - _fr_ti = proto_tree_add_item(_tree, hf_framereport_elements, _tvb, _offset, (_length-10), FALSE); + _fr_ti = proto_tree_add_item(_tree, hf_framereport_elements, _tvb, _offset, (_length-10), ENC_BIG_ENDIAN); _fr_elems_tree = proto_item_add_subtree(_fr_ti, ett_framereport_elements_tree); for(_counter=0; _counter < _arraylen; _counter++) { - proto_tree_add_item(_fr_elems_tree, hf_wlccp_numframes, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_fr_elems_tree, hf_wlccp_numframes, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_fr_elems_tree, hf_wlccp_rss, _tvb, _offset, 1, FALSE); + 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, FALSE); + proto_tree_add_item(_fr_elems_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_fr_elems_tree, hf_wlccp_stamac, _tvb, _offset, 6, FALSE); + proto_tree_add_item(_fr_elems_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; } /* for _counter=0 */ @@ -2412,19 +2412,19 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " ccaRequest"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2435,22 +2435,22 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " ccaReport"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_ccabusy, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_ccabusy, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; break; @@ -2461,19 +2461,19 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " rpiHistRequest"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2486,24 +2486,24 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " rpiHistReport"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; _rpi_density_length = _length - 6 - 4; - proto_tree_add_item(_tree, hf_wlccp_rpidensity, _tvb, _offset, _rpi_density_length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_rpidensity, _tvb, _offset, _rpi_density_length, ENC_BIG_ENDIAN); _offset += _rpi_density_length; break; @@ -2514,19 +2514,19 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " nullRequest"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_duration, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2543,19 +2543,19 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " commonBeaconReport"); - proto_tree_add_item(_tree, hf_wlccp_srcidx, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_srcidx, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_channel, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_phy_type, _tvb, _offset, 1, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_beacon_interval, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_beacon_interval, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; @@ -2581,50 +2581,50 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off */ _new_ti = proto_tree_add_item(_tree, hf_wlccp_80211_capabilities, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); _80211_capabilities_tree = proto_item_add_subtree(_new_ti, ett_80211_capability_flags_tree); proto_tree_add_item(_80211_capabilities_tree, hf_80211_imm_block_ack, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_dlyd_block_ack, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_dsss_ofdm, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_reserved, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_apsd, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_short_time_slot, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_qos, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_spectrum_mgmt, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_chan_agility, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_pbcc, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_short_preamble, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_privacy, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_cf_poll_req, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_cf_pollable, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ibss, - _tvb, _offset, 2, FALSE); + _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ess, - _tvb, _offset, 2, FALSE);; + _tvb, _offset, 2, ENC_BIG_ENDIAN);; - /* proto_tree_add_item(_tree, hf_wlccp_capabilities, _tvb, _offset, 2, FALSE); */ + /* proto_tree_add_item(_tree, hf_wlccp_capabilities, _tvb, _offset, 2, ENC_BIG_ENDIAN); */ _offset += 2; _tlv80211length = _length - 13 - 4; /* This TLV could be decoded per the 802.11 information element spec's */ - proto_tree_add_item(_tree, hf_wlccp_tlv80211, _tvb, _offset, _tlv80211length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv80211, _tvb, _offset, _tlv80211length, ENC_BIG_ENDIAN); _offset += _tlv80211length; break; @@ -2636,22 +2636,22 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " aggrBeaconReport"); - proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_rss, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_rss, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_srcidx, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_srcidx, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_parent_tsf, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_parent_tsf, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_target_tsf, _tvb, _offset, 8, FALSE); + proto_tree_add_item(_tree, hf_wlccp_target_tsf, _tvb, _offset, 8, ENC_BIG_ENDIAN); _offset += 8; break; @@ -2673,13 +2673,13 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off for(_counter=0; _counter < _arraylen; _counter++) { - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, FALSE); + proto_tree_add_item(_tree, hf_wlccp_stamac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; } /* for _counter=0 */ @@ -2695,7 +2695,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item_append_text(_ti, " rmReqRoutingResp"); - proto_tree_add_item(_tree, hf_wlccp_token2, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_token2, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; _arraylen=(_length)/11; @@ -2706,13 +2706,13 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off for(_counter=0; _counter < _arraylen; _counter++) { - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; } /* for _counter=0 */ @@ -2726,7 +2726,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " rmReqAck"); - proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; break; @@ -2737,7 +2737,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " mfpCapability"); - proto_tree_add_item(_tree, hf_wlccp_mfpcapability, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mfpcapability, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2747,13 +2747,13 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " mfpRouting"); - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_bssid, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_mfpflags, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mfpflags, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2763,7 +2763,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { proto_item_append_text(_ti, " mfpConfig"); - proto_tree_add_item(_tree, hf_wlccp_mfpconfig, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_wlccp_mfpconfig, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; break; @@ -2775,7 +2775,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; @@ -2798,7 +2798,7 @@ static guint dissect_wlccp_qos_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; @@ -2824,28 +2824,28 @@ 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_auth_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_auth_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ @@ -2853,7 +2853,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _radius_user_name_length = _length - 23 - 4; - proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, ENC_BIG_ENDIAN); _offset += _radius_user_name_length; @@ -2864,16 +2864,16 @@ 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wds_reason, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wds_reason, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ @@ -2886,22 +2886,22 @@ 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_auth_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_auth_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ @@ -2915,19 +2915,19 @@ 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; /* skip some unused bytes */ _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; @@ -2941,28 +2941,28 @@ 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_clientmac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, FALSE); + 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, FALSE); + proto_tree_add_item(_tree, hf_wlccp_parent_ap_mac, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_reg_lifetime, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; - proto_tree_add_item(_tree, hf_wlccp_auth_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_auth_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, FALSE); + proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; /* skip some unused bytes */ @@ -2970,7 +2970,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _radius_user_name_length = _length - 23 - 4; - proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, ENC_BIG_ENDIAN); _offset += _radius_user_name_length; break; @@ -2983,10 +2983,10 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs /* skip some unused bytes */ _offset += 6; - proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, FALSE); + proto_tree_add_item(_tree, hf_time_elapsed, _tvb, _offset, 2, ENC_BIG_ENDIAN); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_refresh_req_id, _tvb, _offset, 4, FALSE); + proto_tree_add_item(_tree, hf_wlccp_refresh_req_id, _tvb, _offset, 4, ENC_BIG_ENDIAN); _offset += 4; @@ -2999,7 +2999,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; @@ -3024,7 +3024,7 @@ static guint dissect_wlccp_mip_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, FALSE); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); _offset += _length; break; |