diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-19 10:51:12 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-19 10:51:12 +0000 |
commit | 805d4a900da230147725ae7e2ed1b78559b9fb06 (patch) | |
tree | 1dc40a0b549031fb78f37dca8dce8a0dff23cd61 /asn1 | |
parent | b16f211306651086b8c45baf60da6451def07ef8 (diff) |
Use correct encoding for proto_tree_add_item().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38107 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/acse/packet-acse-template.c | 4 | ||||
-rw-r--r-- | asn1/cdt/packet-cdt-template.c | 2 | ||||
-rw-r--r-- | asn1/disp/packet-disp-template.c | 2 | ||||
-rw-r--r-- | asn1/dop/packet-dop-template.c | 2 | ||||
-rw-r--r-- | asn1/dsp/packet-dsp-template.c | 2 | ||||
-rw-r--r-- | asn1/ftam/packet-ftam-template.c | 6 | ||||
-rw-r--r-- | asn1/p1/p1.cnf | 4 | ||||
-rw-r--r-- | asn1/p1/packet-p1-template.c | 4 | ||||
-rw-r--r-- | asn1/p22/packet-p22-template.c | 2 | ||||
-rw-r--r-- | asn1/p772/packet-p772-template.c | 2 | ||||
-rw-r--r-- | asn1/ros/packet-ros-template.c | 4 | ||||
-rw-r--r-- | asn1/rtse/packet-rtse-template.c | 2 | ||||
-rw-r--r-- | asn1/snmp/packet-snmp-template.c | 34 |
13 files changed, 35 insertions, 35 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); } |