diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-07-19 10:51:12 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-07-19 10:51:12 +0000 |
commit | f282154ab0134ac71a55c05560a96c02c079158b (patch) | |
tree | 1dc40a0b549031fb78f37dca8dce8a0dff23cd61 | |
parent | 93abdd9804d3de8b17a437be0a4a079a566f9485 (diff) |
Use correct encoding for proto_tree_add_item().
svn path=/trunk/; revision=38107
33 files changed, 433 insertions, 558 deletions
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index f0c77c7e3e..aac60fcbb0 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -231,7 +231,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create display subtree for the connectionless protocol */ if(parent_tree) { - item = proto_tree_add_item(parent_tree, proto_clacse, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_clacse, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_acse); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "CL-ACSE"); @@ -242,7 +242,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create display subtree for the protocol */ if(parent_tree) { - item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_acse); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE"); diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c index 0b391f8f99..f4e86cca4d 100644 --- a/asn1/cdt/packet-cdt-template.c +++ b/asn1/cdt/packet-cdt-template.c @@ -81,7 +81,7 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) top_tree = parent_tree; if (parent_tree) { - cdt_item = proto_tree_add_item (parent_tree, proto_cdt, tvb, 0, -1, FALSE); + cdt_item = proto_tree_add_item (parent_tree, proto_cdt, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (cdt_item, ett_cdt_CompressedData); } diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index 9d29e2d6d5..48928193d4 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -101,7 +101,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_disp, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_disp, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_disp); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP"); diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 7ade3638bc..838cf5cf90 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -139,7 +139,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_dop, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_dop, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_dop); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP"); diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index 91333d572a..986918e2e4 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -95,7 +95,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_dsp); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP"); diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index da5d803a45..b825ff7a25 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -68,7 +68,7 @@ static gint ett_ftam = -1; static void dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), FALSE); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), ENC_BIG_ENDIAN); } /* @@ -77,7 +77,7 @@ dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static void dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), FALSE); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), ENC_BIG_ENDIAN); } /* @@ -95,7 +95,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_ftam); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM"); diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 91410fa1a6..58465461ec 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -521,7 +521,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" loffset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, NULL, NULL, NULL); (void) dissect_ber_length(actx->pinfo, tree, tvb, loffset, &len, NULL); - item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE); + item = proto_tree_add_item(tree, hf_index, tvb, offset, len, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1_additional_information); proto_item_append_text(tree, " (The use of this field is \"strongly deprecated\".)"); @@ -1259,7 +1259,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" (void) dissect_ber_length(actx->pinfo, tree, tvb, loffset, &len, NULL); /* create some structure so we can tell what this unknown ASN.1 represents */ - item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE); + item = proto_tree_add_item(tree, hf_index, tvb, offset, len, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1_bilateral_information); offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree); diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index 59d9f2d388..632641dabc 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -141,7 +141,7 @@ dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) p1_initialize_content_globals (parent_tree, TRUE); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1); } @@ -183,7 +183,7 @@ dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); diff --git a/asn1/p22/packet-p22-template.c b/asn1/p22/packet-p22-template.c index 95e9bbe0e7..01ea05c264 100644 --- a/asn1/p22/packet-p22-template.c +++ b/asn1/p22/packet-p22-template.c @@ -105,7 +105,7 @@ dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p22, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p22, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p22); } diff --git a/asn1/p772/packet-p772-template.c b/asn1/p772/packet-p772-template.c index 8d06031691..6835709d0f 100644 --- a/asn1/p772/packet-p772-template.c +++ b/asn1/p772/packet-p772-template.c @@ -70,7 +70,7 @@ dissect_p772(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p772, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p772, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p772); } diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index dbfefba429..2cb1068231 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -149,7 +149,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf if((session != NULL) && ((rinfo = (ros_info_t*)g_hash_table_lookup(protocol_table, oid)) != NULL)) { if(tree){ - item = proto_tree_add_item(tree, *(rinfo->proto), tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, *(rinfo->proto), tvb, 0, -1, ENC_BIG_ENDIAN); ros_tree = proto_item_add_subtree(item, *(rinfo->ett_proto)); } @@ -421,7 +421,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* pinfo->private_data = ros_info; */ if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_ros); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS"); diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 04aa4b9924..de5a5887bc 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -241,7 +241,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) frag_msg, &rtse_frag_items, NULL, parent_tree); } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_rtse, next_tvb ? next_tvb : tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_rtse, next_tvb ? next_tvb : tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_rtse); } if (rtse_reassemble && session->spdu_type == SES_DATA_TRANSFER) { diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 9d3746ff16..17b3fcffde 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -467,7 +467,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pt_varbind = proto_item_add_subtree(pi_varbind,ett_varbind); *label = '\0'; - pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,FALSE); + pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,ENC_BIG_ENDIAN); pt_name = proto_item_add_subtree(pi_name,ett_name); /* fetch ObjectName and its relative oid_info */ @@ -521,7 +521,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } } - pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,FALSE); + pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); expert_add_info_format(actx->pinfo, pi, PI_RESPONSE_CODE, PI_NOTE, "%s",note); g_strlcpy (label, note, ITEM_LABEL_LENGTH); goto set_label; @@ -538,7 +538,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } else if (oid_left == 0) { if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) { /* unSpecified does not require an instance sub-id add the new value and get off the way! */ - pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN); goto set_label; } else { proto_item* pi = proto_tree_add_text(pt_name,tvb,0,0,"A scalar should have one instance sub-id this one has none"); @@ -562,7 +562,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, if ( key_len == 0 && ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) { /* unSpecified does not require an instance sub-id add the new value and get off the way! */ - pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN); goto set_label; } @@ -729,7 +729,7 @@ indexing_done: if (oid_info_is_ok && oid_info->value_type) { if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) { - pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN); } else { /* Provide a tree_item to attach errors to, if needed. */ pi_value = pi_name; @@ -749,7 +749,7 @@ indexing_done: } if (format_error == BER_NO_ERROR) - pi_value = proto_tree_add_item(pt_varbind,oid_info->value_hfid,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,oid_info->value_hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); } } else { switch(ber_class|(tag<<4)) { @@ -825,7 +825,7 @@ indexing_done: break; } - pi_value = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); if (format_error != BER_NO_ERROR) { expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Unresolved value, Missing MIB"); } @@ -949,7 +949,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) /* first bit: engine id conformance */ if (len_remain<4) return offset; conformance = ((tvb_get_guint8(tvb, offset)>>7) & 0x01); - proto_tree_add_item(tree, hf_snmp_engineid_conform, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_conform, tvb, offset, 1, ENC_BIG_ENDIAN); /* 4-byte enterprise number/name */ if (len_remain<4) return offset; @@ -989,7 +989,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_IPV4: /* 4-byte IPv4 address */ if (len_remain==4) { - proto_tree_add_item(tree, hf_snmp_engineid_ipv4, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; len_remain=0; } @@ -997,7 +997,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_IPV6: /* 16-byte IPv6 address */ if (len_remain==16) { - proto_tree_add_item(tree, hf_snmp_engineid_ipv6, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); offset+=16; len_remain=0; } @@ -1005,13 +1005,13 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_MACADDRESS: /* See: https://supportforums.cisco.com/message/3010617#3010617 for details. */ if ((enterpriseid==9)&&(len_remain==7)) { - proto_tree_add_item(tree, hf_snmp_engineid_cisco_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_cisco_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; len_remain--; } /* 6-byte MAC address */ if (len_remain==6) { - proto_tree_add_item(tree, hf_snmp_engineid_mac, tvb, offset, 6, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_mac, tvb, offset, 6, ENC_BIG_ENDIAN); offset+=6; len_remain=0; } @@ -1019,7 +1019,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_TEXT: /* max. 27-byte string, administratively assigned */ if (len_remain<=27) { - proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, ENC_BIG_ENDIAN); offset+=len_remain; len_remain=0; } @@ -1030,7 +1030,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) proto_item_append_text(item, (enterpriseid==2021) ? ": UCD-SNMP Random" : ": Net-SNMP Random"); /* demystify: 4B random, 4B epoch seconds */ if (len_remain==8) { - proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, ENC_BIG_ENDIAN); seconds = tvb_get_letohl(tvb, offset+4); ts.secs = seconds; ts.nsecs = 0; @@ -1046,7 +1046,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) default: /* max. 27 bytes, administratively assigned or unknown format */ if (len_remain<=27) { - proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, ENC_BIG_ENDIAN); offset+=len_remain; len_remain=0; } @@ -1630,7 +1630,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { item = proto_tree_add_item(tree, proto, tvb, start_offset, - message_length, FALSE); + message_length, ENC_BIG_ENDIAN); snmp_tree = proto_item_add_subtree(item, ett); } @@ -1781,7 +1781,7 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); if (tree) { - item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_BIG_ENDIAN); smux_tree = proto_item_add_subtree(item, ett_smux); } diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index e6d610da7a..939f0195d4 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1771,7 +1771,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create display subtree for the connectionless protocol */ if(parent_tree) { - item = proto_tree_add_item(parent_tree, proto_clacse, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_clacse, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_acse); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "CL-ACSE"); @@ -1782,7 +1782,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create display subtree for the protocol */ if(parent_tree) { - item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_acse); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE"); diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c index 46bfd6d824..3c10cbcde5 100644 --- a/epan/dissectors/packet-bjnp.c +++ b/epan/dissectors/packet-bjnp.c @@ -97,18 +97,18 @@ static void dissect_bjnp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear (pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item (tree, proto_bjnp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (tree, proto_bjnp, tvb, offset, -1, ENC_BIG_ENDIAN); bjnp_tree = proto_item_add_subtree (ti, ett_bjnp); - proto_tree_add_item (bjnp_tree, hf_bjnp_id, tvb, offset, 4, FALSE); + proto_tree_add_item (bjnp_tree, hf_bjnp_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; dev_type = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (bjnp_tree, hf_dev_type, tvb, offset, 1, FALSE); + proto_tree_add_item (bjnp_tree, hf_dev_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; cmd_code = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (bjnp_tree, hf_cmd_code, tvb, offset, 1, FALSE); + proto_tree_add_item (bjnp_tree, hf_cmd_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; info = g_strdup_printf ("%s: %s",val_to_str (dev_type, dev_type_vals, "Unknown type (%d)"), @@ -119,19 +119,19 @@ static void dissect_bjnp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) g_free (info); - proto_tree_add_item (bjnp_tree, hf_seq_no, tvb, offset, 4, FALSE); + proto_tree_add_item (bjnp_tree, hf_seq_no, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (bjnp_tree, hf_session_id, tvb, offset, 2, FALSE); + proto_tree_add_item (bjnp_tree, hf_session_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; payload_len = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (bjnp_tree, hf_payload_len, tvb, offset, 4, FALSE); + proto_tree_add_item (bjnp_tree, hf_payload_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (payload_len > 0) { /* TBD: Dissect various commands */ - proto_tree_add_item (bjnp_tree, hf_payload, tvb, offset, payload_len, FALSE); + proto_tree_add_item (bjnp_tree, hf_payload, tvb, offset, payload_len, ENC_BIG_ENDIAN); offset += payload_len; } } diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index 56d01b3d76..3952b6eb36 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -355,7 +355,7 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) top_tree = parent_tree; if (parent_tree) { - cdt_item = proto_tree_add_item (parent_tree, proto_cdt, tvb, 0, -1, FALSE); + cdt_item = proto_tree_add_item (parent_tree, proto_cdt, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (cdt_item, ett_cdt_CompressedData); } diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index 9280f8a671..8217f69342 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -92,11 +92,11 @@ dissect_db_lsp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME); col_set_str (pinfo->cinfo, COL_INFO, PNAME); - db_lsp_item = proto_tree_add_item (tree, proto_db_lsp, tvb, offset, -1, FALSE); + db_lsp_item = proto_tree_add_item (tree, proto_db_lsp, tvb, offset, -1, ENC_BIG_ENDIAN); db_lsp_tree = proto_item_add_subtree (db_lsp_item, ett_db_lsp); type = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (db_lsp_tree, hf_type, tvb, offset, 1, FALSE); + proto_tree_add_item (db_lsp_tree, hf_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (type == 0x80) { @@ -105,11 +105,11 @@ dissect_db_lsp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } magic = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (db_lsp_tree, hf_magic, tvb, offset, 2, FALSE); + proto_tree_add_item (db_lsp_tree, hf_magic, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (db_lsp_tree, hf_length, tvb, offset, 2, FALSE); + proto_tree_add_item (db_lsp_tree, hf_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (magic != 0x0301 || length > tvb_length_remaining (tvb, offset)) { @@ -120,19 +120,19 @@ dissect_db_lsp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (type == TYPE_CONFIG) { opvalue = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (db_lsp_tree, hf_opvalue, tvb, offset, 1, FALSE); + proto_tree_add_item (db_lsp_tree, hf_opvalue, tvb, offset, 1, ENC_BIG_ENDIAN); if (opvalue == OP_CERT) { /* X509 Certificate */ tvbuff_t *cert_tvb = tvb_new_subset (tvb, offset+10, length-10, length-10); dissect_x509af_Certificate_PDU (cert_tvb, pinfo, db_lsp_tree); } else { - proto_tree_add_item (db_lsp_tree, hf_value, tvb, offset, length, FALSE); + proto_tree_add_item (db_lsp_tree, hf_value, tvb, offset, length, ENC_BIG_ENDIAN); } } else if (type == TYPE_DATA) { - proto_tree_add_item (db_lsp_tree, hf_data, tvb, offset, length, FALSE); + proto_tree_add_item (db_lsp_tree, hf_data, tvb, offset, length, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (db_lsp_tree, hf_value, tvb, offset, length, FALSE); + proto_tree_add_item (db_lsp_tree, hf_value, tvb, offset, length, ENC_BIG_ENDIAN); } offset += length; @@ -168,10 +168,10 @@ dissect_db_lsp_disc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME_DISC); col_set_str (pinfo->cinfo, COL_INFO, PNAME_DISC); - db_lsp_item = proto_tree_add_item (tree, proto_db_lsp_disc, tvb, offset, -1, FALSE); + db_lsp_item = proto_tree_add_item (tree, proto_db_lsp_disc, tvb, offset, -1, ENC_BIG_ENDIAN); db_lsp_tree = proto_item_add_subtree (db_lsp_item, ett_db_lsp); - proto_tree_add_item (db_lsp_tree, hf_text, tvb, offset, -1, FALSE); + proto_tree_add_item (db_lsp_tree, hf_text, tvb, offset, -1, ENC_BIG_ENDIAN); } void diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 9c3d8c895d..78f6129c58 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -1528,7 +1528,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_disp, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_disp, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_disp); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP"); diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 7118175ebf..900e65f19c 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1515,9 +1515,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, "Unexpected ACK"); } } else if (dmp.checksum && !dmp.id_val->msg_resend_count) { - en = proto_tree_add_item (analysis_tree, - hf_analysis_ack_missing, - tvb, offset, 0, FALSE); + en = proto_tree_add_item (analysis_tree, hf_analysis_ack_missing, tvb, offset, 0, ENC_BIG_ENDIAN); if (pinfo->fd->flags.visited) { /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ @@ -1538,8 +1536,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED (en); } else { - en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, - tvb, 0, 0, FALSE); + en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, tvb, 0, 0, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED (en); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, @@ -1556,8 +1553,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED (en); } else { - en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, - tvb, 0, 0, FALSE); + en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, tvb, 0, 0, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED (en); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, @@ -1636,8 +1632,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, dmp.id_val->prev_msg_id); } } else { - en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, - tvb, 0, 0, FALSE); + en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, tvb, 0, 0, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED (en); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, @@ -1771,20 +1766,15 @@ static gint dissect_dmp_sic (tvbuff_t *tvb, packet_info *pinfo, } else if (key <= 0xCF) { /* 2 or more 3-character SICs */ - sf = proto_tree_add_item (message_tree, hf_message_sic_key, tvb, - offset, 1, FALSE); + sf = proto_tree_add_item (message_tree, hf_message_sic_key, tvb, offset, 1, ENC_BIG_ENDIAN); sic_tree = proto_item_add_subtree (sf, ett_message_sic); - kf = proto_tree_add_item (sic_tree, hf_message_sic_key_values, tvb, offset, - 1, FALSE); + kf = proto_tree_add_item (sic_tree, hf_message_sic_key_values, tvb, offset, 1, ENC_BIG_ENDIAN); key_tree = proto_item_add_subtree (kf, ett_message_sic_key); - proto_tree_add_item (key_tree, hf_message_sic_key_type, tvb, offset, - 1, FALSE); - proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset, - 1, FALSE); - proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset, - 1, FALSE); + proto_tree_add_item (key_tree, hf_message_sic_key_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; any = (key & 0x08); @@ -1815,20 +1805,15 @@ static gint dissect_dmp_sic (tvbuff_t *tvb, packet_info *pinfo, } else if (key <= 0xDF) { /* 1 or more 3 to 8 character SICs */ - sf = proto_tree_add_item (message_tree, hf_message_sic_key, tvb, - offset, 1, FALSE); + sf = proto_tree_add_item (message_tree, hf_message_sic_key, tvb, offset, 1, ENC_BIG_ENDIAN); sic_tree = proto_item_add_subtree (sf, ett_message_sic); - kf = proto_tree_add_item (sic_tree, hf_message_sic_key_values, tvb, offset, - 1, FALSE); + kf = proto_tree_add_item (sic_tree, hf_message_sic_key_values, tvb, offset, 1, ENC_BIG_ENDIAN); key_tree = proto_item_add_subtree (kf, ett_message_sic_key); - proto_tree_add_item (key_tree, hf_message_sic_key_type, tvb, offset, - 1, FALSE); - proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset, - 1, FALSE); - proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset, - 1, FALSE); + proto_tree_add_item (key_tree, hf_message_sic_key_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; bitmap = tvb_get_guint8 (tvb, offset); @@ -1836,8 +1821,7 @@ static gint dissect_dmp_sic (tvbuff_t *tvb, packet_info *pinfo, offset, 1, bitmap, "Length Bitmap: 0x%2.2x", bitmap); bitmap_tree = proto_item_add_subtree (bf, ett_message_sic_bitmap); - proto_tree_add_item (bitmap_tree, hf_message_sic_bitmap, tvb, offset, - 1, FALSE); + proto_tree_add_item (bitmap_tree, hf_message_sic_bitmap, tvb, offset, 1, ENC_BIG_ENDIAN); any = (key & 0x08); no = (key & 0x07) + 1; @@ -1919,11 +1903,9 @@ static gint dissect_dmp_sic (tvbuff_t *tvb, packet_info *pinfo, /* Only if 4 - 8 character */ bitmap_tree = proto_item_add_subtree (bf, ett_message_sic_bits); if (any) { - proto_tree_add_item (bitmap_tree, hf_message_sic_bits_any, tvb, - offset, 1, FALSE); + proto_tree_add_item (bitmap_tree, hf_message_sic_bits_any, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (bitmap_tree, hf_message_sic_bits, tvb, - offset, 1, FALSE); + proto_tree_add_item (bitmap_tree, hf_message_sic_bits, tvb, offset, 1, ENC_BIG_ENDIAN); } } if (failure) { @@ -1977,10 +1959,8 @@ static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo, val_to_str (addr_type, addr_type_str, ""), value & 0x7F); addr_tree = proto_item_add_subtree (en, ett_address_direct); - proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Extended 1 */ @@ -1992,16 +1972,13 @@ static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo, val_to_str (addr_type, addr_type_str, ""), value & 0x3F); addr_tree = proto_item_add_subtree (en, ett_address_direct); - proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, - 1, FALSE); - en = proto_tree_add_item (addr_tree, hf_reserved_0x40, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + en = proto_tree_add_item (addr_tree, hf_reserved_0x40, tvb, offset, 1, ENC_BIG_ENDIAN); if (value & 0x40) { expert_add_info_format (pinfo, en, PI_UNDECODED, PI_WARN, "Reserved value"); } - proto_tree_add_item (addr_tree, hf_addr_dir_address2, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_address2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (value & 0x80) { @@ -2014,14 +1991,12 @@ static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo, val_to_str (addr_type,addr_type_str,""), value & 0x3F); addr_tree = proto_item_add_subtree (en, ett_address_direct); - en = proto_tree_add_item (addr_tree, hf_reserved_0xC0, tvb, offset, - 1, FALSE); + en = proto_tree_add_item (addr_tree, hf_reserved_0xC0, tvb, offset, 1, ENC_BIG_ENDIAN); if (value & 0xC0) { expert_add_info_format (pinfo, en, PI_UNDECODED, PI_WARN, "Reserved value"); } - proto_tree_add_item (addr_tree, hf_addr_dir_address3, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_address3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -2038,10 +2013,8 @@ static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo, val_to_str (addr_type, addr_type_str, ""), value & 0x7F); addr_tree = proto_item_add_subtree (en, ett_address_direct); - proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -2086,8 +2059,7 @@ static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo, val_to_str (type, ext_addr_type, "Reserved")); addr_tree = proto_item_add_subtree (en, ett_address_ext_type); - proto_tree_add_item (addr_tree, hf_addr_ext_type, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (value & 0x80) { addr_length_extended = TRUE; @@ -2095,8 +2067,7 @@ static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo, offset, 1, value, "Address Length (bits 4-0): %d", length); addr_tree = proto_item_add_subtree (en, ett_address_ext_length); - proto_tree_add_item (addr_tree, hf_addr_ext_length1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_length1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Extended */ @@ -2109,24 +2080,21 @@ static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo, val_to_str (type, ext_addr_type_ext, "Reserved")); addr_tree = proto_item_add_subtree (en, ett_address_ext_type); - proto_tree_add_item (addr_tree, hf_addr_ext_type, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_type, tvb, offset, 1, ENC_BIG_ENDIAN); en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length2, tvb, offset, 1, value, "Address Length (bits 9-5): %d", value & 0x1F); addr_tree = proto_item_add_subtree (en, ett_address_ext_length); - proto_tree_add_item (addr_tree, hf_addr_ext_length2, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_length2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length, tvb, offset, 1, value, "Address Length: %d", length); addr_tree = proto_item_add_subtree (en, ett_address_ext_length); - proto_tree_add_item (addr_tree, hf_addr_ext_length1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_length1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -2136,11 +2104,9 @@ static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo, dissect_p1_ORName (FALSE, next_tvb, 0, &asn1_ctx, ext_tree, hf_addr_ext_asn1_ber); } else if (type == ASN1_PER) { - proto_tree_add_item (ext_tree, hf_addr_ext_asn1_per, tvb, offset, - length, FALSE); + proto_tree_add_item (ext_tree, hf_addr_ext_asn1_per, tvb, offset, length, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (ext_tree, hf_addr_ext_unknown, tvb, offset, - length, FALSE); + proto_tree_add_item (ext_tree, hf_addr_ext_unknown, tvb, offset, length, ENC_BIG_ENDIAN); } offset += length; @@ -2180,8 +2146,7 @@ static gint dissect_dmp_originator (tvbuff_t *tvb, packet_info *pinfo, gint boffset = offset; gboolean p2_addr = FALSE; - tf = proto_tree_add_item (envelope_tree, hf_addr_originator, tvb, offset, - -1, FALSE); + tf = proto_tree_add_item (envelope_tree, hf_addr_originator, tvb, offset, -1, ENC_BIG_ENDIAN); field_tree = proto_item_add_subtree (tf, ett_address); if (dmp.addr_enc == DIRECT_ADDR) { @@ -2198,8 +2163,7 @@ static gint dissect_dmp_originator (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp_addr_form, addr_form_orig_v1, "Reserved")); rec_tree = proto_item_add_subtree (en, ett_address_ext_form); - proto_tree_add_item (rec_tree, hf_addr_ext_form_orig_v1, tvb, offset, - 1, FALSE); + proto_tree_add_item (rec_tree, hf_addr_ext_form_orig_v1, tvb, offset, 1, ENC_BIG_ENDIAN); } else { en = proto_tree_add_uint_format (field_tree, hf_addr_ext_form_orig, tvb, offset, 1, value, @@ -2207,12 +2171,10 @@ static gint dissect_dmp_originator (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp_addr_form, addr_form_orig, "Reserved")); rec_tree = proto_item_add_subtree (en, ett_address_ext_form); - proto_tree_add_item (rec_tree, hf_addr_ext_form_orig, tvb, offset, - 1, FALSE); + proto_tree_add_item (rec_tree, hf_addr_ext_form_orig, tvb, offset, 1, ENC_BIG_ENDIAN); } - en = proto_tree_add_item (rec_tree, hf_reserved_0x1F, tvb, offset, - 1, FALSE); + en = proto_tree_add_item (rec_tree, hf_reserved_0x1F, tvb, offset, 1, ENC_BIG_ENDIAN); if (value & 0x1F) { expert_add_info_format (pinfo, en, PI_UNDECODED, PI_WARN, "Reserved value"); @@ -2359,12 +2321,9 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, (value & 0xF0) >> 4); } rec_tree = proto_item_add_subtree (en, ett_address_rec_no); - proto_tree_add_item (rec_tree, hf_addr_dir_rec_no1, tvb, offset, - 1, FALSE); - proto_tree_add_item (rec_tree, hf_addr_dir_rep_req1, tvb, offset, - 1, FALSE); - proto_tree_add_item (rec_tree, hf_addr_dir_not_req1, tvb, offset, - 1, FALSE); + proto_tree_add_item (rec_tree, hf_addr_dir_rec_no1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (rec_tree, hf_addr_dir_rep_req1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (rec_tree, hf_addr_dir_not_req1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; value = tvb_get_guint8 (tvb, offset); @@ -2382,10 +2341,8 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, value & 0x7F); } addr_tree = proto_item_add_subtree (en, ett_address_direct); - proto_tree_add_item (addr_tree, hf_addr_dir_action, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_action, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (rep_req == 0x03) { @@ -2401,10 +2358,8 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, " (offset from previous)", value & 0x3F); rec_tree = proto_item_add_subtree (en, ett_address_rec_no); - proto_tree_add_item (rec_tree, hf_addr_dir_rep_req2, tvb, offset, - 1, FALSE); - proto_tree_add_item (rec_tree, hf_addr_dir_rec_no2, tvb, offset, - 1, FALSE); + proto_tree_add_item (rec_tree, hf_addr_dir_rep_req2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (rec_tree, hf_addr_dir_rec_no2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (rep_req == 0x03) { @@ -2420,16 +2375,13 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, " (offset from previous)", value & 0x1F); rec_tree = proto_item_add_subtree (en, ett_address_rec_no); - proto_tree_add_item (rec_tree, hf_addr_dir_rep_req3, tvb, offset, - 1, FALSE); - en = proto_tree_add_item (rec_tree, hf_reserved_0x20, tvb, offset, - 1, FALSE); + proto_tree_add_item (rec_tree, hf_addr_dir_rep_req3, tvb, offset, 1, ENC_BIG_ENDIAN); + en = proto_tree_add_item (rec_tree, hf_reserved_0x20, tvb, offset, 1, ENC_BIG_ENDIAN); if (value & 0x20) { expert_add_info_format (pinfo, en, PI_UNDECODED, PI_WARN, "Reserved value"); } - proto_tree_add_item (rec_tree, hf_addr_dir_rec_no3, tvb, offset, - 1, FALSE); + proto_tree_add_item (rec_tree, hf_addr_dir_rec_no3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } } @@ -2446,10 +2398,8 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, "Direct Address (bits 12-7): %d", value & 0x3F); addr_tree = proto_item_add_subtree (en, ett_address_direct); - proto_tree_add_item (addr_tree, hf_addr_dir_not_req2, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_dir_address2, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_not_req2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_dir_address2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (not_req == 0x03) { @@ -2463,10 +2413,8 @@ static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo, "Direct Address (bits 18-13): %d", value & 0x3F); addr_tree = proto_item_add_subtree (en, ett_address_direct); - proto_tree_add_item (addr_tree, hf_addr_dir_not_req3, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_dir_address3, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_dir_not_req3, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_dir_address3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } } @@ -2527,15 +2475,13 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp_addr_form, addr_form, "Reserved")); addr_tree = proto_item_add_subtree (en, ett_address_ext_form); - proto_tree_add_item (addr_tree, hf_addr_ext_form, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_form, tvb, offset, 1, ENC_BIG_ENDIAN); en = proto_tree_add_boolean_format (field_tree, hf_addr_ext_action, tvb, offset, 1, value, "Action: %s", action ? "Yes" : "No"); addr_tree = proto_item_add_subtree (en, ett_address_ext_action); - proto_tree_add_item (addr_tree, hf_addr_ext_action, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_action, tvb, offset, 1, ENC_BIG_ENDIAN); rep_req = (value & 0x0C) >> 2; en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rep_req, tvb, @@ -2544,8 +2490,7 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, val_to_str ((value & 0x0C) >> 2, report_vals, "Reserved")); addr_tree = proto_item_add_subtree (en, ett_address_ext_rep_req); - proto_tree_add_item (addr_tree, hf_addr_ext_rep_req, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_rep_req, tvb, offset, 1, ENC_BIG_ENDIAN); not_req = (value & 0x03); en = proto_tree_add_uint_format (field_tree, hf_addr_ext_not_req, tvb, @@ -2554,8 +2499,7 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, val_to_str (value & 0x03, notif_vals, "Reserved")); addr_tree = proto_item_add_subtree (en, ett_address_ext_not_req); - proto_tree_add_item (addr_tree, hf_addr_ext_not_req, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_not_req, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; value = tvb_get_guint8 (tvb, offset); @@ -2567,10 +2511,8 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, " (offset from previous)", value & 0x7F); addr_tree = proto_item_add_subtree (en, ett_address_ext_rec_no); - proto_tree_add_item (addr_tree, hf_addr_ext_rec_ext, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_ext_rec_no1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_rec_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_ext_rec_no1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Extended */ @@ -2582,8 +2524,7 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, "Recipient Number (bits 14-7): %d" " (offset from previous)", value); addr_tree = proto_item_add_subtree (en, ett_address_ext_rec_no); - proto_tree_add_item (addr_tree, hf_addr_ext_rec_no2, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_rec_no2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { @@ -2593,10 +2534,8 @@ static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo, " (offset from previous)", value & 0x7F); addr_tree = proto_item_add_subtree (en, ett_address_ext_rec_no); - proto_tree_add_item (addr_tree, hf_addr_ext_rec_ext, tvb, offset, - 1, FALSE); - proto_tree_add_item (addr_tree, hf_addr_ext_rec_no1, tvb, offset, - 1, FALSE); + proto_tree_add_item (addr_tree, hf_addr_ext_rec_ext, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (addr_tree, hf_addr_ext_rec_no1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -2669,8 +2608,7 @@ static gint dissect_dmp_address (tvbuff_t *tvb, packet_info *pinfo, gint boffset = offset; if (reporting_name) { - tf = proto_tree_add_item (envelope_tree, hf_addr_reporting_name, tvb, - offset, -1, FALSE); + tf = proto_tree_add_item (envelope_tree, hf_addr_reporting_name, tvb, offset, -1, ENC_BIG_ENDIAN); } else { tf = proto_tree_add_none_format (envelope_tree, hf_addr_recipient, tvb, offset, -1, "Recipient Number"); @@ -2701,27 +2639,27 @@ static gint dissect_dmp_ack (tvbuff_t *tvb, packet_info *pinfo, gint rec_len, rec_no = 0; gint boffset = offset; - en = proto_tree_add_item (dmp_tree, hf_ack, tvb, offset, 4, FALSE); + en = proto_tree_add_item (dmp_tree, hf_ack, tvb, offset, 4, ENC_BIG_ENDIAN); ack_tree = proto_item_add_subtree (en, ett_ack); dmp.ack_reason = tvb_get_guint8 (tvb, offset); proto_item_append_text (en, ", Reason: %s", val_to_str (dmp.ack_reason, ack_reason, "Reserved")); - rt = proto_tree_add_item (ack_tree, hf_ack_reason, tvb, offset, 1, FALSE); + rt = proto_tree_add_item (ack_tree, hf_ack_reason, tvb, offset, 1, ENC_BIG_ENDIAN); if (dmp.ack_reason != 0) { expert_add_info_format (pinfo, rt, PI_RESPONSE_CODE, PI_NOTE, "ACK reason: %s", val_to_str (dmp.ack_reason, ack_reason, "Reserved")); } offset += 1; - proto_tree_add_item (ack_tree, hf_ack_diagnostic, tvb, offset, 1, FALSE); + proto_tree_add_item (ack_tree, hf_ack_diagnostic, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Subject Message Identifier */ dmp.subj_id = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (ack_tree, hf_message_subj_id, tvb, offset, 2, FALSE); - hidden_item = proto_tree_add_item (ack_tree, hf_dmp_id, tvb, offset, 2, FALSE); + proto_tree_add_item (ack_tree, hf_message_subj_id, tvb, offset, 2, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item (ack_tree, hf_dmp_id, tvb, offset, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN (hidden_item); offset += 2; @@ -2736,8 +2674,7 @@ static gint dissect_dmp_ack (tvbuff_t *tvb, packet_info *pinfo, rec_len -= 2; } if (offset < rec_len) { - rt = proto_tree_add_item (ack_tree, hf_ack_recips, tvb, offset, -1, - FALSE); + rt = proto_tree_add_item (ack_tree, hf_ack_recips, tvb, offset, -1, ENC_BIG_ENDIAN); recip_tree = proto_item_add_subtree (rt, ett_ack_recips); while (offset < rec_len) { offset = dissect_dmp_address (tvb, pinfo, recip_tree, offset, @@ -2803,11 +2740,11 @@ static gint dissect_ipm_identifier (tvbuff_t *tvb, packet_info *pinfo _U_, proto ipm_id_length); field_tree = proto_item_add_subtree (tf, ett_envelope_ipm_id_length); if ((dmp.msg_id_type == NAT_MSG_ID || modifier != IPM_MODIFIER_X400) && dmp_nat_decode == NAT_DECODE_THALES) { - proto_tree_add_item (field_tree, hf_thales_ipm_id_modifier, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_thales_ipm_id_modifier, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (field_tree, hf_envelope_ipm_id_modifier, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_ipm_id_modifier, tvb, offset, 1, ENC_BIG_ENDIAN); } - proto_tree_add_item (field_tree, hf_envelope_ipm_id_length, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_ipm_id_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (modifier == IPM_MODIFIER_X400 || dmp_nat_decode == NAT_DECODE_DMP) { @@ -2852,7 +2789,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, gint boffset = offset, i; gboolean using_short_id = FALSE; - en = proto_tree_add_item (dmp_tree, hf_envelope, tvb, offset, 10, FALSE); + en = proto_tree_add_item (dmp_tree, hf_envelope, tvb, offset, 10, ENC_BIG_ENDIAN); envelope_tree = proto_item_add_subtree (en, ett_envelope); envelope = tvb_get_guint8 (tvb, offset); @@ -2865,8 +2802,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Protocol Version: %d", dmp.version); field_tree = proto_item_add_subtree (tf, ett_envelope_version); - vf = proto_tree_add_item (field_tree, hf_envelope_protocol_id, tvb, - offset, 1, FALSE); + vf = proto_tree_add_item (field_tree, hf_envelope_protocol_id, tvb, offset, 1, ENC_BIG_ENDIAN); if (dmp.prot_id == PROT_NAT) { proto_item_append_text (vf, " (national version of DMP)"); proto_item_append_text (tf, " (national)"); @@ -2875,8 +2811,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, } else { proto_item_append_text (vf, " (incorrect, should be 0x1d)"); } - vf = proto_tree_add_item (field_tree, hf_envelope_version_value, tvb, - offset, 1, FALSE); + vf = proto_tree_add_item (field_tree, hf_envelope_version_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (dmp.version > DMP_VERSION_2) { @@ -2899,8 +2834,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, envelope, "Hop Count: %d", (envelope & 0xE0) >> 5); field_tree = proto_item_add_subtree (tf, ett_envelope_hop_count); - proto_tree_add_item (field_tree, hf_envelope_hop_count_value, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_hop_count_value, tvb, offset, 1, ENC_BIG_ENDIAN); } else { if (dmp.version >= DMP_VERSION_2) { /* Extensions Present */ @@ -2910,8 +2844,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Extensions: %s", (envelope & 0x80) ? "Present" : "Absent"); field_tree = proto_item_add_subtree (tf, ett_envelope_extensions); - proto_tree_add_item (field_tree, hf_envelope_extensions, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_extensions, tvb, offset, 1, ENC_BIG_ENDIAN); } /* Recipient Present */ @@ -2921,8 +2854,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Recipient Present: %s", (envelope & 0x20) ? "Present" : "Absent"); field_tree = proto_item_add_subtree (tf, ett_envelope_rec_present); - proto_tree_add_item (field_tree, hf_envelope_rec_present, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_rec_present, tvb, offset, 1, ENC_BIG_ENDIAN); } /* Address Encoding */ @@ -2933,8 +2865,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, addr_enc.true_string : addr_enc.false_string); field_tree = proto_item_add_subtree (tf, ett_envelope_addr_enc); - proto_tree_add_item (field_tree, hf_envelope_addr_enc, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_addr_enc, tvb, offset, 1, ENC_BIG_ENDIAN); /* Checksum Present */ tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_checksum, @@ -2942,8 +2873,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Checksum: %s", (envelope & 0x08) ? "Used" : "Not used"); field_tree = proto_item_add_subtree (tf, ett_envelope_checksum); - proto_tree_add_item (field_tree, hf_envelope_checksum, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); /* Content Type */ tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_type, @@ -2953,8 +2883,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, type_vals, "Unknown"), envelope & 0x07); field_tree = proto_item_add_subtree (tf, ett_envelope_cont_type); - proto_tree_add_item (field_tree, hf_envelope_type, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text (en, ", Checksum %s", (envelope >> 3) & 0x01 ? "Used" : "Not used"); offset += 1; @@ -2972,8 +2901,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Extensions: %s", (envelope & 0x80) ? "Present" : "Absent"); field_tree = proto_item_add_subtree (tf, ett_envelope_extensions); - proto_tree_add_item (field_tree, hf_envelope_extensions, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_extensions, tvb, offset, 1, ENC_BIG_ENDIAN); dmp.extensions = (envelope & 0x80); /* Message Identifier Type */ @@ -2984,7 +2912,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp.msg_id_type, msg_id_type_vals, "Unknown"), dmp.msg_id_type); field_tree = proto_item_add_subtree (tf, ett_envelope_msg_id_type); - proto_tree_add_item (field_tree, hf_envelope_msg_id_type, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_msg_id_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID) { /* MTS Identifier Length */ @@ -2994,15 +2922,15 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "MTS Identifier Length: %u", dmp.mts_id_length); field_tree = proto_item_add_subtree (dmp.mts_id_item, ett_envelope_mts_id_length); - proto_tree_add_item (field_tree, hf_envelope_mts_id_length, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_mts_id_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { - proto_tree_add_item (field_tree, hf_envelope_msg_id_length, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_msg_id_length, tvb, offset, 1, ENC_BIG_ENDIAN); if (envelope & 0x10) { /* Using Short Identifier (12 bits) */ using_short_id = TRUE; } else { - tf = proto_tree_add_item (field_tree, hf_reserved_0x0F, tvb, offset, 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_reserved_0x0F, tvb, offset, 1, ENC_BIG_ENDIAN); if (envelope & 0x0F) { expert_add_info_format (pinfo, tf, PI_UNDECODED, PI_WARN, "Reserved value"); } @@ -3020,7 +2948,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, hidden_item = proto_tree_add_uint (envelope_tree, hf_dmp_id, tvb, offset, 2, dmp.msg_id); if (using_short_id) { field_tree = proto_item_add_subtree (tf, ett_envelope_msg_id); - proto_tree_add_item (field_tree, hf_envelope_msg_id_12bit, tvb, offset, 2, FALSE); + proto_tree_add_item (field_tree, hf_envelope_msg_id_12bit, tvb, offset, 2, ENC_BIG_ENDIAN); } else if (dmp.version >= DMP_VERSION_2 && dmp.msg_id_type == ONLY_DMP_ID && dmp.msg_id < 4096) { expert_add_info_format (pinfo, tf, PI_PROTOCOL, PI_NOTE, "Id < 4096 - should use ShortId"); } @@ -3044,10 +2972,8 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Reserved" : abs_time_secs_to_str (dmp.subm_time, ABSOLUTE_TIME_LOCAL, TRUE)); field_tree = proto_item_add_subtree (tf, ett_envelope_subm_time); - proto_tree_add_item (field_tree, hf_envelope_time_diff_present, tvb, - offset, 2, FALSE); - proto_tree_add_item (field_tree, hf_envelope_subm_time_value, tvb, - offset, 2, FALSE); + proto_tree_add_item (field_tree, hf_envelope_time_diff_present, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_envelope_subm_time_value, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (subm_time & 0x8000) { @@ -3057,8 +2983,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, time_diff, "Time Difference: "); field_tree = proto_item_add_subtree (tf, ett_envelope_time_diff); - proto_tree_add_item (field_tree, hf_envelope_time_diff_value, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_time_diff_value, tvb, offset, 1, ENC_BIG_ENDIAN); secs = dmp_dec_time_diff (time_diff); if (secs == DMP_TIME_RESERVED) { proto_item_append_text (tf, "Reserved (0x%2.2x)", time_diff); @@ -3075,12 +3000,9 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Envelope Flags"); field_tree = proto_item_add_subtree (tf, ett_envelope_flags); - proto_tree_add_item (field_tree, hf_envelope_content_id_discarded, tvb, - offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_envelope_recip_reassign_prohib, tvb, - offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_envelope_dl_expansion_prohib, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_content_id_discarded, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_envelope_recip_reassign_prohib, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_envelope_dl_expansion_prohib, tvb, offset, 1, ENC_BIG_ENDIAN); if (envelope & 0xE0) { env_flags = ep_strdup_printf ("%s%s%s", @@ -3099,8 +3021,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Recipient Count: %d", no_rec); field_tree = proto_item_add_subtree (tf, ett_envelope_recipients); - proto_tree_add_item (field_tree, hf_envelope_recipients, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_envelope_recipients, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (no_rec == 0) { @@ -3114,14 +3035,12 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, " (incorrect, reserved value)" : "")); field_tree = proto_item_add_subtree (tf, ett_envelope_ext_recipients); - en = proto_tree_add_item (field_tree, hf_reserved_0x8000, tvb, - offset, 2, FALSE); + en = proto_tree_add_item (field_tree, hf_reserved_0x8000, tvb, offset, 2, ENC_BIG_ENDIAN); if (value16 & 0x8000) { expert_add_info_format (pinfo, en, PI_UNDECODED, PI_WARN, "Reserved value"); } - proto_tree_add_item (field_tree, hf_envelope_ext_recipients, tvb, - offset, 2, FALSE); + proto_tree_add_item (field_tree, hf_envelope_ext_recipients, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -3159,32 +3078,32 @@ static void dissect_dmp_structured_id (tvbuff_t *tvb, proto_tree *body_tree, case STRUCT_ID_UINT8: dmp.struct_id = ep_strdup_printf ("%u", tvb_get_guint8 (tvb, offset)); - proto_tree_add_item (body_tree, hf_message_bodyid_uint8, tvb, offset, 1, FALSE); + proto_tree_add_item (body_tree, hf_message_bodyid_uint8, tvb, offset, 1, ENC_BIG_ENDIAN); break; case STRUCT_ID_UINT16: dmp.struct_id = ep_strdup_printf ("%u", tvb_get_ntohs (tvb, offset)); - proto_tree_add_item (body_tree, hf_message_bodyid_uint16, tvb, offset, 2, FALSE); + proto_tree_add_item (body_tree, hf_message_bodyid_uint16, tvb, offset, 2, ENC_BIG_ENDIAN); break; case STRUCT_ID_UINT32: dmp.struct_id = ep_strdup_printf ("%u", tvb_get_ntohl (tvb, offset)); - proto_tree_add_item (body_tree, hf_message_bodyid_uint32, tvb, offset, 4, FALSE); + proto_tree_add_item (body_tree, hf_message_bodyid_uint32, tvb, offset, 4, ENC_BIG_ENDIAN); break; case STRUCT_ID_UINT64: dmp.struct_id = ep_strdup_printf ("%" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); - proto_tree_add_item (body_tree, hf_message_bodyid_uint64, tvb, offset, 8, FALSE); + proto_tree_add_item (body_tree, hf_message_bodyid_uint64, tvb, offset, 8, ENC_BIG_ENDIAN); break; case STRUCT_ID_STRING: dmp.struct_id = tvb_get_ephemeral_string (tvb, offset, (gint) dmp_struct_length); - proto_tree_add_item (body_tree, hf_message_bodyid_string, tvb, offset, dmp_struct_length, FALSE); + proto_tree_add_item (body_tree, hf_message_bodyid_string, tvb, offset, dmp_struct_length, ENC_BIG_ENDIAN); break; case STRUCT_ID_ZSTRING: dmp.struct_id = tvb_get_ephemeral_stringz (tvb, offset, &length); - proto_tree_add_item (body_tree, hf_message_bodyid_zstring, tvb, offset, length, FALSE); + proto_tree_add_item (body_tree, hf_message_bodyid_zstring, tvb, offset, length, ENC_BIG_ENDIAN); break; } @@ -3204,7 +3123,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, guint8 message, eit = 0, compr_alg = ALGORITHM_NONE; gint len, boffset = offset; - en = proto_tree_add_item (dmp_tree, hf_message_body, tvb, offset, -1, FALSE); + en = proto_tree_add_item (dmp_tree, hf_message_body, tvb, offset, -1, ENC_BIG_ENDIAN); message_tree = proto_item_add_subtree (en, ett_message); if (dmp.body_format == FREE_TEXT_SUBJECT) { @@ -3212,8 +3131,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, if (dmp_subject_as_id) { dmp.struct_id = tvb_get_ephemeral_string (tvb, offset, len); } - proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, - len, FALSE); + proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_BIG_ENDIAN); offset += len; } @@ -3227,8 +3145,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, val_to_str (eit, eit_vals, "Unknown"), eit); field_tree = proto_item_add_subtree (tf, ett_message_eit); - proto_tree_add_item (field_tree, hf_message_eit, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_message_eit, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text (en, ", Type: %s", val_to_str (eit, eit_vals, "Unknown")); @@ -3239,8 +3156,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, val_to_str (compr_alg, compression_vals, "Unknown"), compr_alg); field_tree = proto_item_add_subtree (tf, ett_message_compr); - tr = proto_tree_add_item (field_tree, hf_message_compr, tvb, - offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_message_compr, tvb, offset, 1, ENC_BIG_ENDIAN); if (compr_alg == ALGORITHM_ZLIB) { proto_item_append_text (en, " (compressed)"); } else if (compr_alg != ALGORITHM_NONE) { @@ -3254,8 +3170,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, message, "Reserved: %d", message & 0x07); field_tree = proto_item_add_subtree (tf, ett_message_body_reserved); - tf = proto_tree_add_item (field_tree, hf_reserved_0x07, tvb, - offset, 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_reserved_0x07, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, tf, PI_UNDECODED, PI_WARN, "Reserved value"); } @@ -3277,8 +3192,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, if (dmp.body_format == STRUCTURED) { /* Structured Message ID */ dissect_dmp_structured_id (tvb, field_tree, offset); - proto_tree_add_item (field_tree, hf_message_body_structured, tvb, offset, - len, FALSE); + proto_tree_add_item (field_tree, hf_message_body_structured, tvb, offset, len, ENC_BIG_ENDIAN); } else if (len > 0 && (dmp.body_format == FREE_TEXT || dmp.body_format == FREE_TEXT_SUBJECT)) { if (compr_alg == ALGORITHM_ZLIB) { @@ -3291,8 +3205,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, "Uncompressed User data, " "Length: %d", zlen); field_tree = proto_item_add_subtree (tf, ett_message_body_uncompr); - proto_tree_add_item (field_tree, hf_message_body_uncompressed, - next_tvb, 0, -1, FALSE); + proto_tree_add_item (field_tree, hf_message_body_uncompressed, next_tvb, 0, -1, ENC_BIG_ENDIAN); } else { tf = proto_tree_add_text (message_tree, tvb, offset, -1, "Error: Unable to uncompress content"); @@ -3300,8 +3213,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, "Unable to uncompress content"); } } else if (eit != EIT_BILATERAL) { - proto_tree_add_item (field_tree, hf_message_body_plain, tvb, - offset, len, FALSE); + proto_tree_add_item (field_tree, hf_message_body_plain, tvb, offset, len, ENC_BIG_ENDIAN); } } offset += len; @@ -3332,11 +3244,9 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, report = tvb_get_guint8 (tvb, offset); rep_type = (report & 0x80) >> 7; if (rep_type) { - en = proto_tree_add_item (dmp_tree, hf_non_delivery_report, tvb, - offset, 4, FALSE); + en = proto_tree_add_item (dmp_tree, hf_non_delivery_report, tvb, offset, 4, ENC_BIG_ENDIAN); } else { - en = proto_tree_add_item (dmp_tree, hf_delivery_report, tvb, - offset, 4, FALSE); + en = proto_tree_add_item (dmp_tree, hf_delivery_report, tvb, offset, 4, ENC_BIG_ENDIAN); } proto_item_append_text (en, " (#%d)", num); @@ -3349,8 +3259,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, report_type.true_string : report_type.false_string); field_tree = proto_item_add_subtree (tf, ett_report_type); - proto_tree_add_item (field_tree, hf_report_type, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_report_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (rep_type == DR) { dmp.dr = TRUE; @@ -3360,8 +3269,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, report, "Info Present: %s", (report & 0x40) ? "Present" : "Absent"); field_tree = proto_item_add_subtree (tf, ett_report_info_present_dr); - proto_tree_add_item (field_tree, hf_report_info_present_dr, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_report_info_present_dr, tvb, offset, 1, ENC_BIG_ENDIAN); /* Address Encoding */ dmp.addr_enc = ((report & 0x20) >> 5); @@ -3372,8 +3280,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, addr_enc.true_string : addr_enc.false_string); field_tree = proto_item_add_subtree (tf, ett_report_addr_enc_dr); - proto_tree_add_item (field_tree, hf_report_addr_enc_dr, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_report_addr_enc_dr, tvb, offset, 1, ENC_BIG_ENDIAN); if (report & 0x1F) { /* Reserved */ @@ -3381,8 +3288,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, report, "Reserved: %d", report & 0x1F); field_tree = proto_item_add_subtree (tf, ett_report_reserved); - tf = proto_tree_add_item (field_tree, hf_reserved_0x1F, tvb, offset, - 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_reserved_0x1F, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, tf, PI_UNDECODED, PI_WARN, "Reserved value"); @@ -3395,8 +3301,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, report, "Delivery Time: "); field_tree = proto_item_add_subtree (tf, ett_report_del_time); - ei = proto_tree_add_item (field_tree, hf_report_del_time_val, tvb, - offset, 1, FALSE); + ei = proto_tree_add_item (field_tree, hf_report_del_time_val, tvb, offset, 1, ENC_BIG_ENDIAN); secs = dmp_dec_del_time (report); if (secs == DMP_TIME_RESERVED) { proto_item_append_text (tf, "Reserved (0x%2.2x)", report); @@ -3417,8 +3322,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, addr_enc.true_string : addr_enc.false_string); field_tree = proto_item_add_subtree (tf, ett_report_addr_enc_ndr); - proto_tree_add_item (field_tree, hf_report_addr_enc_ndr, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_report_addr_enc_ndr, tvb, offset, 1, ENC_BIG_ENDIAN); /* Reason */ tf = proto_tree_add_uint_format (report_tree, hf_report_reason, @@ -3428,8 +3332,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, non_del_reason_str (report & 0x3F), report & 0x3F); field_tree = proto_item_add_subtree (tf, ett_report_reason); - proto_tree_add_item (field_tree, hf_report_reason, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_report_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Info Present */ @@ -3440,8 +3343,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, report, "Info Present: %s", (report & 0x80) ? "Present" : "Absent"); field_tree = proto_item_add_subtree (tf, ett_report_info_present_ndr); - proto_tree_add_item (field_tree, hf_report_info_present_ndr, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_report_info_present_ndr, tvb, offset, 1, ENC_BIG_ENDIAN); /* Diagnostic */ tf = proto_tree_add_uint_format (report_tree, hf_report_diagn, @@ -3451,8 +3353,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, non_del_diagn_str (report & 0x7F), report & 0x7F); field_tree = proto_item_add_subtree (tf, ett_report_diagn); - proto_tree_add_item (field_tree, hf_report_diagn, tvb, - offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_report_diagn, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -3472,8 +3373,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, 128 - (offset - boffset)); } field_tree = proto_item_add_subtree (tf, ett_report_suppl_info); - proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, - offset, len, FALSE); + proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, offset, len, ENC_BIG_ENDIAN); } offset += len; } @@ -3495,11 +3395,11 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, gint32 secs = 0; if (dmp.notif_type == RN) { - en = proto_tree_add_item (dmp_tree, hf_receipt_notif, tvb, offset, 4, FALSE); + en = proto_tree_add_item (dmp_tree, hf_receipt_notif, tvb, offset, 4, ENC_BIG_ENDIAN); } else if (dmp.notif_type == NRN) { - en = proto_tree_add_item (dmp_tree, hf_non_receipt_notif, tvb, offset, 4, FALSE); + en = proto_tree_add_item (dmp_tree, hf_non_receipt_notif, tvb, offset, 4, ENC_BIG_ENDIAN); } else if (dmp.notif_type == ON) { - en = proto_tree_add_item (dmp_tree, hf_other_notif, tvb, offset, 4, FALSE); + en = proto_tree_add_item (dmp_tree, hf_other_notif, tvb, offset, 4, ENC_BIG_ENDIAN); } else { return offset; } @@ -3512,8 +3412,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, tvb, offset, 1, rec_time, "Receipt Time: "); field_tree = proto_item_add_subtree (tf, ett_notif_rec_time); - ei = proto_tree_add_item (field_tree, hf_notif_rec_time_val, tvb, - offset, 1, FALSE); + ei = proto_tree_add_item (field_tree, hf_notif_rec_time_val, tvb, offset, 1, ENC_BIG_ENDIAN); secs = dmp_dec_exp_time (rec_time); if (secs == DMP_TIME_NOT_PRESENT) { proto_item_append_text (tf, "Not present"); @@ -3531,8 +3430,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, if (dmp.notif_type == ON) { /* ON Type */ on_typex = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (notif_tree, hf_notif_on_type, tvb, offset, - 1, FALSE); + proto_tree_add_item (notif_tree, hf_notif_on_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -3548,8 +3446,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, 128 - (offset - boffset)); } field_tree = proto_item_add_subtree (tf, ett_notif_suppl_info); - proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, - len, FALSE); + proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, len, ENC_BIG_ENDIAN); } offset += len; @@ -3565,8 +3462,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item_append_text (tf, " (incorrect, must be less than 64)"); } field_tree = proto_item_add_subtree (tf, ett_notif_acp127recip); - proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, - offset, len, FALSE); + proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, offset, len, ENC_BIG_ENDIAN); } offset += len; } @@ -3614,16 +3510,16 @@ static gint dissect_dmp_security_category (tvbuff_t *tvb, packet_info *pinfo, switch (ext) { case SEC_CAT_EXT_NONE: - proto_tree_add_item (field_tree, hf_message_sec_cat_cl, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_cs, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_ex, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_ne, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_message_sec_cat_cl, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_cs, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_ex, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_ne, tvb, offset, 1, ENC_BIG_ENDIAN); - tr = proto_tree_add_item (field_tree, hf_reserved_0x08, tvb, offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_reserved_0x08, tvb, offset, 1, ENC_BIG_ENDIAN); if (message & 0x08) { expert_add_info_format (pinfo, tr, PI_UNDECODED, PI_WARN, "Reserved value"); } - tr = proto_tree_add_item (field_tree, hf_reserved_0x04, tvb, offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_reserved_0x04, tvb, offset, 1, ENC_BIG_ENDIAN); if (message & 0x04) { expert_add_info_format (pinfo, tr, PI_UNDECODED, PI_WARN, "Reserved value"); } @@ -3646,7 +3542,7 @@ static gint dissect_dmp_security_category (tvbuff_t *tvb, packet_info *pinfo, message, "1111 11.. = Next byte has Country Code (0x3F)"); country_code = TRUE; } else { - tr = proto_tree_add_item (field_tree, hf_message_sec_cat_permissive, tvb, offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_message_sec_cat_permissive, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text (tf, ": rel-to-%s", get_nat_pol_id_short (message >> 2)); g_string_append_printf (label_string, ",rel-to-%s", get_nat_pol_id_short (message >> 2)); if ((message >> 2) == 0) { @@ -3656,7 +3552,7 @@ static gint dissect_dmp_security_category (tvbuff_t *tvb, packet_info *pinfo, break; case SEC_CAT_EXT_RESTRICTIVE: - proto_tree_add_item (field_tree, hf_message_sec_cat_restrictive, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_message_sec_cat_restrictive, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text (tf, " (restrictive: 0x%2.2x)", message >> 2); break; @@ -3667,16 +3563,16 @@ static gint dissect_dmp_security_category (tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text (tf, " (0x%2.2x)", message); if (dmp.version == 1) { - tr = proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset, 1, ENC_BIG_ENDIAN); if (message & 0x02) { expert_add_info_format (pinfo, tr, PI_UNDECODED, PI_WARN, "Reserved value"); } - tr = proto_tree_add_item (field_tree, hf_reserved_0x01, tvb, offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_reserved_0x01, tvb, offset, 1, ENC_BIG_ENDIAN); if (message & 0x01) { expert_add_info_format (pinfo, tr, PI_UNDECODED, PI_WARN, "Reserved value"); } } else { - tr = proto_tree_add_item (field_tree, hf_message_sec_cat_extended, tvb, offset, 1, FALSE); + tr = proto_tree_add_item (field_tree, hf_message_sec_cat_extended, tvb, offset, 1, ENC_BIG_ENDIAN); if ((message & 0x01) && (message & 0x02)) { expert_add_info_format (pinfo, tr, PI_UNDECODED, PI_WARN, "Reserved value"); } else if (message & 0x01 || message & 0x02) { @@ -3685,7 +3581,7 @@ static gint dissect_dmp_security_category (tvbuff_t *tvb, packet_info *pinfo, } if (country_code) { - proto_tree_add_item (field_tree, hf_message_sec_cat_country_code, tvb, offset+1, 1, FALSE); + proto_tree_add_item (field_tree, hf_message_sec_cat_country_code, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_item_append_text (tf, " (rel-to country-code: %d)", tvb_get_guint8 (tvb, offset+1)); proto_item_set_len (tf, 2); offset++; @@ -3717,13 +3613,11 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, gint loffset, boffset = offset; if (dmp.msg_type == REPORT) { - en = proto_tree_add_item (dmp_tree, hf_report_content, tvb, offset, - 7, FALSE); + en = proto_tree_add_item (dmp_tree, hf_report_content, tvb, offset, 7, ENC_BIG_ENDIAN); } else if (dmp.msg_type == NOTIF) { - en = proto_tree_add_item (dmp_tree, hf_notif_content, tvb, offset, - 7, FALSE); + en = proto_tree_add_item (dmp_tree, hf_notif_content, tvb, offset, 7, ENC_BIG_ENDIAN); } else { - en = proto_tree_add_item (dmp_tree, hf_message_content, tvb, offset, 7, FALSE); + en = proto_tree_add_item (dmp_tree, hf_message_content, tvb, offset, 7, ENC_BIG_ENDIAN); } message_tree = proto_item_add_subtree (en, ett_content); @@ -3741,8 +3635,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, message_type_vals, ""), dmp.st_type); field_tree = proto_item_add_subtree (tf, ett_message_st_type); - proto_tree_add_item (field_tree, hf_message_st_type, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_message_st_type, tvb, offset, 1, ENC_BIG_ENDIAN); if ((message & 0x20) >> 5) { /* Reserved */ @@ -3750,8 +3643,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, message, "Reserved: %d", (message & 0x20)>>5); field_tree = proto_item_add_subtree (tf, ett_message_reserved); - tf = proto_tree_add_item (field_tree, hf_reserved_0x20, tvb, offset, - 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_reserved_0x20, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, tf, PI_UNDECODED, PI_WARN, "Reserved value"); } @@ -3764,8 +3656,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp.prec, precedence, ""), dmp.prec); field_tree = proto_item_add_subtree (tf, ett_message_precedence); - proto_tree_add_item (field_tree, hf_message_precedence, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_message_precedence, tvb, offset, 1, ENC_BIG_ENDIAN); } else { if ((message & 0xE0) >> 5) { @@ -3774,8 +3665,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, message, "Reserved: %d", (message & 0xE0)>>5); field_tree = proto_item_add_subtree (tf, ett_message_reserved); - tf = proto_tree_add_item (field_tree, hf_reserved_0xE0, tvb, offset, - 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_reserved_0xE0, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, tf, PI_UNDECODED, PI_WARN, "Reserved value"); } @@ -3788,8 +3678,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp.prec, importance, ""), dmp.prec); field_tree = proto_item_add_subtree (tf, ett_message_importance); - proto_tree_add_item (field_tree, hf_message_importance, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_message_importance, tvb, offset, 1, ENC_BIG_ENDIAN); } /* Body Format */ @@ -3800,8 +3689,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, body_format_vals, ""), message & 0x03); field_tree = proto_item_add_subtree (tf, ett_message_body_format); - proto_tree_add_item (field_tree, hf_message_body_format, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_message_body_format, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -3834,7 +3722,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, dmp_sec_class); } field_tree = proto_item_add_subtree (tf, ett_message_sec_class); - tf = proto_tree_add_item (field_tree, hf_message_sec_class_val, tvb, offset, 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_message_sec_class_val, tvb, offset, 1, ENC_BIG_ENDIAN); if (class_name) { proto_item_append_text (tf, " (%s)", class_name); g_string_append (label_string, class_name); @@ -3847,18 +3735,14 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp_sec_pol, sec_pol, "%d"), dmp_sec_pol); field_tree = proto_item_add_subtree (tf, ett_message_sec_pol); - proto_tree_add_item (field_tree, hf_message_sec_pol, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_message_sec_pol, tvb, offset, 1, ENC_BIG_ENDIAN); if (dmp.msg_type == STANAG || dmp.msg_type == IPM) { /* Heading Flags */ - tf = proto_tree_add_item (message_tree, hf_message_heading_flags, - tvb, offset, 1, FALSE); + tf = proto_tree_add_item (message_tree, hf_message_heading_flags, tvb, offset, 1, ENC_BIG_ENDIAN); field_tree = proto_item_add_subtree (tf, ett_message_heading_flags); - proto_tree_add_item (field_tree, hf_message_auth_users, tvb, offset, - 1, FALSE); - proto_tree_add_item (field_tree, hf_message_subject_disc, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_message_auth_users, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_subject_disc, tvb, offset, 1, ENC_BIG_ENDIAN); if (message & 0x03) { proto_item_append_text (tf, ": %s%s%s discarded", (message & 0x02) ? "Authorizing users" : "", @@ -3876,16 +3760,14 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, val_to_str (dmp.notif_type, notif_type, "Reserved")); field_tree = proto_item_add_subtree (tf, ett_notif_type); - proto_tree_add_item (field_tree, hf_notif_type, tvb, offset, - 1, FALSE); + proto_tree_add_item (field_tree, hf_notif_type, tvb, offset, 1, ENC_BIG_ENDIAN); } else if (message & 0x02) { /* Reserved */ tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x02, tvb, offset, 1, message, "Reserved: %d", message & 0x02); field_tree = proto_item_add_subtree (tf, ett_message_reserved); - tf = proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset, - 1, FALSE); + tf = proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, tf, PI_UNDECODED, PI_WARN, "Reserved value"); } @@ -3898,8 +3780,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, PROTO_ITEM_SET_GENERATED (tf); } else if (dmp_sec_pol == EXTENDED_NATIONAL) { /* National Policy Identifier */ - proto_tree_add_item (message_tree, hf_message_national_policy_id, - tvb, offset, 1, FALSE); + proto_tree_add_item (message_tree, hf_message_national_policy_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else if (dmp_sec_pol == EXTENDED_MISSION) { /* Mission Policy Identifier */ @@ -3909,8 +3790,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, message, "Mission Policy Identifier: Reserved (0xFF)"); } else { - proto_tree_add_item (message_tree, hf_message_mission_policy_id, - tvb, offset, 1, FALSE); + proto_tree_add_item (message_tree, hf_message_mission_policy_id, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; } @@ -3923,17 +3803,17 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, offset - loffset + 1, label_string->str); PROTO_ITEM_SET_GENERATED (tf); } else { - tf = proto_tree_add_item (message_tree, hf_message_sec_cat_val, tvb, offset, 1, FALSE); + tf = proto_tree_add_item (message_tree, hf_message_sec_cat_val, tvb, offset, 1, ENC_BIG_ENDIAN); field_tree = proto_item_add_subtree (tf, ett_message_sec_cat); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit7, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit6, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit5, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit4, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit3, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit2, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit1, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_sec_cat_bit0, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit7, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit6, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit5, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit4, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit3, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_sec_cat_bit0, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -3944,8 +3824,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, exp_time, "Expiry Time: "); field_tree = proto_item_add_subtree (tf, ett_message_exp_time); - ei = proto_tree_add_item (field_tree, hf_message_exp_time_val, tvb, - offset, 1, FALSE); + ei = proto_tree_add_item (field_tree, hf_message_exp_time_val, tvb, offset, 1, ENC_BIG_ENDIAN); secs = dmp_dec_exp_time (exp_time); if (secs == DMP_TIME_NOT_PRESENT) { proto_item_append_text (tf, "Not present"); @@ -3965,8 +3844,8 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, dtg = tvb_get_guint8 (tvb, offset); tf = proto_tree_add_uint_format (message_tree, hf_message_dtg, tvb, offset, 1, dtg, "DTG: "); field_tree = proto_item_add_subtree (tf, ett_message_dtg); - proto_tree_add_item (field_tree, hf_message_dtg_sign, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_message_dtg_val, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_message_dtg_sign, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_message_dtg_val, tvb, offset, 1, ENC_BIG_ENDIAN); secs = dmp_dec_dtg (dtg & 0x7F); if (secs == DMP_TIME_NOT_PRESENT) { proto_item_append_text (tf, "Not present"); @@ -3994,8 +3873,8 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, if (dmp.version == DMP_VERSION_1 || dmp.msg_id_type == ONLY_DMP_ID) { /* Subject Message Identifier */ dmp.subj_id = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (message_tree, hf_message_subj_id, tvb, offset, 2, FALSE); - hidden_item = proto_tree_add_item (message_tree, hf_dmp_id, tvb, offset, 2, FALSE); + proto_tree_add_item (message_tree, hf_message_subj_id, tvb, offset, 2, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item (message_tree, hf_dmp_id, tvb, offset, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN (hidden_item); offset += 2; } else if (dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID) { @@ -4053,7 +3932,7 @@ static gint dissect_dmp_extensions (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean more_extensions = TRUE; gint num_ext = 0, boffset = offset; - exts_item = proto_tree_add_item (dmp_tree, hf_extensions, tvb, offset, -1, FALSE); + exts_item = proto_tree_add_item (dmp_tree, hf_extensions, tvb, offset, -1, ENC_BIG_ENDIAN); exts_tree = proto_item_add_subtree (exts_item, ett_extensions); while (more_extensions) { @@ -4070,11 +3949,11 @@ static gint dissect_dmp_extensions (tvbuff_t *tvb, packet_info *pinfo _U_, "Extension Length: %u, More %s", ext_length, (ext_hdr & 0x80) ? "Present" : "Not present"); hdr_tree = proto_item_add_subtree (en, ett_extension_header); - proto_tree_add_item (hdr_tree, hf_extension_more, tvb, offset, 1, FALSE); - proto_tree_add_item (hdr_tree, hf_extension_length, tvb, offset, 1, FALSE); + proto_tree_add_item (hdr_tree, hf_extension_more, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (hdr_tree, hf_extension_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (ext_tree, hf_extension_data, tvb, offset, ext_length, FALSE); + proto_tree_add_item (ext_tree, hf_extension_data, tvb, offset, ext_length, ENC_BIG_ENDIAN); offset += ext_length; num_ext++; } @@ -4100,7 +3979,7 @@ static void dissect_dmp (tvbuff_t *tvb, packet_info *pinfo, /* Initialize global data structure */ memset (&dmp, 0, sizeof (dmp)); - ti = proto_tree_add_item (tree, proto_dmp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (tree, proto_dmp, tvb, offset, -1, ENC_BIG_ENDIAN); dmp_tree = proto_item_add_subtree (ti, ett_dmp); offset = dissect_dmp_envelope (tvb, pinfo, dmp_tree, offset); @@ -4128,8 +4007,7 @@ static void dissect_dmp (tvbuff_t *tvb, packet_info *pinfo, checksum1 = crc16_x25_ccitt_tvb (tvb, length - 2); checksum2 = tvb_get_ntohs (tvb, offset); - en = proto_tree_add_item (dmp_tree, hf_checksum, tvb, offset, - 2, FALSE); + en = proto_tree_add_item (dmp_tree, hf_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); checksum_tree = proto_item_add_subtree (en, ett_checksum); if (checksum1 == checksum2) { proto_item_append_text (en, " (correct)"); diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 7429b9037b..3341531e43 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -2101,7 +2101,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_dop, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_dop, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_dop); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP"); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index cfd00e701d..0c31e5a240 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -1817,7 +1817,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_dsp); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP"); diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index cc24b22a8c..973bc7b3cf 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -4753,7 +4753,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static void dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), FALSE); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), ENC_BIG_ENDIAN); } /* @@ -4762,7 +4762,7 @@ dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static void dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), FALSE); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), ENC_BIG_ENDIAN); } /* @@ -4780,7 +4780,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_ftam); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM"); diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 83b09440e1..195d0b9110 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -257,7 +257,7 @@ dissect_extras (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean missing = FALSE; /* Set when extras is missing */ if (extras_len) { - extras_item = proto_tree_add_item (tree, hf_extras, tvb, offset, extras_len, FALSE); + extras_item = proto_tree_add_item (tree, hf_extras, tvb, offset, extras_len, ENC_BIG_ENDIAN); extras_tree = proto_item_add_subtree (extras_item, ett_extras); } @@ -272,7 +272,7 @@ dissect_extras (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Request shall not have extras */ illegal = TRUE; } else { - proto_tree_add_item (extras_tree, hf_extras_flags, tvb, offset, 4, FALSE); + proto_tree_add_item (extras_tree, hf_extras_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } else if (!request) { @@ -289,10 +289,10 @@ dissect_extras (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case OP_REPLACE_Q: if (extras_len) { if (request) { - proto_tree_add_item (extras_tree, hf_extras_flags, tvb, offset, 4, FALSE); + proto_tree_add_item (extras_tree, hf_extras_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (extras_tree, hf_extras_expiration, tvb, offset, 4, FALSE); + proto_tree_add_item (extras_tree, hf_extras_expiration, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { /* Response shall not have extras */ @@ -310,13 +310,13 @@ dissect_extras (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case OP_DECREMENT_Q: if (extras_len) { if (request) { - proto_tree_add_item (extras_tree, hf_extras_delta, tvb, offset, 8, FALSE); + proto_tree_add_item (extras_tree, hf_extras_delta, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item (extras_tree, hf_extras_initial, tvb, offset, 8, FALSE); + proto_tree_add_item (extras_tree, hf_extras_initial, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item (extras_tree, hf_extras_expiration, tvb, offset, 4, FALSE); + proto_tree_add_item (extras_tree, hf_extras_expiration, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { /* Response must not have extras (response is in Value) */ @@ -331,7 +331,7 @@ dissect_extras (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case OP_FLUSH: case OP_FLUSH_Q: if (extras_len) { - proto_tree_add_item (extras_tree, hf_extras_expiration, tvb, offset, 4, FALSE); + proto_tree_add_item (extras_tree, hf_extras_expiration, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -355,20 +355,20 @@ dissect_extras (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, default: if (extras_len) { /* Decode as unknown extras */ - proto_tree_add_item (extras_tree, hf_extras_unknown, tvb, offset, extras_len, FALSE); + proto_tree_add_item (extras_tree, hf_extras_unknown, tvb, offset, extras_len, ENC_BIG_ENDIAN); offset += extras_len; } break; } if (illegal) { - ti = proto_tree_add_item (extras_tree, hf_extras_unknown, tvb, offset, extras_len, FALSE); + ti = proto_tree_add_item (extras_tree, hf_extras_unknown, tvb, offset, extras_len, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "%s %s shall not have Extras", val_to_str (opcode, opcode_vals, "Opcode %d"), request ? "Request" : "Response"); offset += extras_len; } else if (missing) { - ti = proto_tree_add_item (tree, hf_extras_missing, tvb, offset, 0, FALSE); + ti = proto_tree_add_item (tree, hf_extras_missing, tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "%s %s must have Extras", val_to_str (opcode, opcode_vals, "Opcode %d"), request ? "Request" : "Response"); @@ -389,7 +389,7 @@ dissect_key (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean missing = FALSE; /* Set when key is missing */ if (key_len) { - ti = proto_tree_add_item (tree, hf_key, tvb, offset, key_len, FALSE); + ti = proto_tree_add_item (tree, hf_key, tvb, offset, key_len, ENC_BIG_ENDIAN); offset += key_len; } @@ -427,7 +427,7 @@ dissect_key (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str (opcode, opcode_vals, "Opcode %d"), request ? "Request" : "Response"); } else if (missing) { - ti = proto_tree_add_item (tree, hf_key_missing, tvb, offset, 0, FALSE); + ti = proto_tree_add_item (tree, hf_key_missing, tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "%s %s must have Key", val_to_str (opcode, opcode_vals, "Opcode %d"), request ? "Request" : "Response"); @@ -444,12 +444,12 @@ dissect_value (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (value_len > 0) { if (!request && ((opcode == OP_INCREMENT) || (opcode == OP_DECREMENT))) { - ti = proto_tree_add_item (tree, hf_uint64_response, tvb, offset, 8, FALSE); + ti = proto_tree_add_item (tree, hf_uint64_response, tvb, offset, 8, ENC_BIG_ENDIAN); if (value_len != 8) { expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "Illegal Value length, should be 8"); } } else { - ti = proto_tree_add_item (tree, hf_value, tvb, offset, value_len, FALSE); + ti = proto_tree_add_item (tree, hf_value, tvb, offset, value_len, ENC_BIG_ENDIAN); } offset += value_len; } @@ -497,7 +497,7 @@ dissect_value (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str (opcode, opcode_vals, "Opcode %d"), request ? "Request" : "Response"); } else if (missing) { - ti = proto_tree_add_item (tree, hf_value_missing, tvb, offset, 0, FALSE); + ti = proto_tree_add_item (tree, hf_value_missing, tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "%s %s must have Value", val_to_str (opcode, opcode_vals, "Opcode %d"), request ? "Request" : "Response"); @@ -518,11 +518,11 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear (pinfo->cinfo, COL_INFO); - memcache_item = proto_tree_add_item (tree, proto_memcache, tvb, offset, -1, FALSE); + memcache_item = proto_tree_add_item (tree, proto_memcache, tvb, offset, -1, ENC_BIG_ENDIAN); memcache_tree = proto_item_add_subtree (memcache_item, ett_memcache); magic = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item (memcache_tree, hf_magic, tvb, offset, 1, FALSE); + ti = proto_tree_add_item (memcache_tree, hf_magic, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (match_strval (magic, magic_vals) == NULL) { @@ -530,7 +530,7 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } opcode = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item (memcache_tree, hf_opcode, tvb, offset, 1, FALSE); + ti = proto_tree_add_item (memcache_tree, hf_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (match_strval (opcode, opcode_vals) == NULL) { @@ -545,20 +545,20 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str (magic, magic_vals, "Unknown magic (%d)")); key_len = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (memcache_tree, hf_key_length, tvb, offset, 2, FALSE); + proto_tree_add_item (memcache_tree, hf_key_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; extras_len = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (memcache_tree, hf_extras_length, tvb, offset, 1, FALSE); + proto_tree_add_item (memcache_tree, hf_extras_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (memcache_tree, hf_data_type, tvb, offset, 1, FALSE); + proto_tree_add_item (memcache_tree, hf_data_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; status = tvb_get_ntohs (tvb, offset); if (magic & 0x01) { /* We suppose this is a response, even when unknown magic byte */ request = FALSE; - ti = proto_tree_add_item (memcache_tree, hf_status, tvb, offset, 2, FALSE); + ti = proto_tree_add_item (memcache_tree, hf_status, tvb, offset, 2, ENC_BIG_ENDIAN); if (status != 0) { expert_add_info_format (pinfo, ti, PI_RESPONSE_CODE, PI_NOTE, "%s: %s", val_to_str (opcode, opcode_vals, "Unknown opcode (%d)"), @@ -566,7 +566,7 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } else { request = TRUE; - ti = proto_tree_add_item (memcache_tree, hf_reserved, tvb, offset, 2, FALSE); + ti = proto_tree_add_item (memcache_tree, hf_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); if (status != 0) { expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "Reserved value: %d", status); } @@ -578,13 +578,13 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_uint (memcache_tree, hf_value_length, tvb, offset, 0, value_len); PROTO_ITEM_SET_GENERATED (ti); - proto_tree_add_item (memcache_tree, hf_total_body_length, tvb, offset, 4, FALSE); + proto_tree_add_item (memcache_tree, hf_total_body_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (memcache_tree, hf_opaque, tvb, offset, 4, FALSE); + proto_tree_add_item (memcache_tree, hf_opaque, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (memcache_tree, hf_cas, tvb, offset, 8, FALSE); + proto_tree_add_item (memcache_tree, hf_cas, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; if (status == 0) { @@ -597,13 +597,13 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_value (tvb, pinfo, memcache_tree, offset, value_len, opcode, request); offset += value_len; } else if (body_len) { - proto_tree_add_item (memcache_tree, hf_value, tvb, offset, body_len, FALSE); + proto_tree_add_item (memcache_tree, hf_value, tvb, offset, body_len, ENC_BIG_ENDIAN); offset += body_len; col_append_fstr (pinfo->cinfo, COL_INFO, " (%s)", val_to_str (status, status_vals, "Unknown status: %d")); } else { - ti = proto_tree_add_item (memcache_tree, hf_value_missing, tvb, offset, 0, FALSE); + ti = proto_tree_add_item (memcache_tree, hf_value_missing, tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "%s with status %s (%d) must have Value", val_to_str (opcode, opcode_vals, "Opcode %d"), val_to_str (status, status_vals, "Unknown"), status); @@ -871,7 +871,7 @@ dissect_memcache_message (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t orig_offset = offset; - memcache_item = proto_tree_add_item (tree, proto_memcache, tvb, offset, -1, FALSE); + memcache_item = proto_tree_add_item (tree, proto_memcache, tvb, offset, -1, ENC_BIG_ENDIAN); memcache_tree = proto_item_add_subtree (memcache_item, ett_memcache); /* Process the packet data. The first line is expected to be a @@ -1030,7 +1030,7 @@ incr_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) return -1; } - proto_tree_add_item (tree, hf_uint64_response, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_uint64_response, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; @@ -1076,7 +1076,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) tokenlen = get_token_len (line, lineend, &next_token); if ((tokenlen == 4) && strncmp (line, "STAT", tokenlen) == 0) { - proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; occurrences = find_stat_colon (line, lineend, &first_colon, &last_colon); @@ -1093,8 +1093,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) case 2: /* stats items: 2 colons */ /* subcommand 'items' */ tokenlen = (int) (first_colon - line); - proto_tree_add_item (tree, hf_subcommand, tvb, offset, - tokenlen, FALSE); + proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += tokenlen + 1; /* slabclass */ @@ -1140,7 +1139,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) return -1; /* invalid token */ } - proto_tree_add_item (tree, hf_name, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_name, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; @@ -1149,7 +1148,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) if (tokenlen == 0) { return -1; /* invalid token */ } - proto_tree_add_item (tree, hf_name_value, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_name_value, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; @@ -1320,7 +1319,7 @@ memcache_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree return -1; } - proto_tree_add_item (tree, hf_version, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_version, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; @@ -1359,7 +1358,7 @@ memcache_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree (tokenlen == 2 && strncmp (line, "OK", tokenlen) == 0) || (tokenlen == 3 && strncmp (line, "END", tokenlen) == 0)) { - proto_tree_add_item (tree, hf_response, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_response, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; return offset; @@ -1398,7 +1397,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen == 0) { return -1; } - proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; @@ -1485,7 +1484,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tokenlen = get_token_len (line, lineend, &next_token); if (tokenlen != 0) { if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN); } offset += (int) (next_token - line); line = next_token; @@ -1515,7 +1514,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen == 0) { return -1; } - proto_tree_add_item (tree, hf_value, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_value, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; @@ -1525,7 +1524,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; /* reached CRLF */ } if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; } else { @@ -1561,7 +1560,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen <= 10) { if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { /* noreply */ - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN); } else { /* expiration */ memcpy (response_chars, line, tokenlen); @@ -1608,7 +1607,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen == 0) { /* just the 'stats' command;*/ return offset; } else { /* there is a sub command; record it*/ - proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; } @@ -1632,7 +1631,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen <= 10) { if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { /* noreply */ - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN); } else { /* expiration */ memcpy (response_chars, line, tokenlen); @@ -1654,7 +1653,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { /* noreply */ - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, FALSE); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN); offset += (int) (next_token - line); line = next_token; } else { diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c index 0f7e5a295b..2b6358abf0 100644 --- a/epan/dissectors/packet-nat-pmp.c +++ b/epan/dissectors/packet-nat-pmp.c @@ -94,15 +94,15 @@ static void dissect_nat_pmp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear (pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item (tree, proto_nat_pmp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (tree, proto_nat_pmp, tvb, offset, -1, ENC_BIG_ENDIAN); nat_pmp_tree = proto_item_add_subtree (ti, ett_nat_pmp); - proto_tree_add_item (nat_pmp_tree, hf_version, tvb, offset, 1, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; opcode = tvb_get_guint8 (tvb, offset); proto_item_append_text (ti, ", %s", val_to_str (opcode, opcode_vals, "Unknown opcode: %d")); - op_ti = proto_tree_add_item (nat_pmp_tree, hf_opcode, tvb, offset, 1, FALSE); + op_ti = proto_tree_add_item (nat_pmp_tree, hf_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; col_add_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, opcode_vals, "Unknown opcode: %d")); @@ -114,46 +114,46 @@ static void dissect_nat_pmp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree break; case EXTERNAL_ADDRESS_RESPONSE: - proto_tree_add_item (nat_pmp_tree, hf_result_code, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_result_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_sssoe, tvb, offset, 4, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_sssoe, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (nat_pmp_tree, hf_external_ip, tvb, offset, 4, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_external_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case MAP_UDP_REQUEST: case MAP_TCP_REQUEST: - proto_tree_add_item (nat_pmp_tree, hf_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_internal_port, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_internal_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_external_port_requested, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_external_port_requested, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_rpmlis, tvb, offset, 4, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_rpmlis, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case MAP_UDP_RESPONSE: case MAP_TCP_RESPONSE: - proto_tree_add_item (nat_pmp_tree, hf_result_code, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_result_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_sssoe, tvb, offset, 4, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_sssoe, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (nat_pmp_tree, hf_internal_port, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_internal_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_external_port_mapped, tvb, offset, 2, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_external_port_mapped, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (nat_pmp_tree, hf_pmlis, tvb, offset, 4, FALSE); + proto_tree_add_item (nat_pmp_tree, hf_pmlis, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 3976f6044e..5288facf71 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -2729,7 +2729,7 @@ dissect_p1_T_bilateral_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, (void) dissect_ber_length(actx->pinfo, tree, tvb, loffset, &len, NULL); /* create some structure so we can tell what this unknown ASN.1 represents */ - item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE); + item = proto_tree_add_item(tree, hf_index, tvb, offset, len, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1_bilateral_information); offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree); @@ -3414,7 +3414,7 @@ dissect_p1_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i loffset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, NULL, NULL, NULL); (void) dissect_ber_length(actx->pinfo, tree, tvb, loffset, &len, NULL); - item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE); + item = proto_tree_add_item(tree, hf_index, tvb, offset, len, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1_additional_information); proto_item_append_text(tree, " (The use of this field is \"strongly deprecated\".)"); @@ -8325,7 +8325,7 @@ dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) p1_initialize_content_globals (parent_tree, TRUE); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1); } @@ -8367,7 +8367,7 @@ dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p1); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index 646b872425..6900857939 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -4526,7 +4526,7 @@ dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p22, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p22, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p22); } diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index bbc829784e..14461e066b 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -1253,7 +1253,7 @@ dissect_p772(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_p772, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_p772, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_p772); } diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 9435dfce22..a46aad9231 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -560,7 +560,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m } else { en = proto_tree_add_item (analysis_tree, hf_analysis_addr_pdu_missing, - tvb, offset, 0, FALSE); + tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Address PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -581,7 +581,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_ack_missing, - tvb, offset, 0, FALSE); + tvb, offset, 0, ENC_BIG_ENDIAN); if (pinfo->fd->flags.visited) { /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ @@ -626,7 +626,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m } else { en = proto_tree_add_item (analysis_tree, hf_analysis_addr_pdu_missing, - tvb, offset, 0, FALSE); + tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Address PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -709,7 +709,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_addr_pdu_missing, - tvb, offset, 0, FALSE); + tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Address PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -732,7 +732,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_prev_pdu_missing, - tvb, offset, 0, FALSE); + tvb, offset, 0, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Previous PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -826,13 +826,13 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* First fetch PDU Type */ pdu_type = tvb_get_guint8 (tvb, offset + 3) & 0x3F; - ti = proto_tree_add_item (tree, proto_p_mul, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (tree, proto_p_mul, tvb, offset, -1, ENC_BIG_ENDIAN); proto_item_append_text (ti, ", %s", get_type (pdu_type)); p_mul_tree = proto_item_add_subtree (ti, ett_p_mul); /* Length of PDU */ pdu_length = tvb_get_ntohs (tvb, offset); - len_en = proto_tree_add_item (p_mul_tree, hf_length, tvb, offset, 2, FALSE); + len_en = proto_tree_add_item (p_mul_tree, hf_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (pdu_type) { @@ -845,12 +845,12 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case FEC_Address_PDU: case Extra_FEC_Address_PDU: /* Priority */ - proto_tree_add_item (p_mul_tree, hf_priority, tvb, offset, 1, FALSE); + proto_tree_add_item (p_mul_tree, hf_priority, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: /* Unused */ - proto_tree_add_item (p_mul_tree, hf_unused8, tvb, offset, 1, FALSE); + proto_tree_add_item (p_mul_tree, hf_unused8, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -873,8 +873,8 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case FEC_Address_PDU: case Extra_FEC_Address_PDU: map = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (field_tree, hf_map_first, tvb, offset, 1, FALSE); - proto_tree_add_item (field_tree, hf_map_last, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_map_first, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_map_last, tvb, offset, 1, ENC_BIG_ENDIAN); if ((map & 0x80) || (map & 0x40)) { proto_item_append_text (en, ", %s / %s", (map & 0x80) ? "Not first" : "First", @@ -885,10 +885,10 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_item (field_tree, hf_map_unused, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_map_unused, tvb, offset, 1, ENC_BIG_ENDIAN); break; } - proto_tree_add_item (field_tree, hf_pdu_type_value, tvb, offset, 1, FALSE); + proto_tree_add_item (field_tree, hf_pdu_type_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (pdu_type) { @@ -900,32 +900,32 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Total Number of PDUs */ no_pdus = tvb_get_ntohs (tvb, offset); seq_no = 0; - proto_tree_add_item (p_mul_tree, hf_no_pdus, tvb, offset, 2, FALSE); + proto_tree_add_item (p_mul_tree, hf_no_pdus, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text (ti, ", No PDUs: %u", no_pdus); break; case Data_PDU: /* Sequence Number of PDUs */ seq_no = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (p_mul_tree, hf_seq_no, tvb, offset, 2, FALSE); + proto_tree_add_item (p_mul_tree, hf_seq_no, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text (ti, ", Seq no: %u", seq_no); break; case Announce_PDU: /* Count of Destination Entries */ count = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (p_mul_tree, hf_count_of_dest, tvb, offset, 2,FALSE); + proto_tree_add_item (p_mul_tree, hf_count_of_dest, tvb, offset, 2, ENC_BIG_ENDIAN); break; default: /* Unused */ - proto_tree_add_item (p_mul_tree, hf_unused16, tvb, offset, 2, FALSE); + proto_tree_add_item (p_mul_tree, hf_unused16, tvb, offset, 2, ENC_BIG_ENDIAN); break; } offset += 2; /* Checksum */ - en = proto_tree_add_item (p_mul_tree, hf_checksum, tvb, offset, 2, FALSE); + en = proto_tree_add_item (p_mul_tree, hf_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); checksum_tree = proto_item_add_subtree (en, ett_checksum); len = tvb_length (tvb); value = tvb_get_ephemeral_string (tvb, 0, len); @@ -955,18 +955,18 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Source ID of Ack Sender */ ip = tvb_get_ipv4 (tvb, offset); SET_ADDRESS (&dst, AT_IPv4, sizeof(ip), ep_memdup (&ip, 4)); - proto_tree_add_item (p_mul_tree, hf_source_id_ack, tvb, offset, 4, FALSE); + proto_tree_add_item (p_mul_tree, hf_source_id_ack, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Count of Ack Info Entries */ count = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (p_mul_tree, hf_ack_count, tvb, offset, 2, FALSE); + proto_tree_add_item (p_mul_tree, hf_ack_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { /* Source Id */ ip = tvb_get_ipv4 (tvb, offset); SET_ADDRESS (&src, AT_IPv4, sizeof(ip), ep_memdup (&ip, 4)); - proto_tree_add_item (p_mul_tree, hf_source_id, tvb, offset, 4, FALSE); + proto_tree_add_item (p_mul_tree, hf_source_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Message Id */ @@ -981,7 +981,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_id, "Message ID (MSID): %u" " (relative message id)", message_id); } else { - proto_tree_add_item (p_mul_tree, hf_message_id, tvb, offset, 4, FALSE); + proto_tree_add_item (p_mul_tree, hf_message_id, tvb, offset, 4, ENC_BIG_ENDIAN); } offset += 4; @@ -1001,11 +1001,11 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (pdu_type == FEC_Address_PDU || pdu_type == Extra_FEC_Address_PDU) { /* FEC Parameters Length */ fec_len = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (p_mul_tree, hf_fec_len, tvb, offset, 1, FALSE); + proto_tree_add_item (p_mul_tree, hf_fec_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* FEC ID */ - proto_tree_add_item (p_mul_tree, hf_fec_id, tvb, offset, 1, FALSE); + proto_tree_add_item (p_mul_tree, hf_fec_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (fec_len > 0) { @@ -1025,12 +1025,12 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case Extra_FEC_Address_PDU: /* Count of Destination Entries */ no_dest = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (p_mul_tree, hf_count_of_dest, tvb, offset, 2, FALSE); + proto_tree_add_item (p_mul_tree, hf_count_of_dest, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length of Reserved Field */ len = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (p_mul_tree, hf_length_of_res, tvb, offset, 2, FALSE); + proto_tree_add_item (p_mul_tree, hf_length_of_res, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (i = 0; i < no_dest; i++) { @@ -1043,11 +1043,11 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Destination Id */ ip = tvb_get_ipv4 (tvb, offset); SET_ADDRESS (&dst, AT_IPv4, sizeof(ip), ep_memdup(&ip, 4)); - proto_tree_add_item (field_tree, hf_dest_id, tvb, offset, 4, FALSE); + proto_tree_add_item (field_tree, hf_dest_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Message Sequence Number */ - proto_tree_add_item (field_tree, hf_msg_seq_no, tvb, offset, 4, FALSE); + proto_tree_add_item (field_tree, hf_msg_seq_no, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (len > 0) { @@ -1095,8 +1095,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) field_tree = proto_item_add_subtree (en, ett_ack_entry); /* Length of Ack Info Entry */ - en = proto_tree_add_item (field_tree, hf_ack_length, tvb, offset, - 2, FALSE); + en = proto_tree_add_item (field_tree, hf_ack_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (len < 10) { @@ -1108,7 +1107,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Source Id */ ip = tvb_get_ipv4 (tvb, offset); SET_ADDRESS (&src, AT_IPv4, sizeof(ip), ep_memdup (&ip, 4)); - proto_tree_add_item (field_tree, hf_source_id, tvb, offset, 4, FALSE); + proto_tree_add_item (field_tree, hf_source_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Message Id */ @@ -1123,7 +1122,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_id, "Message ID (MSID): %u" " (relative message id)", message_id); } else { - proto_tree_add_item (field_tree, hf_message_id, tvb, offset, 4, FALSE); + proto_tree_add_item (field_tree, hf_message_id, tvb, offset, 4, ENC_BIG_ENDIAN); } offset += 4; @@ -1173,8 +1172,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) prev_ack_seq_no = end_seq_no; } else { /* No range, handle one seq no */ - en = proto_tree_add_item (field_tree, hf_miss_seq_no, tvb,offset, - 2, FALSE); + en = proto_tree_add_item (field_tree, hf_miss_seq_no, tvb,offset, 2, ENC_BIG_ENDIAN); offset += 2; if (ack_seq_no == 0) { @@ -1227,12 +1225,12 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case Announce_PDU: /* Announced Multicast Group */ - proto_tree_add_item (p_mul_tree, hf_ann_mc_group, tvb, offset, 4, FALSE); + proto_tree_add_item (p_mul_tree, hf_ann_mc_group, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < count; i++) { /* Destination Id */ - proto_tree_add_item (p_mul_tree, hf_dest_id, tvb, offset, 4, FALSE); + proto_tree_add_item (p_mul_tree, hf_dest_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -1241,7 +1239,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case Reject_PDU: case Release_PDU: /* Multicast Group */ - proto_tree_add_item (p_mul_tree, hf_mc_group, tvb, offset, 4, FALSE); + proto_tree_add_item (p_mul_tree, hf_mc_group, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c index 8c5e688ac1..87b2f76f5d 100644 --- a/epan/dissectors/packet-packetlogger.c +++ b/epan/dissectors/packet-packetlogger.c @@ -74,11 +74,11 @@ static void dissect_packetlogger (tvbuff_t *tvb, packet_info *pinfo, proto_tree col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear (pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item (tree, proto_packetlogger, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_packetlogger, tvb, 0, -1, ENC_BIG_ENDIAN); packetlogger_tree = proto_item_add_subtree (ti, ett_packetlogger); pl_type = tvb_get_guint8 (tvb, 0); - proto_tree_add_item (packetlogger_tree, hf_type, tvb, 0, 1, FALSE); + proto_tree_add_item (packetlogger_tree, hf_type, tvb, 0, 1, ENC_BIG_ENDIAN); proto_item_append_text (ti, " %s", val_to_str (pl_type, type_vals, "Unknown 0x%02x")); len = tvb_length_remaining (tvb, 1); @@ -125,7 +125,7 @@ static void dissect_packetlogger (tvbuff_t *tvb, packet_info *pinfo, proto_tree case PKT_POWER: case PKT_NOTE: case PKT_NEW_CONTROLLER: - proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, FALSE); + proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_BIG_ENDIAN); col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (next_tvb, 0, len)); break; default: diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index fa69a2e0cf..f8fe11bbd3 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -203,7 +203,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf if((session != NULL) && ((rinfo = (ros_info_t*)g_hash_table_lookup(protocol_table, oid)) != NULL)) { if(tree){ - item = proto_tree_add_item(tree, *(rinfo->proto), tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, *(rinfo->proto), tvb, 0, -1, ENC_BIG_ENDIAN); ros_tree = proto_item_add_subtree(item, *(rinfo->ett_proto)); } @@ -1066,7 +1066,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* pinfo->private_data = ros_info; */ if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_ros); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS"); diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 28a8084d50..43f007e69c 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -311,7 +311,7 @@ dissect_rpcap_error (tvbuff_t *tvb, packet_info *pinfo, tvb_format_text_wsp (tvb, offset, len)); } - ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, FALSE); + ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, ENC_BIG_ENDIAN); expert_add_info_format (pinfo, ti, PI_SEQUENCE, PI_NOTE, "Error: %s", tvb_format_text_wsp (tvb, offset, len)); } @@ -328,15 +328,15 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo, guint32 ipv4; guint16 af; - ti = proto_tree_add_item (parent_tree, hf_id, tvb, offset, 128, FALSE); + ti = proto_tree_add_item (parent_tree, hf_id, tvb, offset, 128, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_ifaddr); af = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_if_af, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_if_af, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (af == AF_INET) { - proto_tree_add_item (tree, hf_if_port, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_if_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; ipv4 = tvb_get_ipv4 (tvb, offset); @@ -345,13 +345,13 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo, if (parent_item) { proto_item_append_text (parent_item, ": %s", ipaddr); } - proto_tree_add_item (tree, hf_if_ip, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_if_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_if_padding, tvb, offset, 120, FALSE); + proto_tree_add_item (tree, hf_if_padding, tvb, offset, 120, ENC_BIG_ENDIAN); offset += 120; } else { - ti = proto_tree_add_item (tree, hf_if_unknown, tvb, offset, 126, FALSE); + ti = proto_tree_add_item (tree, hf_if_unknown, tvb, offset, 126, ENC_BIG_ENDIAN); if (af != AF_UNSPEC) { expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_CHAT, "Unknown address family: %d", af); @@ -371,7 +371,7 @@ dissect_rpcap_findalldevs_ifaddr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item *ti; gint boffset = offset; - ti = proto_tree_add_item (parent_tree, hf_findalldevs_ifaddr, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_findalldevs_ifaddr, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_findalldevs_ifaddr); offset = dissect_rpcap_ifaddr (tvb, pinfo, tree, offset, hf_if_addr, ti); @@ -394,35 +394,35 @@ dissect_rpcap_findalldevs_if (tvbuff_t *tvb, packet_info *pinfo _U_, guint16 namelen, desclen, naddr, i; gint boffset = offset; - ti = proto_tree_add_item (parent_tree, hf_findalldevs_if, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_findalldevs_if, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_findalldevs_if); namelen = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_namelen, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_namelen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; desclen = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_desclen, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_desclen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (tree, hf_if_flags, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_if_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; naddr = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_naddr, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_naddr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (namelen) { proto_item_append_text (ti, ": %s", tvb_get_ephemeral_string (tvb, offset, namelen)); - proto_tree_add_item (tree, hf_if_name, tvb, offset, namelen, FALSE); + proto_tree_add_item (tree, hf_if_name, tvb, offset, namelen, ENC_BIG_ENDIAN); offset += namelen; } if (desclen) { - proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, FALSE); + proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, ENC_BIG_ENDIAN); offset += desclen; } @@ -449,7 +449,7 @@ dissect_rpcap_findalldevs_reply (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item *ti; guint16 i; - ti = proto_tree_add_item (parent_tree, hf_findalldevs_reply, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_findalldevs_reply, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_findalldevs_reply); for (i = 0; i < no_devs; i++) { @@ -472,19 +472,19 @@ dissect_rpcap_filterbpf_insn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree; proto_item *ti; - ti = proto_tree_add_item (parent_tree, hf_filterbpf_insn, tvb, offset, 8, FALSE); + ti = proto_tree_add_item (parent_tree, hf_filterbpf_insn, tvb, offset, 8, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_filterbpf_insn); - proto_tree_add_item (tree, hf_code, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (tree, hf_jt, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_jt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_jf, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_jf, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_instr_value, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_instr_value, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -499,17 +499,17 @@ dissect_rpcap_filter (tvbuff_t *tvb, packet_info *pinfo, proto_item *ti; guint32 nitems, i; - ti = proto_tree_add_item (parent_tree, hf_filter, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_filter, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_filter); - proto_tree_add_item (tree, hf_filtertype, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_filtertype, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; nitems = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_nitems, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_nitems, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < nitems; i++) { @@ -531,22 +531,22 @@ dissect_rpcap_auth_request (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item *ti; guint16 type, slen1, slen2; - ti = proto_tree_add_item (parent_tree, hf_auth_request, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_auth_request, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_auth_request); type = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_auth_type, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_auth_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; slen1 = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_auth_slen1, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_auth_slen1, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; slen2 = tvb_get_ntohs (tvb, offset); - proto_tree_add_item (tree, hf_auth_slen2, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_auth_slen2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (type == RPCAP_RMTAUTH_NULL) { @@ -555,11 +555,11 @@ dissect_rpcap_auth_request (tvbuff_t *tvb, packet_info *pinfo _U_, guint8 *username, *password; username = tvb_get_ephemeral_string (tvb, offset, slen1); - proto_tree_add_item (tree, hf_auth_username, tvb, offset, slen1, FALSE); + proto_tree_add_item (tree, hf_auth_username, tvb, offset, slen1, ENC_BIG_ENDIAN); offset += slen1; password = tvb_get_ephemeral_string (tvb, offset, slen2); - proto_tree_add_item (tree, hf_auth_password, tvb, offset, slen2, FALSE); + proto_tree_add_item (tree, hf_auth_password, tvb, offset, slen2, ENC_BIG_ENDIAN); offset += slen2; proto_item_append_text (ti, " (%s/%s)", username, password); @@ -574,7 +574,7 @@ dissect_rpcap_open_request (tvbuff_t *tvb, packet_info *pinfo _U_, gint len; len = tvb_length_remaining (tvb, offset); - proto_tree_add_item (parent_tree, hf_open_request, tvb, offset, len, FALSE); + proto_tree_add_item (parent_tree, hf_open_request, tvb, offset, len, ENC_BIG_ENDIAN); } @@ -585,14 +585,14 @@ dissect_rpcap_open_reply (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree; proto_item *ti; - ti = proto_tree_add_item (parent_tree, hf_open_reply, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_open_reply, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_open_reply); linktype = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_linktype, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_linktype, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_tzoff, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_tzoff, tvb, offset, 4, ENC_BIG_ENDIAN); } @@ -604,23 +604,23 @@ dissect_rpcap_startcap_request (tvbuff_t *tvb, packet_info *pinfo, proto_item *ti, *field_ti; guint16 flags; - ti = proto_tree_add_item (parent_tree, hf_startcap_request, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_startcap_request, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_startcap_request); - proto_tree_add_item (tree, hf_snaplen, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_snaplen, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_read_timeout, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_read_timeout, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; flags = tvb_get_ntohs (tvb, offset); field_ti = proto_tree_add_uint_format (tree, hf_flags, tvb, offset, 2, flags, "Flags"); field_tree = proto_item_add_subtree (field_ti, ett_startcap_flags); - proto_tree_add_item (field_tree, hf_flags_promisc, tvb, offset, 2, FALSE); - proto_tree_add_item (field_tree, hf_flags_dgram, tvb, offset, 2, FALSE); - proto_tree_add_item (field_tree, hf_flags_serveropen, tvb, offset, 2, FALSE); - proto_tree_add_item (field_tree, hf_flags_inbound, tvb, offset, 2, FALSE); - proto_tree_add_item (field_tree, hf_flags_outbound, tvb, offset, 2, FALSE); + proto_tree_add_item (field_tree, hf_flags_promisc, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_flags_dgram, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_flags_serveropen, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_flags_inbound, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (field_tree, hf_flags_outbound, tvb, offset, 2, ENC_BIG_ENDIAN); if (flags & 0x1F) { gchar *flagstr = g_strdup_printf ("%s%s%s%s%s", @@ -636,7 +636,7 @@ dissect_rpcap_startcap_request (tvbuff_t *tvb, packet_info *pinfo, } offset += 2; - proto_tree_add_item (tree, hf_client_port, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_client_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; dissect_rpcap_filter (tvb, pinfo, tree, offset); @@ -650,16 +650,16 @@ dissect_rpcap_startcap_reply (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree; proto_item *ti; - ti = proto_tree_add_item (parent_tree, hf_startcap_reply, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_startcap_reply, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_startcap_reply); - proto_tree_add_item (tree, hf_bufsize, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_bufsize, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_server_port, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_server_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, ENC_BIG_ENDIAN); } @@ -670,19 +670,19 @@ dissect_rpcap_stats_reply (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree; proto_item *ti; - ti = proto_tree_add_item (parent_tree, hf_stats_reply, tvb, offset, 16, FALSE); + ti = proto_tree_add_item (parent_tree, hf_stats_reply, tvb, offset, 16, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_stats_reply); - proto_tree_add_item (tree, hf_ifrecv, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_ifrecv, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_ifdrop, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_ifdrop, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_krnldrop, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_krnldrop, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_srvcapt, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_srvcapt, tvb, offset, 4, ENC_BIG_ENDIAN); } @@ -695,21 +695,21 @@ dissect_rpcap_sampling_request (tvbuff_t *tvb, packet_info *pinfo _U_, guint32 value; guint8 method; - ti = proto_tree_add_item (parent_tree, hf_sampling_request, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (parent_tree, hf_sampling_request, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_sampling_request); method = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (tree, hf_sampling_method, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_sampling_method, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_sampling_dummy1, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_sampling_dummy1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_sampling_dummy2, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_sampling_dummy2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; value = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_sampling_value, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_sampling_value, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch (method) { @@ -739,7 +739,7 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, guint caplen, len, frame_no; gint reported_length_remaining; - ti = proto_tree_add_item (parent_tree, hf_packet, tvb, offset, 20, FALSE); + ti = proto_tree_add_item (parent_tree, hf_packet, tvb, offset, 20, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_packet); ts.secs = tvb_get_ntohl (tvb, offset); @@ -748,15 +748,15 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, offset += 8; caplen = tvb_get_ntohl (tvb, offset); - ti = proto_tree_add_item (tree, hf_caplen, tvb, offset, 4, FALSE); + ti = proto_tree_add_item (tree, hf_caplen, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; len = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_len, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; frame_no = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_npkt, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_npkt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_item_append_text (ti, ", Frame %u", frame_no); @@ -810,14 +810,14 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree) col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item (top_tree, proto_rpcap, tvb, offset, -1, FALSE); + ti = proto_tree_add_item (top_tree, proto_rpcap, tvb, offset, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (ti, ett_rpcap); - proto_tree_add_item (tree, hf_version, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; msg_type = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (tree, hf_type, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (check_col (pinfo->cinfo, COL_INFO)) { @@ -829,13 +829,13 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree) msg_value = tvb_get_ntohs (tvb, offset); if (msg_type == RPCAP_MSG_ERROR) { - proto_tree_add_item (tree, hf_error_value, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_error_value, tvb, offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (tree, hf_value, tvb, offset, 2, FALSE); + proto_tree_add_item (tree, hf_value, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; - proto_tree_add_item (tree, hf_plen, tvb, offset, 4, FALSE); + proto_tree_add_item (tree, hf_plen, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index f6355e72a1..ce743b9458 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -792,7 +792,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) frag_msg, &rtse_frag_items, NULL, parent_tree); } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_rtse, next_tvb ? next_tvb : tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_rtse, next_tvb ? next_tvb : tvb, 0, -1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_rtse); } if (rtse_reassemble && session->spdu_type == SES_DATA_TRANSFER) { diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 84d0754b66..e373c1e74a 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -569,7 +569,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pt_varbind = proto_item_add_subtree(pi_varbind,ett_varbind); *label = '\0'; - pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,FALSE); + pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,ENC_BIG_ENDIAN); pt_name = proto_item_add_subtree(pi_name,ett_name); /* fetch ObjectName and its relative oid_info */ @@ -623,7 +623,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } } - pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,FALSE); + pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); expert_add_info_format(actx->pinfo, pi, PI_RESPONSE_CODE, PI_NOTE, "%s",note); g_strlcpy (label, note, ITEM_LABEL_LENGTH); goto set_label; @@ -640,7 +640,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } else if (oid_left == 0) { if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) { /* unSpecified does not require an instance sub-id add the new value and get off the way! */ - pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN); goto set_label; } else { proto_item* pi = proto_tree_add_text(pt_name,tvb,0,0,"A scalar should have one instance sub-id this one has none"); @@ -664,7 +664,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, if ( key_len == 0 && ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) { /* unSpecified does not require an instance sub-id add the new value and get off the way! */ - pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN); goto set_label; } @@ -831,7 +831,7 @@ indexing_done: if (oid_info_is_ok && oid_info->value_type) { if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) { - pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN); } else { /* Provide a tree_item to attach errors to, if needed. */ pi_value = pi_name; @@ -851,7 +851,7 @@ indexing_done: } if (format_error == BER_NO_ERROR) - pi_value = proto_tree_add_item(pt_varbind,oid_info->value_hfid,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,oid_info->value_hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); } } else { switch(ber_class|(tag<<4)) { @@ -927,7 +927,7 @@ indexing_done: break; } - pi_value = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,FALSE); + pi_value = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); if (format_error != BER_NO_ERROR) { expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Unresolved value, Missing MIB"); } @@ -1051,7 +1051,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) /* first bit: engine id conformance */ if (len_remain<4) return offset; conformance = ((tvb_get_guint8(tvb, offset)>>7) & 0x01); - proto_tree_add_item(tree, hf_snmp_engineid_conform, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_conform, tvb, offset, 1, ENC_BIG_ENDIAN); /* 4-byte enterprise number/name */ if (len_remain<4) return offset; @@ -1091,7 +1091,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_IPV4: /* 4-byte IPv4 address */ if (len_remain==4) { - proto_tree_add_item(tree, hf_snmp_engineid_ipv4, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; len_remain=0; } @@ -1099,7 +1099,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_IPV6: /* 16-byte IPv6 address */ if (len_remain==16) { - proto_tree_add_item(tree, hf_snmp_engineid_ipv6, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN); offset+=16; len_remain=0; } @@ -1107,13 +1107,13 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_MACADDRESS: /* See: https://supportforums.cisco.com/message/3010617#3010617 for details. */ if ((enterpriseid==9)&&(len_remain==7)) { - proto_tree_add_item(tree, hf_snmp_engineid_cisco_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_cisco_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; len_remain--; } /* 6-byte MAC address */ if (len_remain==6) { - proto_tree_add_item(tree, hf_snmp_engineid_mac, tvb, offset, 6, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_mac, tvb, offset, 6, ENC_BIG_ENDIAN); offset+=6; len_remain=0; } @@ -1121,7 +1121,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) case SNMP_ENGINEID_FORMAT_TEXT: /* max. 27-byte string, administratively assigned */ if (len_remain<=27) { - proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, ENC_BIG_ENDIAN); offset+=len_remain; len_remain=0; } @@ -1132,7 +1132,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) proto_item_append_text(item, (enterpriseid==2021) ? ": UCD-SNMP Random" : ": Net-SNMP Random"); /* demystify: 4B random, 4B epoch seconds */ if (len_remain==8) { - proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, ENC_BIG_ENDIAN); seconds = tvb_get_letohl(tvb, offset+4); ts.secs = seconds; ts.nsecs = 0; @@ -1148,7 +1148,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) default: /* max. 27 bytes, administratively assigned or unknown format */ if (len_remain<=27) { - proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, FALSE); + proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, ENC_BIG_ENDIAN); offset+=len_remain; len_remain=0; } @@ -2854,7 +2854,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { item = proto_tree_add_item(tree, proto, tvb, start_offset, - message_length, FALSE); + message_length, ENC_BIG_ENDIAN); snmp_tree = proto_item_add_subtree(item, ett); } @@ -3005,7 +3005,7 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); if (tree) { - item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_BIG_ENDIAN); smux_tree = proto_item_add_subtree(item, ett_smux); } |