diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-21 02:10:19 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-21 02:10:19 +0000 |
| commit | 794757ae8fbee85db2b24bc46b7e9cc492de01df (patch) | |
| tree | a955184a13d8444bdec0de9200f261c46cfa2734 /epan/dissectors | |
| parent | 449d732485da5a19b8a0d3ddef49ed30498712ff (diff) | |
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.
svn path=/trunk/; revision=39503
Diffstat (limited to 'epan/dissectors')
543 files changed, 1314 insertions, 1314 deletions
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index d44637df16..b88ce0270b 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -139,7 +139,7 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_tree *tree_2dparityfec = NULL; gint offset = 0; - ti = proto_tree_add_item(tree, proto_2dparityfec, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_2dparityfec, tvb, 0, -1, ENC_NA); tree_2dparityfec = proto_item_add_subtree(ti, ett_2dparityfec); proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_low, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index c8cf9353d7..1f869b0aa5 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -581,7 +581,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_njack, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); njack_tree = proto_item_add_subtree(ti, ett_njack); proto_tree_add_item(njack_tree, hf_njack_magic, tvb, offset, 5, diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c index 58b559ca62..be829a8c2b 100644 --- a/epan/dissectors/packet-3com-xns.c +++ b/epan/dissectors/packet-3com-xns.c @@ -74,7 +74,7 @@ dissect_3com_xns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_3com_xns, tvb, 0, 4, FALSE); + ti = proto_tree_add_item(tree, proto_3com_xns, tvb, 0, 4, ENC_NA); subtree = proto_item_add_subtree(ti, ett_3com_xns); } @@ -112,7 +112,7 @@ proto_register_3com_xns(void) }; proto_3com_xns = proto_register_protocol("3Com XNS Encapsulation", "3COMXNS", "3comxns"); - proto_register_field_array(proto_3com_xns, hf, array_length(hf)); + proto_register_field_array(proto_3com_xns, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 3dee019255..d1e907ca66 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -1622,7 +1622,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 12)); if (tree) { - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* type */ @@ -1671,7 +1671,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1705,7 +1705,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 8)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1735,7 +1735,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb,3)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1768,7 +1768,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 8)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1798,7 +1798,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb,3)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1832,7 +1832,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 12)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1865,7 +1865,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 8)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index 44d6ec2038..ab24f656d3 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -83,7 +83,7 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_acap, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); acap_tree = proto_item_add_subtree(ti, ett_acap); if (is_request) { diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 60494743c1..99346295c1 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -475,7 +475,7 @@ static int dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Create our actrace subtree */ - ti = proto_tree_add_item(tree,proto_actrace,tvb,0,-1, FALSE); + ti = proto_tree_add_item(tree,proto_actrace,tvb,0,-1, ENC_NA); actrace_tree = proto_item_add_subtree(ti, ett_actrace); } diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index f0faf143a5..011fe33d86 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -858,7 +858,7 @@ dissect_agentx_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(!tree) return; - /*t_item = proto_tree_add_item(tree, proto_agentx, tvb, 0, -1, FALSE);*/ + /*t_item = proto_tree_add_item(tree, proto_agentx, tvb, 0, -1, ENC_NA);*/ t_item = proto_tree_add_protocol_format(tree, proto_agentx, tvb, 0, -1, "Agent Extensibility (AgentX) Protocol: %s, sid=%d, tid=%d, packid=%d, plen=%d", val_to_str(type, type_values, "unknown"), diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c index 5a22d39bc5..e9ad7b0964 100644 --- a/epan/dissectors/packet-airopeek.c +++ b/epan/dissectors/packet-airopeek.c @@ -66,7 +66,7 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_airopeek, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_airopeek, tvb, 0, -1, ENC_NA); airopeek_tree = proto_item_add_subtree(ti, ett_airopeek); proto_tree_add_item(airopeek_tree, hf_airopeek_unknown1, tvb, 0, 2, ENC_NA); diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index cb63ca1537..02096cf49a 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -1375,7 +1375,7 @@ static void dissect_alcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, alcap_proto_name_short); if (tree) { - proto_item *alcap_item = proto_tree_add_item(tree, proto_alcap, tvb, 0, -1, ENC_BIG_ENDIAN); + proto_item *alcap_item = proto_tree_add_item(tree, proto_alcap, tvb, 0, -1, ENC_NA); alcap_tree = proto_item_add_subtree(alcap_item, ett_alcap); } diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 21538e19b8..2edaeb7652 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -5613,7 +5613,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, strbuf->str); col_set_fence(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp_init); proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA); proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN); @@ -5625,7 +5625,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Protocol frame */ - ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp); proto_tree_add_item(amqp_tree, hf_amqp_0_10_format, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_0_10_position, tvb, 0, 1, ENC_BIG_ENDIAN); @@ -5759,7 +5759,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, strbuf->str); col_set_fence(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp_init); proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA); proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN); @@ -5770,7 +5770,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp); frame_type = tvb_get_guint8(tvb, 0); proto_tree_add_item(amqp_tree, hf_amqp_0_9_type, tvb, 0, 1, ENC_BIG_ENDIAN); @@ -5790,7 +5790,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Connection.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Connection.%s", val_to_str( method_id, amqp_method_connection_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); switch (method_id) { @@ -5853,7 +5853,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Channel.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Channel.%s", val_to_str( method_id, amqp_method_channel_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); @@ -5941,7 +5941,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Exchange.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Exchange.%s", val_to_str( method_id, amqp_method_exchange_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); switch (method_id) { @@ -5983,7 +5983,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Queue.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Queue.%s", val_to_str( method_id, amqp_method_queue_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); @@ -6043,7 +6043,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Basic.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Basic.%s", val_to_str( method_id, amqp_method_basic_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); @@ -6123,7 +6123,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "File.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "File.%s", val_to_str( method_id, amqp_method_file_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); @@ -6199,7 +6199,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Stream.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Stream.%s", val_to_str( method_id, amqp_method_stream_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); @@ -6255,7 +6255,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Tx.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Tx.%s", val_to_str( method_id, amqp_method_tx_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); @@ -6299,7 +6299,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 11, length - 4, ENC_NA); args_tree = proto_item_add_subtree(ti, ett_args); - col_append_fstr(pinfo->cinfo, COL_INFO, "Dtx.%s", + col_append_fstr(pinfo->cinfo, COL_INFO, "Dtx.%s", val_to_str( method_id, amqp_method_dtx_methods, "Unknown (%u)")); col_set_fence(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 0a5c65623a..0ca194f9ff 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -439,7 +439,7 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr if (tree) { - ti = proto_tree_add_item(tree, proto_amr, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_amr, tvb, 0, -1, ENC_NA); amr_tree = proto_item_add_subtree(ti, ett_amr); proto_tree_add_text(amr_tree, tvb, offset, -1, "Payload decoded as %s", diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index d025655f1d..52e5beb705 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -573,7 +573,7 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ancp_tree = NULL; guint8 byte; - ti = proto_tree_add_item(tree, proto_ancp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ancp, tvb, 0, -1, ENC_NA); ancp_tree = proto_item_add_subtree(ti, ett_ancp_len); diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index f837f38deb..f4e7968bec 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -84,7 +84,7 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) seq_num, sender_id, ether_to_str(team_id)); if (tree) { - ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, ENC_NA); ans_tree = proto_item_add_subtree(ti, ett_ans); proto_tree_add_item(ans_tree, hf_ans_app_id, tvb, 0, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index c9e34e1a21..cb0704332a 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -16311,7 +16311,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * create the ansi_map protocol tree */ - ansi_map_item = proto_tree_add_item(tree, proto_ansi_map, tvb, 0, -1, FALSE); + ansi_map_item = proto_tree_add_item(tree, proto_ansi_map, tvb, 0, -1, ENC_NA); ansi_map_tree = proto_item_add_subtree(ansi_map_item, ett_ansi_map); ansi_map_is_invoke = FALSE; is683_ota = FALSE; diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 1c092a2d02..66a578cc50 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1338,7 +1338,7 @@ dissect_ansi_tcap(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_ansi_tcap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_ansi_tcap, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_tcap); tcap_stat_item=item; tcap_stat_tree=tree; @@ -1682,7 +1682,7 @@ proto_register_ansi_tcap(void) static enum_val_t ansi_tcap_response_matching_type_values[] = { {"Only Transaction ID will be used in Invoke/response matching", "Transaction ID only", 0}, - {"Transaction ID and Source will be used in Invoke/response matching", "Transaction ID and Source", 1}, + {"Transaction ID and Source will be used in Invoke/response matching", "Transaction ID and Source", 1}, {"Transaction ID Source and Destination will be used in Invoke/response matching", "Transaction ID Source and Destination", 2}, {NULL, NULL, -1} }; diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index 89636f8247..c82c6047f6 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -386,7 +386,7 @@ dissect_aoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_aoe, tvb, 0, -1, ENC_BIG_ENDIAN); + item = proto_tree_add_item(parent_tree, proto_aoe, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_aoe); } diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index 66893ab3f3..3ccd667c68 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -11,17 +11,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -57,11 +57,11 @@ dissect_cert(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_item *ti; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(application/pkix-cert)"); if (tree) { - ti = proto_tree_add_item(tree, proto_cert, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cert, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_cert); } @@ -96,7 +96,7 @@ proto_register_cert(void) proto_cert = proto_register_protocol( "PKIX CERT File Format", "PKIX Certificate", - "pkix-cert" + "pkix-cert" ); /* Required function calls to register the header fields diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index c679636e70..e212d9aa3e 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -120,7 +120,7 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g if ( tree ) { proto_item *ti; - ti = proto_tree_add_item( tree, proto_applemidi, tvb, 0, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_applemidi, tvb, 0, -1, ENC_NA ); applemidi_tree = proto_item_add_subtree( ti, ett_applemidi ); proto_tree_add_item( applemidi_tree, hf_applemidi_signature, tvb, offset, 2, ENC_BIG_ENDIAN ); diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 8d4466bc2b..11f29f8762 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -151,7 +151,7 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, SET_ADDRESS(&pinfo->dl_dst, AT_ARCNET, 1, tvb_get_ptr(tvb, 1, 1)); SET_ADDRESS(&pinfo->dst, AT_ARCNET, 1, tvb_get_ptr(tvb, 1, 1)); - ti = proto_tree_add_item (tree, proto_arcnet, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_arcnet, tvb, 0, -1, ENC_NA); arcnet_tree = proto_item_add_subtree (ti, ett_arcnet); diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index 547834b55f..27e5ee5206 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -247,7 +247,7 @@ dissect_armagetronad(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_armagetronad, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_armagetronad, tvb, 0, -1, ENC_NA); armagetronad_tree = proto_item_add_subtree(ti, ett_armagetronad); /* For each message in the frame */ diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 92ab8cff8b..47ee930896 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -1369,7 +1369,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_artnet, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_artnet, tvb, offset, -1, ENC_NA); artnet_tree = proto_item_add_subtree(ti, ett_artnet); hi = proto_tree_add_item(artnet_tree, diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 824cada395..fdff22f002 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -68,7 +68,7 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_aruba_adp, tvb, 0, 0, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_aruba_adp, tvb, 0, 0, ENC_NA); aruba_adp_tree = proto_item_add_subtree(ti, ett_aruba_adp); proto_tree_add_item(aruba_adp_tree, hf_adp_version, tvb, 0, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index 5f3996d0f0..df8690074d 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -75,7 +75,7 @@ dissect_aruba_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, PROTO_SHORT_NAME ":"); if (tree) { - ti = proto_tree_add_item(tree, proto_aruba_erm, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_aruba_erm, tvb, 0, -1, ENC_NA); aruba_erm_tree = proto_item_add_subtree(ti, ett_aruba_erm); ts.secs = tvb_get_ntohl(tvb, 0); diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index fb3ec9c0c9..c56a74a4e4 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -156,7 +156,7 @@ dissect_papi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_papi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_papi, tvb, 0, -1, ENC_NA); papi_tree = proto_item_add_subtree(ti, ett_papi); diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index df9f0a9fcf..93a8421a15 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -167,7 +167,7 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(type, asf_type_vals, "Unknown (0x%02x)")); if (tree) { - ti = proto_tree_add_item(tree, proto_asf, tvb, 0, 8,ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_asf, tvb, 0, 8,ENC_NA); asf_tree = proto_item_add_subtree(ti, ett_asf); proto_tree_add_item(asf_tree, hf_asf_iana, tvb, 0, 4,ENC_BIG_ENDIAN); proto_tree_add_item(asf_tree, hf_asf_type, tvb, 4, 1,ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 17642864e7..54bf8522bc 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -5708,7 +5708,7 @@ static void dissect_r3_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *t if (tree) { - r3_item = proto_tree_add_item (tree, proto_r3, tvb, 0, -1, TRUE); + r3_item = proto_tree_add_item (tree, proto_r3, tvb, 0, -1, ENC_NA); r3_tree = proto_item_add_subtree (r3_item, ett_r3); } diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 0e94a25cc3..62aff6aa16 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -598,7 +598,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { val_to_str(function, rtmp_function_vals, "Unknown function (%02x)")); if (tree) { - ti = proto_tree_add_item(tree, proto_rtmp, tvb, 0, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rtmp, tvb, 0, 1, ENC_NA); rtmp_tree = proto_item_add_subtree(ti, ett_rtmp); proto_tree_add_uint(rtmp_tree, hf_rtmp_function, tvb, 0, 1, function); @@ -632,7 +632,7 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { net, nodelen_bits, node); if (tree) { - ti = proto_tree_add_item(tree, proto_rtmp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rtmp, tvb, offset, -1, ENC_NA); rtmp_tree = proto_item_add_subtree(ti, ett_rtmp); proto_tree_add_uint(rtmp_tree, hf_rtmp_net, tvb, offset, 2, net); @@ -710,7 +710,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { val_to_str(op, nbp_op_vals, "Unknown (0x%01x)"), count); if (tree) { - ti = proto_tree_add_item(tree, proto_nbp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_nbp, tvb, offset, -1, ENC_NA); nbp_tree = proto_item_add_subtree(ti, ett_nbp); info_item = proto_tree_add_uint_format(nbp_tree, hf_nbp_info, tvb, offset, 1, @@ -847,7 +847,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_append_str(pinfo->cinfo, COL_INFO, " [fragment]"); if (tree) { - ti = proto_tree_add_item(tree, proto_atp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_atp, tvb, offset, -1, ENC_NA); atp_tree = proto_item_add_subtree(ti, ett_atp); proto_item_set_len(atp_tree, aspinfo.release?8:ATP_HDRSIZE -1); @@ -1192,7 +1192,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_pap, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_pap, tvb, offset, -1, ENC_NA); pap_tree = proto_item_add_subtree(ti, ett_pap); } @@ -1335,7 +1335,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str_ext(fn, &asp_func_vals_ext, "Unknown (0x%01x)"), aspinfo->seq); if (tree) { - ti = proto_tree_add_item(tree, proto_asp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_asp, tvb, offset, -1, ENC_NA); asp_tree = proto_item_add_subtree(ti, ett_asp); } if (!aspinfo->reply) { @@ -1481,7 +1481,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!tree) return; - ti = proto_tree_add_item(tree, proto_zip, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_zip, tvb, offset, -1, ENC_NA); zip_tree = proto_item_add_subtree(ti, ett_zip); if (!aspinfo->reply) { @@ -1550,7 +1550,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!tree) return; - ti = proto_tree_add_item(tree, proto_zip, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_zip, tvb, 0, -1, ENC_NA); zip_tree = proto_item_add_subtree(ti, ett_zip); proto_tree_add_item(zip_tree, hf_zip_function, tvb, offset, 1,ENC_BIG_ENDIAN); @@ -1669,7 +1669,7 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode, if (tree) { ti = proto_tree_add_item(tree, proto_ddp, tvb, 0, DDP_SHORT_HEADER_SIZE, - ENC_BIG_ENDIAN); + ENC_NA); ddp_tree = proto_item_add_subtree(ti, ett_ddp); } len = tvb_get_ntohs(tvb, 0); @@ -1751,7 +1751,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ddp, tvb, 0, DDP_HEADER_SIZE, - ENC_BIG_ENDIAN); + ENC_NA); ddp_tree = proto_item_add_subtree(ti, ett_ddp); hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_src, tvb, @@ -1821,7 +1821,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_llap, tvb, 0, 3, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_llap, tvb, 0, 3, ENC_NA); llap_tree = proto_item_add_subtree(ti, ett_llap); } diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 8ef142beea..2cfe8727d0 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1688,7 +1688,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case AAL_1: col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, ENC_NA); aal_tree = proto_item_add_subtree(ti, ett_aal1); octet = tvb_get_guint8(tvb, offset); proto_tree_add_text(aal_tree, tvb, offset, 1, "CSI: %u", octet >> 7); @@ -1711,7 +1711,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, ENC_NA); aal_tree = proto_item_add_subtree(ti, ett_aal3_4); aal3_4_hdr = tvb_get_ntohs(tvb, offset); col_add_fstr(pinfo->cinfo, COL_INFO, "%s, sequence number = %u", @@ -1745,7 +1745,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL"); col_clear(pinfo->cinfo, COL_INFO); } - ti = proto_tree_add_item(tree, proto_oamaal, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_oamaal, tvb, offset, -1, ENC_NA); aal_tree = proto_item_add_subtree(ti, ett_oamaal); octet = tvb_get_guint8(tvb, offset); if (NULL == pwpd || pwpd->enable_fill_columns_by_atm_dissector) @@ -1842,7 +1842,7 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (tree) { - atm_ti = proto_tree_add_item(tree, proto_atm, tvb, 0, -1, ENC_BIG_ENDIAN); + atm_ti = proto_tree_add_item(tree, proto_atm, tvb, 0, -1, ENC_NA); atm_tree = proto_item_add_subtree(atm_ti, ett_atm); if (!pseudowire_mode) { diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 4ba1bb3dd1..1059660e6b 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -131,7 +131,7 @@ static void dissect_auto_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 holdtime; offset = 0; - ti = proto_tree_add_item(tree, proto_auto_rp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_auto_rp, tvb, offset, -1, ENC_NA); auto_rp_tree = proto_item_add_subtree(ti, ett_auto_rp); tv = proto_tree_add_text(auto_rp_tree, tvb, offset, 1, "Version: %s, Packet type: %s", diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c index 9a4fbf254f..549d13ff98 100644 --- a/epan/dissectors/packet-ax4000.c +++ b/epan/dissectors/packet-ax4000.c @@ -51,7 +51,7 @@ dissect_ax4000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; proto_tree *ax4000_tree; - + guint8 ax_port; guint8 ax_chassis; guint16 ax_index; @@ -67,14 +67,14 @@ dissect_ax4000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ax_index = tvb_get_ntohs(tvb, 2) & 0x0FFF; ax_timestamp = tvb_get_letohl(tvb, 6); ax_seq = tvb_get_letohl(tvb, 10); - + col_append_fstr(pinfo->cinfo, COL_INFO, "Chss:%u Prt:%u Idx:%u Seq:0x%08x TS:%.6f[msec]", ax_chassis, ax_port, ax_index, ax_seq, ax_timestamp*1e-5); - + if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_ax4000, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ax4000, tvb, 0, -1, ENC_NA); ax4000_tree = proto_item_add_subtree(ti, ett_ax4000); diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 6941e041de..857ce4e8ac 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -7304,7 +7304,7 @@ fEventParameter (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offs case 7: /* buffer-ready */ /* deprecated - while ((tvb_reported_length_remaining(tvb, offset) > 0)&&(offset>lastoffset)) { + while ((tvb_reported_length_remaining(tvb, offset) > 0)&&(offset>lastoffset)) { lastoffset = offset; switch (fTagNo(tvb, offset)) { case 0: @@ -7427,7 +7427,7 @@ fEventParameter (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offs default: break; } - + /* Closing tag for parameter choice */ offset += fTagHeaderTree(tvb, subtree, offset, &tag_no, &tag_info, &lvt); return offset; @@ -9777,7 +9777,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) save_fragmented = pinfo->fragmented; - ti = proto_tree_add_item(tree, proto_bacapp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bacapp, tvb, offset, -1, ENC_NA); bacapp_tree = proto_item_add_subtree(ti, ett_bacapp); if (!fragment) diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index 7186088dbf..3ca710f537 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -201,7 +201,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) i = 0; /* I don't know the length of the NPDU yet; Setting the length after dissection */ - ti = proto_tree_add_item(tree, proto_bacnet, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bacnet, tvb, 0, -1, ENC_NA); bacnet_tree = proto_item_add_subtree(ti, ett_bacnet); diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index cc17e03e51..d7232a5984 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -242,7 +242,7 @@ dissect_banana(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (tree) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_banana, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_banana, tvb, 0, -1, ENC_NA); banana_tree = proto_item_add_subtree(ti, ett_banana); offset = 0; diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 32647e963a..2a46690281 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -271,7 +271,7 @@ static int dissect_bat_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, "B.A.T.M.A.N., Orig: %s (%s)", get_hostname(orig), ip_to_str(batman_packeth->orig.data)); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, offset, BATMAN_PACKET_V5_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, offset, BATMAN_PACKET_V5_SIZE, ENC_NA); } bat_batman_tree = proto_item_add_subtree(ti, ett_bat_batman); } @@ -348,7 +348,7 @@ static void dissect_bat_hna(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t "B.A.T.M.A.N. HNA: %s/%d", tvb_ip_to_str(tvb, 0), hna_netmask); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 5, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 5, ENC_NA); } bat_batman_hna_tree = proto_item_add_subtree(ti, ett_bat_batman_hna); @@ -402,7 +402,7 @@ static void dissect_bat_gw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "B.A.T.M.A.N. GW [%s]", val_to_str(gw_packeth->type, gw_packettypenames, "Unknown (0x%02x)")); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 1, ENC_NA); } bat_gw_entry_tree = proto_item_add_subtree(ti, ett_bat_gw); @@ -494,7 +494,7 @@ static void dissect_bat_vis_v22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t "B.A.T.M.A.N. Vis, Src: %s (%s)", get_hostname(sender_ip), ip_to_str(vis_packeth->sender_ip.data)); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, VIS_PACKET_V22_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, VIS_PACKET_V22_SIZE, ENC_NA); } bat_vis_tree = proto_item_add_subtree(ti, ett_bat_vis); @@ -570,7 +570,7 @@ static void dissect_vis_entry_v22(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t val_to_str(vis_datah->type, vis_packettypenames, "Unknown (0x%02x)"), get_hostname(ip), ip_to_str(vis_datah->ip.data)); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 7, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 7, ENC_NA); } bat_vis_entry_tree = proto_item_add_subtree(ti, ett_bat_vis_entry); @@ -627,7 +627,7 @@ static void dissect_bat_vis_v23(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t "B.A.T.M.A.N. Vis, Src: %s (%s)", get_hostname(sender_ip), ip_to_str(vis_packeth->sender_ip.data)); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, VIS_PACKET_V23_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, VIS_PACKET_V23_SIZE, ENC_NA); } bat_vis_tree = proto_item_add_subtree(ti, ett_bat_vis); @@ -703,7 +703,7 @@ static void dissect_vis_entry_v23(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t val_to_str(vis_datah->type, vis_packettypenames, "Unknown (0x%02x)"), get_hostname(ip), ip_to_str(vis_datah->ip.data)); } else { - ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 7, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 7, ENC_NA); } bat_vis_entry_tree = proto_item_add_subtree(ti, ett_bat_vis_entry); diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index f6313537a4..c9a8e0bd8a 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -714,7 +714,7 @@ static int dissect_batadv_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinf "B.A.T.M.A.N., Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V5_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V5_SIZE, ENC_NA); } batadv_batman_tree = proto_item_add_subtree(ti, ett_batadv_batman); } @@ -822,7 +822,7 @@ static int dissect_batadv_batman_v7(tvbuff_t *tvb, int offset, packet_info *pinf "B.A.T.M.A.N., Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V7_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V7_SIZE, ENC_NA); } batadv_batman_tree = proto_item_add_subtree(ti, ett_batadv_batman); } @@ -924,7 +924,7 @@ static int dissect_batadv_batman_v9(tvbuff_t *tvb, int offset, packet_info *pinf "B.A.T.M.A.N., Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V9_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V9_SIZE, ENC_NA); } batadv_batman_tree = proto_item_add_subtree(ti, ett_batadv_batman); } @@ -1034,7 +1034,7 @@ static int dissect_batadv_batman_v10(tvbuff_t *tvb, int offset, packet_info *pin "B.A.T.M.A.N., Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V10_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V10_SIZE, ENC_NA); } batadv_batman_tree = proto_item_add_subtree(ti, ett_batadv_batman); } @@ -1143,7 +1143,7 @@ static int dissect_batadv_batman_v11(tvbuff_t *tvb, int offset, packet_info *pin "B.A.T.M.A.N., Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V11_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V11_SIZE, ENC_NA); } batadv_batman_tree = proto_item_add_subtree(ti, ett_batadv_batman); } @@ -1249,7 +1249,7 @@ static int dissect_batadv_batman_v14(tvbuff_t *tvb, int offset, packet_info *pin "B.A.T.M.A.N., Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, offset, BATMAN_PACKET_V14_SIZE, ENC_NA); } batadv_batman_tree = proto_item_add_subtree(ti, ett_batadv_batman); } @@ -1342,7 +1342,7 @@ static void dissect_batadv_tt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree "B.A.T.M.A.N. TT: %s (%s)", get_ether_name(tt), ether_to_str(tt)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, 6, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, 6, ENC_NA); } batadv_batman_tt_tree = proto_item_add_subtree(ti, ett_batadv_batman_tt); } @@ -1410,7 +1410,7 @@ static void dissect_batadv_bcast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tre "B.A.T.M.A.N. Bcast, Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, BCAST_PACKET_V6_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, BCAST_PACKET_V6_SIZE, ENC_NA); } batadv_bcast_tree = proto_item_add_subtree(ti, ett_batadv_bcast); } @@ -1477,7 +1477,7 @@ static void dissect_batadv_bcast_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tr "B.A.T.M.A.N. Bcast, Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, BCAST_PACKET_V10_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, BCAST_PACKET_V10_SIZE, ENC_NA); } batadv_bcast_tree = proto_item_add_subtree(ti, ett_batadv_bcast); } @@ -1548,7 +1548,7 @@ static void dissect_batadv_bcast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tr "B.A.T.M.A.N. Bcast, Orig: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, BCAST_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, BCAST_PACKET_V14_SIZE, ENC_NA); } batadv_bcast_tree = proto_item_add_subtree(ti, ett_batadv_bcast); } @@ -1657,7 +1657,7 @@ static void dissect_batadv_icmp_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree "B.A.T.M.A.N. ICMP, Orig: %s (%s), Dst: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr), get_ether_name(dst_addr), ether_to_str(dst_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ICMP_PACKET_V6_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ICMP_PACKET_V6_SIZE, ENC_NA); } batadv_icmp_tree = proto_item_add_subtree(ti, ett_batadv_icmp); } @@ -1766,7 +1766,7 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree "B.A.T.M.A.N. ICMP, Orig: %s (%s), Dst: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr), get_ether_name(dst_addr), ether_to_str(dst_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ICMP_PACKET_V7_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ICMP_PACKET_V7_SIZE, ENC_NA); } batadv_icmp_tree = proto_item_add_subtree(ti, ett_batadv_icmp); } @@ -1857,7 +1857,7 @@ static void dissect_batadv_icmp_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tre "B.A.T.M.A.N. ICMP, Orig: %s (%s), Dst: %s (%s)", get_ether_name(orig_addr), ether_to_str(orig_addr), get_ether_name(dst_addr), ether_to_str(dst_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ICMP_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ICMP_PACKET_V14_SIZE, ENC_NA); } batadv_icmp_tree = proto_item_add_subtree(ti, ett_batadv_icmp); } @@ -1973,7 +1973,7 @@ static void dissect_batadv_unicast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_t "B.A.T.M.A.N. Unicast, Dst: %s (%s)", get_ether_name(dest_addr), ether_to_str(dest_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_PACKET_V6_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_PACKET_V6_SIZE, ENC_NA); } batadv_unicast_tree = proto_item_add_subtree(ti, ett_batadv_unicast); } @@ -2040,7 +2040,7 @@ static void dissect_batadv_unicast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_ "B.A.T.M.A.N. Unicast, Dst: %s (%s)", get_ether_name(dest_addr), ether_to_str(dest_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_PACKET_V14_SIZE, ENC_NA); } batadv_unicast_tree = proto_item_add_subtree(ti, ett_batadv_unicast); } @@ -2142,7 +2142,7 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p "B.A.T.M.A.N. Unicast Fragment, Dst: %s (%s)", get_ether_name(dest_addr), ether_to_str(dest_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_FRAG_PACKET_V12_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_FRAG_PACKET_V12_SIZE, ENC_NA); } batadv_unicast_frag_tree = proto_item_add_subtree(ti, ett_batadv_unicast_frag); } @@ -2247,7 +2247,7 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p "B.A.T.M.A.N. Unicast Fragment, Dst: %s (%s)", get_ether_name(dest_addr), ether_to_str(dest_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_FRAG_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, UNICAST_FRAG_PACKET_V14_SIZE, ENC_NA); } batadv_unicast_frag_tree = proto_item_add_subtree(ti, ett_batadv_unicast_frag); } @@ -2386,7 +2386,7 @@ static void dissect_batadv_vis_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree "B.A.T.M.A.N. Vis, Orig: %s (%s)", get_ether_name(vis_orig_addr), ether_to_str(vis_orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_PACKET_V6_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_PACKET_V6_SIZE, ENC_NA); } batadv_vis_tree = proto_item_add_subtree(ti, ett_batadv_vis); } @@ -2515,7 +2515,7 @@ static void dissect_batadv_vis_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tree "B.A.T.M.A.N. Vis, Orig: %s (%s)", get_ether_name(vis_orig_addr), ether_to_str(vis_orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_PACKET_V10_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_PACKET_V10_SIZE, ENC_NA); } batadv_vis_tree = proto_item_add_subtree(ti, ett_batadv_vis); } @@ -2620,7 +2620,7 @@ static void dissect_batadv_vis_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tree "B.A.T.M.A.N. Vis, Orig: %s (%s)", get_ether_name(vis_orig_addr), ether_to_str(vis_orig_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_PACKET_V14_SIZE, ENC_NA); } batadv_vis_tree = proto_item_add_subtree(ti, ett_batadv_vis); } @@ -2703,7 +2703,7 @@ static void dissect_vis_entry_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr "VIS Entry: %s (%s)", get_ether_name(dst), ether_to_str(dst)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_ENTRY_V6_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_ENTRY_V6_SIZE, ENC_NA); } batadv_vis_entry_tree = proto_item_add_subtree(ti, ett_batadv_vis_entry); } @@ -2728,7 +2728,7 @@ static void dissect_vis_entry_v8(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr "VIS Entry: %s (%s)", get_ether_name(dst), ether_to_str(dst)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_ENTRY_V8_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, VIS_ENTRY_V8_SIZE, ENC_NA); } batadv_vis_entry_tree = proto_item_add_subtree(ti, ett_batadv_vis_entry); } @@ -2806,7 +2806,7 @@ static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo _U_, p "B.A.T.M.A.N. TT Query, Dst: %s (%s)", get_ether_name(dst_addr), ether_to_str(dst_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, TT_QUERY_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, TT_QUERY_PACKET_V14_SIZE, ENC_NA); } batadv_tt_query_tree = proto_item_add_subtree(ti, ett_batadv_tt_query); } @@ -2902,7 +2902,7 @@ static void dissect_tt_entry_v14(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr "TT Entry: %s (%s)", get_ether_name(entry), ether_to_str(entry)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, TT_ENTRY_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, TT_ENTRY_V14_SIZE, ENC_NA); } batadv_tt_entry_tree = proto_item_add_subtree(ti, ett_batadv_tt_entry); } @@ -2968,7 +2968,7 @@ static void dissect_batadv_roam_adv_v14(tvbuff_t *tvb, packet_info *pinfo, proto "B.A.T.M.A.N. Roam: %s (%s)", get_ether_name(client_addr), ether_to_str(client_addr)); } else { - ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ROAM_ADV_PACKET_V14_SIZE, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_batadv_plugin, tvb, 0, ROAM_ADV_PACKET_V14_SIZE, ENC_NA); } batadv_roam_adv_tree = proto_item_add_subtree(ti, ett_batadv_roam_adv); } diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 02575453f7..d0982b2bd0 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -26,7 +26,7 @@ * * Ref ITU-T Rec. Q.1990 (07/2001) */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -70,16 +70,16 @@ static const value_string bvei_vals[] = { static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) { - proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, FALSE); + proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, ENC_NA); proto_tree* pt = proto_item_add_subtree(pi,ett_bctp); tvbuff_t* sub_tvb = tvb_new_subset_remaining(tvb, 2); guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f; - + proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, ENC_BIG_ENDIAN); proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, ENC_BIG_ENDIAN); proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, ENC_BIG_ENDIAN); proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, ENC_BIG_ENDIAN); - + if ( dissector_try_uint(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) { return; } else if (tpi <= 0x22) { diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index f84ad04692..e91270c3c4 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -888,7 +888,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* "tvb_format_text()" is passed a value that won't go past the end - * of the packet, so it won't throw an exception. + * of the packet, so it won't throw an exception. */ col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset))); @@ -904,7 +904,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Build the tree info ... */ - ti = proto_tree_add_item(tree, proto_beep, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_beep, tvb, offset, -1, ENC_NA); beep_tree = proto_item_add_subtree(ti, ett_beep); diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 7b1a9db729..6429bf97c4 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -449,7 +449,7 @@ static gint bgp_asn_len = 0; * Detect IPv4 prefixes conform to BGP Additional Path but NOT conform to standard BGP * * A real BGP speaker would rely on the BGP Additional Path in the BGP Open messages. - * But it is not suitable for a packet analyse because the BGP sessions are not supposed to + * But it is not suitable for a packet analyse because the BGP sessions are not supposed to * restart very often, and Open messages from both sides of the session would be needed * to determine the result of the capability negociation. * Code inspired from the decode_prefix4 function @@ -1261,7 +1261,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, plen = tvb_get_ntohs(tvb,offset); rd_type=tvb_get_ntohs(tvb,offset+2); - /* RFC6074 Section 7 BGP-AD and VPLS-BGP Interoperability + /* RFC6074 Section 7 BGP-AD and VPLS-BGP Interoperability Both BGP-AD and VPLS-BGP [RFC4761] use the same AFI/SAFI. In order for both BGP-AD and VPLS-BGP to co-exist, the NLRI length must be used as a demultiplexer. @@ -1736,7 +1736,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) if( detect_add_path_prefix4(tvb, o, end) ) { /* IPv4 prefixes with Path Id */ while (o < end) { - i = decode_path_prefix4(subtree, hf_bgp_nlri_path_id, hf_bgp_withdrawn_prefix, tvb, o, + i = decode_path_prefix4(subtree, hf_bgp_nlri_path_id, hf_bgp_withdrawn_prefix, tvb, o, "Withdrawn route"); if (i < 0) return; @@ -1835,13 +1835,13 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) length = tvb_get_guint8(tvb, k++); /* Check for invalid ASN */ - for (d = 0; d < length; d++) + for (d = 0; d < length; d++) { if(tvb_get_ntohs(tvb, k) == 0) asn_is_null = 1; k += 2; } - } + } if(k != end || unknown_segment_type || asn_is_null) asn_len = 4; } @@ -2775,7 +2775,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) if( detect_add_path_prefix4(tvb, o, end) ) { /* IPv4 prefixes with Path Id */ while (o < end) { - i = decode_path_prefix4(subtree, hf_bgp_nlri_path_id, hf_bgp_nlri_prefix, tvb, o, + i = decode_path_prefix4(subtree, hf_bgp_nlri_path_id, hf_bgp_nlri_prefix, tvb, o, "NLRI"); if (i < 0) return; @@ -3001,7 +3001,7 @@ dissect_bgp_pdu(tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", typ); if (tree) { - ti = proto_tree_add_item(tree, proto_bgp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bgp, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, " - %s", typ); /* add a different tree for each message type */ @@ -3131,7 +3131,7 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * If we skipped any bytes, mark it as a BGP continuation. */ if (offset > 0) { - ti = proto_tree_add_item(tree, proto_bgp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bgp, tvb, 0, -1, ENC_NA); bgp_tree = proto_item_add_subtree(ti, ett_bgp); proto_tree_add_text(bgp_tree, tvb, 0, offset, "Continuation"); diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index 725bc8ff38..ee15317f50 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -797,7 +797,7 @@ static void dissect_bittorrent_tcp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto col_set_str(pinfo->cinfo, COL_INFO, "BitTorrent "); - ti = proto_tree_add_item (tree, proto_bittorrent, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_bittorrent, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(ti, ett_bittorrent); if (tvb_get_guint8(tvb, 0) == 19 && diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 0d872e620b..40c40c5056 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -73,7 +73,7 @@ dissect_bofl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_bofl, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bofl, tvb, 0, -1, ENC_NA); bofl_tree = proto_item_add_subtree(ti, ett_bofl); } diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 7c4cebbafc..4ca3d88853 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -4643,7 +4643,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * OK, now build the protocol tree. */ - ti = proto_tree_add_item(tree, proto_bootp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bootp, tvb, 0, -1, ENC_NA); bp_tree = proto_item_add_subtree(ti, ett_bootp); proto_tree_add_uint(bp_tree, hf_bootp_type, tvb, diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c index 0a33aa313f..bbbd6d6c2b 100644 --- a/epan/dissectors/packet-brp.c +++ b/epan/dissectors/packet-brp.c @@ -155,7 +155,7 @@ dissect_brp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* we are being asked for details */ /* Here we add our tree/subtree so we can have a collapsible branch. */ - brp_item = proto_tree_add_item( tree, proto_brp, tvb, 0, -1, ENC_BIG_ENDIAN ); + brp_item = proto_tree_add_item( tree, proto_brp, tvb, 0, -1, ENC_NA ); brp_tree = proto_item_add_subtree( brp_item, ett_brp); /* We use tvb_get_guint8 to get our type value out. */ @@ -394,7 +394,7 @@ void proto_register_brp (void) proto_brp = proto_register_protocol ("BRP Protocol", "BRP", "brp"); proto_register_field_array (proto_brp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + /* Register preferences module */ brp_module = prefs_register_protocol(proto_brp, proto_reg_handoff_brp); diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index ef6431158d..f071c3fa1c 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -605,7 +605,7 @@ dissect_bssap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * create the bssap protocol tree */ - hidden_item = proto_tree_add_item(tree, proto_bssap, tvb, 0, -1, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item(tree, proto_bssap, tvb, 0, -1, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); bssap_item = proto_tree_add_text(tree, tvb, 0, -1, (bssap_or_bsap_global == BSSAP) ? "BSSAP" : "BSAP"); bssap_tree = proto_item_add_subtree(bssap_item, ett_bssap); @@ -1647,7 +1647,7 @@ static void dissect_bssap_plus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr pinfo->sccp_info->data.co.assoc->payload = SCCP_PLOAD_BSSAP; /* create the BSSAP+ protocol tree */ - bssap_item = proto_tree_add_item(tree, proto_bssap, tvb, 0, -1, ENC_BIG_ENDIAN); + bssap_item = proto_tree_add_item(tree, proto_bssap, tvb, 0, -1, ENC_NA); bssap_tree = proto_item_add_subtree(bssap_item, ett_bssap); message_type = tvb_get_guint8(tvb,offset); diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index 51babb08ca..74679b70cc 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -348,7 +348,7 @@ dissect_bt_utp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) { proto_item *ti; - ti = proto_tree_add_item(tree, proto_bt_utp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bt_utp, tvb, 0, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_bt_utp); } diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 5a2b06ac0d..f651f1a25f 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -410,7 +410,7 @@ static int dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if(tree){ - ti=proto_tree_add_item(tree, proto_btamp, tvb, offset, -1, FALSE); + ti=proto_tree_add_item(tree, proto_btamp, tvb, offset, -1, ENC_NA); btamp_tree=proto_item_add_subtree(ti, ett_btamp); } diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 5ce2f452d3..0e03baa1c9 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -106,7 +106,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_ACL"); if(tree){ - ti=proto_tree_add_item(tree, proto_btacl, tvb, offset, -1, ENC_BIG_ENDIAN); + ti=proto_tree_add_item(tree, proto_btacl, tvb, offset, -1, ENC_NA); btacl_tree = proto_item_add_subtree(ti, ett_btacl); } diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 94d55ba7aa..769220dc4d 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -1896,7 +1896,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *opcode_tree; if(tree){ - ti_cmd = proto_tree_add_item(tree, proto_bthci_cmd, tvb, offset, -1, ENC_BIG_ENDIAN); + ti_cmd = proto_tree_add_item(tree, proto_bthci_cmd, tvb, offset, -1, ENC_NA); bthci_cmd_tree = proto_item_add_subtree(ti_cmd, ett_bthci_cmd); } diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 9dd780f02e..f3497d50b0 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -2311,7 +2311,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset=0; if(tree){ - ti=proto_tree_add_item(tree, proto_bthci_evt, tvb, offset, -1, ENC_BIG_ENDIAN); + ti=proto_tree_add_item(tree, proto_bthci_evt, tvb, offset, -1, ENC_NA); bthci_evt_tree=proto_item_add_subtree(ti, ett_bthci_evt); } diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 773cf1d208..9072ff88f7 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -15,12 +15,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -46,16 +46,16 @@ static gint ett_btsco = -1; /* Code to actually dissect the packets */ -static void +static void dissect_btsco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_item *ti; proto_tree *btsco_tree; int offset=0; - ti = proto_tree_add_item(tree, proto_btsco, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_btsco, tvb, offset, -1, ENC_NA); btsco_tree = proto_item_add_subtree(ti, ett_btsco); - + proto_tree_add_item(btsco_tree, hf_btsco_chandle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; @@ -69,21 +69,21 @@ dissect_btsco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) void proto_register_btsco(void) -{ +{ static hf_register_info hf[] = { { &hf_btsco_chandle, { "Connection Handle", "bthci_sco.chandle", - FT_UINT16, BASE_HEX, NULL, 0x0FFF, + FT_UINT16, BASE_HEX, NULL, 0x0FFF, NULL, HFILL } }, { &hf_btsco_length, { "Data Total Length", "bthci_sco.length", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_btsco_data, { "Data", "bthci_sco.data", - FT_NONE, BASE_NONE, NULL, 0x0, + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, }; @@ -103,7 +103,7 @@ proto_register_btsco(void) } -void +void proto_reg_handoff_btsco(void) { dissector_handle_t bthci_sco_handle; diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 0d27b260fc..4e565a4881 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1116,7 +1116,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if(tree){ - ti=proto_tree_add_item(tree, proto_btl2cap, tvb, offset, -1, FALSE); + ti=proto_tree_add_item(tree, proto_btl2cap, tvb, offset, -1, ENC_NA); btl2cap_tree=proto_item_add_subtree(ti, ett_btl2cap); } diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 60efbc56d5..22e9084bf1 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -481,7 +481,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* fully dissectable packet ready */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "OBEX"); - ti = proto_tree_add_item(tree, proto_btobex, next_tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_btobex, next_tvb, 0, -1, ENC_NA); st = proto_item_add_subtree(ti, ett_btobex); /* op/response code */ diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 6a7a20fd7e..3ad37dfbd6 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -505,7 +505,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 frame_len; dlci_state_t *dlci_state = NULL; - ti = proto_tree_add_item(tree, proto_btrfcomm, tvb, offset, -1, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(tree, proto_btrfcomm, tvb, offset, -1, ENC_NA); rfcomm_tree = proto_item_add_subtree(ti, ett_btrfcomm); col_set_str(pinfo->cinfo, COL_PROTOCOL, "RFCOMM"); @@ -840,7 +840,7 @@ dissect_bthf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HANDSFREE"); - ti = proto_tree_add_item(tree, proto_bthf, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_bthf, tvb, 0, -1, ENC_NA); st = proto_item_add_subtree(ti, ett_bthf); col_add_fstr(pinfo->cinfo, COL_INFO, "%s \"%s\"", @@ -896,7 +896,7 @@ dissect_btdun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DUN"); - ti = proto_tree_add_item(tree, proto_btdun, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_btdun, tvb, 0, -1, ENC_NA); st = proto_item_add_subtree(ti, ett_btdun); is_at_cmd = TRUE; @@ -972,7 +972,7 @@ dissect_btspp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPP"); - ti = proto_tree_add_item(tree, proto_btspp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_btspp, tvb, 0, -1, ENC_NA); st = proto_item_add_subtree(ti, ett_btspp); length = MIN(length,60); diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index c6f966e640..a0989811f1 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -865,7 +865,7 @@ dissect_btsdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDP"); - ti = proto_tree_add_item(tree, proto_btsdp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_btsdp, tvb, 0, -1, ENC_NA); st = proto_item_add_subtree(ti, ett_btsdp); /* pdu id */ diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index b04c5043e2..7fff6c5d0a 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -170,7 +170,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return tvb_reported_length(tvb); /* XXX - reject? */ } ti = proto_tree_add_item(tree, proto_bvlc, tvb, 0, - bvlc_length, FALSE); + bvlc_length, ENC_NA); bvlc_tree = proto_item_add_subtree(ti, ett_bvlc); proto_tree_add_uint(bvlc_tree, hf_bvlc_type, tvb, offset, 1, bvlc_type); @@ -180,10 +180,10 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset ++; if (length_remaining != packet_length) proto_tree_add_uint_format_value(bvlc_tree, hf_bvlc_length, tvb, offset, - 2, bvlc_length, + 2, bvlc_length, "%d of %d bytes (invalid length - expected %d bytes)", bvlc_length, packet_length, length_remaining); - else + else proto_tree_add_uint_format_value(bvlc_tree, hf_bvlc_length, tvb, offset, 2, bvlc_length, "%d of %d bytes BACnet packet length", bvlc_length, packet_length); @@ -206,7 +206,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x03: /* Read-Broadcast-Distribution-Table-Ack */ /* List of BDT Entries: N*10-octet */ ti_bdt = proto_tree_add_item(bvlc_tree, proto_bvlc, tvb, - offset, bvlc_length-4, FALSE); + offset, bvlc_length-4, ENC_NA); bdt_tree = proto_item_add_subtree(ti_bdt, ett_bdt); /* List of BDT Entries: N*10-octet */ while ((bvlc_length - offset) > 9) { @@ -246,7 +246,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * the registrant's FDT entry if no re-registration occurs. */ ti_fdt = proto_tree_add_item(bvlc_tree, proto_bvlc, tvb, - offset, bvlc_length -4, FALSE); + offset, bvlc_length -4, ENC_NA); fdt_tree = proto_item_add_subtree(ti_fdt, ett_fdt); /* List of FDT Entries: N*10-octet */ while ((bvlc_length - offset) > 9) { @@ -424,7 +424,7 @@ proto_reg_handoff_bvlc(void) static gboolean bvlc_initialized = FALSE; static dissector_handle_t bvlc_handle; static guint additional_bvlc_udp_port; - + if (!bvlc_initialized) { bvlc_handle = find_dissector("bvlc"); diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c index ad4ab68225..ab6a871831 100644 --- a/epan/dissectors/packet-calcappprotocol.c +++ b/epan/dissectors/packet-calcappprotocol.c @@ -124,7 +124,7 @@ dissect_calcappprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *t necessary to generate protocol tree items. */ if (tree) { /* create the calcappprotocol protocol tree */ - calcappprotocol_item = proto_tree_add_item(tree, proto_calcappprotocol, message_tvb, 0, -1, ENC_BIG_ENDIAN); + calcappprotocol_item = proto_tree_add_item(tree, proto_calcappprotocol, message_tvb, 0, -1, ENC_NA); calcappprotocol_tree = proto_item_add_subtree(calcappprotocol_item, ett_calcappprotocol); } else { calcappprotocol_tree = NULL; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index fc84d27cd6..cf9a0ef7ec 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -37,8 +37,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * References: ETSI 300 374 */ -/* - * Indentation logic: this file is indented with 2 spaces indentation. +/* + * Indentation logic: this file is indented with 2 spaces indentation. * there are no tabs. */ #ifdef HAVE_CONFIG_H @@ -82,7 +82,7 @@ static guint32 errorCode=0; /* ROSE context */ static rose_ctx_t camel_rose_ctx; -static int hf_digit = -1; +static int hf_digit = -1; static int hf_camel_extension_code_local = -1; static int hf_camel_error_code_local = -1; static int hf_camel_cause_indicator = -1; @@ -872,8 +872,8 @@ static const value_string digit_value[] = { { 12, "spare"}, { 13, "spare"}, { 0, NULL}}; - - + + static const value_string camel_nature_of_addr_indicator_values[] = { { 0x00, "unknown" }, { 0x01, "International Number" }, @@ -1233,7 +1233,7 @@ static char camel_number_to_char(int number) /* * 24.011 8.2.5.4 - */ + */ static guint8 dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len, proto_tree *tree, int hf_cause_value, guint8 *cause_value) @@ -1241,21 +1241,21 @@ dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len, guint8 oct; guint32 curr_offset; static char a_bigbuf[1024]; - + curr_offset = offset; oct = tvb_get_guint8(tvb, curr_offset); - *cause_value = oct & 0x7f; - + *cause_value = oct & 0x7f; + other_decode_bitfield_value(a_bigbuf, oct, 0x7f, 8); proto_tree_add_uint_format(tree, hf_cause_value, tvb, curr_offset, 1, *cause_value, "%s : %s", a_bigbuf, - val_to_str(*cause_value, camel_RP_Cause_values, + val_to_str(*cause_value, camel_RP_Cause_values, "Unknown Cause (%u), treated as (41) \"Temporary failure\" for MO-SMS or (111) \"Protocol error,unspecified\" for MT-SMS")); curr_offset++; - + if ((oct & 0x80)) { oct = tvb_get_guint8(tvb, curr_offset); proto_tree_add_uint_format(tree, hf_cause_value, @@ -7078,14 +7078,14 @@ dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn opcode = 0; application_context_version = 0; if (actx->pinfo->private_data != NULL){ - p_private_tcap=actx->pinfo->private_data; - + p_private_tcap=actx->pinfo->private_data; + if (p_private_tcap->acv==TRUE ){ version_ptr = strrchr(p_private_tcap->oid,'.'); if (version_ptr) application_context_version = atoi(version_ptr+1); } - gp_camelsrt_info->tcap_context=p_private_tcap->context; + gp_camelsrt_info->tcap_context=p_private_tcap->context; if (p_private_tcap->context) gp_camelsrt_info->tcap_session_id @@ -7121,14 +7121,14 @@ dissect_camel(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_camel, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_camel, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_camel); } /* camelsrt reset counter, and initialise global pointer to store service response time related data */ gp_camelsrt_info=camelsrt_razinfo(); dissect_camel_camelPDU(FALSE, tvb, 0, &asn1_ctx , tree, -1); - + /* If a Tcap context is associated to this transaction */ if (gcamel_HandleSRT && gp_camelsrt_info->tcap_context ) { @@ -7175,7 +7175,7 @@ void proto_reg_handoff_camel(void) { register_ber_oid_dissector_handle("0.4.0.0.1.21.3.61",camel_handle, proto_camel, "cap3-sms-AC" ); register_ber_oid_dissector_handle("0.4.0.0.1.23.3.4",camel_handle, proto_camel, "capssf-scfGenericAC" ); register_ber_oid_dissector_handle("0.4.0.0.1.23.3.61",camel_handle, proto_camel, "cap4-sms-AC" ); - + /*--- Included file: packet-camel-dis-tab.c ---*/ @@ -7194,7 +7194,7 @@ void proto_reg_handoff_camel(void) { ssn_range = range_copy(global_ssn_range); range_foreach(ssn_range, range_add_callback); - + } void proto_register_camel(void) { @@ -7240,12 +7240,12 @@ void proto_register_camel(void) { { "RP Cause", "camel.RP_Cause", FT_UINT8, BASE_DEC, NULL, 0, "RP Cause Value", HFILL }}, - + { &hf_camel_CAMEL_AChBillingChargingCharacteristics, { "CAMEL-AChBillingChargingCharacteristics", "camel.CAMEL_AChBillingChargingCharacteristics", FT_UINT32, BASE_DEC, VALS(camel_CAMEL_AChBillingChargingCharacteristics_vals), 0, - NULL, HFILL }}, - + NULL, HFILL }}, + { &hf_camel_CAMEL_FCIBillingChargingCharacteristics, { "CAMEL-FCIBillingChargingCharacteristics", "camel.CAMEL_FCIBillingChargingCharacteristics", FT_UINT32, BASE_DEC, VALS(camel_CAMEL_FCIBillingChargingCharacteristics_vals), 0, @@ -9479,15 +9479,15 @@ void proto_register_camel(void) { rose_ctx_init(&camel_rose_ctx); /* Register dissector tables */ - camel_rose_ctx.arg_local_dissector_table = register_dissector_table("camel.ros.local.arg", - "CAMEL Operation Argument (local opcode)", - FT_UINT32, BASE_HEX); - camel_rose_ctx.res_local_dissector_table = register_dissector_table("camel.ros.local.res", - "CAMEL Operation Result (local opcode)", - FT_UINT32, BASE_HEX); - camel_rose_ctx.err_local_dissector_table = register_dissector_table("camel.ros.local.err", - "CAMEL Error (local opcode)", - FT_UINT32, BASE_HEX); + camel_rose_ctx.arg_local_dissector_table = register_dissector_table("camel.ros.local.arg", + "CAMEL Operation Argument (local opcode)", + FT_UINT32, BASE_HEX); + camel_rose_ctx.res_local_dissector_table = register_dissector_table("camel.ros.local.res", + "CAMEL Operation Result (local opcode)", + FT_UINT32, BASE_HEX); + camel_rose_ctx.err_local_dissector_table = register_dissector_table("camel.ros.local.err", + "CAMEL Error (local opcode)", + FT_UINT32, BASE_HEX); /* Register our configuration options, particularly our ssn:s */ /* Set default SSNs */ @@ -9498,8 +9498,8 @@ void proto_register_camel(void) { prefs_register_enum_preference(camel_module, "date.format", "Date Format", "The date format: (DD/MM) or (MM/DD)", &date_format, date_options, FALSE); - - + + prefs_register_range_preference(camel_module, "tcap.ssn", "TCAP SSNs", "TCAP Subsystem numbers used for Camel", @@ -9514,8 +9514,8 @@ void proto_register_camel(void) { "Persistent stats for SRT", "Statistics for Response Time", &gcamel_PersistentSRT); - - /* Routine for statistic */ + + /* Routine for statistic */ register_init_routine(&camelsrt_init_routine); camel_tap=register_tap(PSNAME); } diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 0e59142e7b..0796b93fa4 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1354,7 +1354,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CAPWAP"); col_set_str(pinfo->cinfo, COL_INFO, "CAPWAP-Control"); - ti = proto_tree_add_item(tree, proto_capwap, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_capwap, tvb, 0, -1, ENC_NA); capwap_control_tree = proto_item_add_subtree(ti, ett_capwap); /* CAPWAP Preamble */ @@ -1437,7 +1437,7 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CAPWAP"); col_set_str(pinfo->cinfo, COL_INFO, "CAPWAP-Data"); - ti = proto_tree_add_item(tree, proto_capwap, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_capwap, tvb, 0, -1, ENC_NA); capwap_data_tree = proto_item_add_subtree(ti, ett_capwap); /* CAPWAP Preamble */ diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index 3e1484092a..8ac856c62c 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -423,7 +423,7 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* In the interest of speed, if "tree" is NULL, don't do any work not * necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_cast, tvb, offset, hdr_data_length+8, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cast, tvb, offset, hdr_data_length+8, ENC_NA); cast_tree = proto_item_add_subtree(ti, ett_cast); proto_tree_add_uint(cast_tree, hf_cast_data_length, tvb, offset, 4, hdr_data_length); proto_tree_add_uint(cast_tree, hf_cast_reserved, tvb, offset+4, 4, hdr_marker); diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 113af9d5d6..33907697e0 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1769,7 +1769,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create root (protocol) tree. */ if (tree) { - ti = proto_tree_add_item(tree, proto_catapult_dct2000, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_catapult_dct2000, tvb, offset, -1, ENC_NA); dct2000_tree = proto_item_add_subtree(ti, ett_catapult_dct2000); } diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index ebc3da8e87..c7f64a7e3d 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -339,7 +339,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else length = ccsds_length; - ccsds_packet = proto_tree_add_item(tree, proto_ccsds, tvb, 0, length, FALSE); + ccsds_packet = proto_tree_add_item(tree, proto_ccsds, tvb, 0, length, ENC_NA); ccsds_tree = proto_item_add_subtree(ccsds_packet, ett_ccsds); /* build the ccsds primary header tree */ diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 053b68ded0..18331cbc25 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -196,7 +196,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_cdp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_cdp, tvb, offset, -1, ENC_NA); cdp_tree = proto_item_add_subtree(ti, ett_cdp); /* CDP header */ diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index d6b316cf83..3511db7eef 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -1127,7 +1127,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *cfm_tree; /* isolate the payload of the packet */ - ti = proto_tree_add_item(tree, proto_cfm, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cfm, tvb, 0, -1, ENC_NA); /* report type of CFM packet to base of dissection tree */ diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index 25950d449d..d122613560 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -65,7 +65,7 @@ dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_cgmp, tvb, offset, -1, - FALSE); + ENC_NA); cgmp_tree = proto_item_add_subtree(ti, ett_cgmp); proto_tree_add_item(cgmp_tree, hf_cgmp_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 35c7d08fc0..a26b60f37d 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -187,7 +187,7 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto = tvb_get_ntohs(tvb, 2); if (tree) { - ti = proto_tree_add_item(tree, proto_chdlc, tvb, 0, 4, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_chdlc, tvb, 0, 4, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_chdlc); proto_tree_add_uint(fh_tree, hf_chdlc_addr, tvb, 0, 1, addr); @@ -275,7 +275,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) code = tvb_get_ntohl(tvb, 0); if (tree) { - ti = proto_tree_add_item(tree, proto_slarp, tvb, 0, 14, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_slarp, tvb, 0, 14, ENC_NA); slarp_tree = proto_item_add_subtree(ti, ett_slarp); } diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 59c33c82fe..155ffa8cda 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -612,7 +612,7 @@ dissect_cimd_operation(tvbuff_t *tvb, proto_tree *tree, gint etxp, guint16 check if (tree) { /* create display subtree for the protocol */ - cimd_item = proto_tree_add_item(tree, proto_cimd, tvb, 0, etxp + 1, ENC_LITTLE_ENDIAN); + cimd_item = proto_tree_add_item(tree, proto_cimd, tvb, 0, etxp + 1, ENC_NA); cimd_tree = proto_item_add_subtree(cimd_item, ett_cimd); proto_tree_add_uint(cimd_tree, hf_cimd_opcode_indicator, tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH, OC); proto_tree_add_uint(cimd_tree, hf_cimd_packet_number_indicator, tvb, CIMD_PN_OFFSET, CIMD_PN_LENGTH, PN); diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 1dcefca829..107fec2ba5 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -74,7 +74,7 @@ dissect_cimetrics_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mstp_frame_source, mstp_frame_destination, mstp_frame_type_text(mstp_frame_type)); #else - ti = proto_tree_add_item(tree, proto_cimetrics_mstp, tvb, offset, 9, FALSE); + ti = proto_tree_add_item(tree, proto_cimetrics_mstp, tvb, offset, 9, ENC_NA); #endif subtree = proto_item_add_subtree(ti, ett_cimetrics_mstp); proto_tree_add_item(subtree, hf_cimetrics_mstp_timer, tvb, @@ -119,7 +119,7 @@ proto_register_cimetrics(void) register_dissector("cimetrics", dissect_cimetrics_mstp, proto_cimetrics_mstp); - + llc_add_oui(OUI_CIMETRICS, "llc.cimetrics_pid", "Cimetrics OUI PID", hf2); } diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index b4355bd2fe..e3edb9777f 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -1829,7 +1829,7 @@ dissect_cip_class_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( tree ) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_cip_class_generic, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cip_class_generic, tvb, 0, -1, ENC_NA); class_tree = proto_item_add_subtree( ti, ett_cip_class_generic ); dissect_cip_generic_data( class_tree, tvb, 0, tvb_length(tvb), pinfo, ti ); @@ -2142,7 +2142,7 @@ dissect_cip_class_mr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( tree ) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_cip_class_mr, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cip_class_mr, tvb, 0, -1, ENC_NA); class_tree = proto_item_add_subtree( ti, ett_cip_class_mr ); dissect_cip_mr_data( class_tree, tvb, 0, tvb_length(tvb), pinfo ); @@ -2774,7 +2774,7 @@ dissect_cip_class_cm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( tree ) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_cip_class_cm, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cip_class_cm, tvb, 0, -1, ENC_NA); class_tree = proto_item_add_subtree( ti, ett_cip_class_cm ); dissect_cip_cm_data( class_tree, tvb, 0, tvb_length(tvb), pinfo ); @@ -3268,7 +3268,7 @@ dissect_cip_class_cco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( tree ) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_cip_class_cco, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cip_class_cco, tvb, 0, -1, ENC_NA); class_tree = proto_item_add_subtree( ti, ett_cip_class_cco ); dissect_cip_cco_data( class_tree, tvb, 0, tvb_length(tvb), pinfo ); @@ -3306,7 +3306,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info p_add_proto_data(pinfo->fd, proto_cip, preq_info); /* Create display subtree for the protocol */ - ti = proto_tree_add_item(item_tree, proto_cip, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(item_tree, proto_cip, tvb, 0, -1, ENC_NA); cip_tree = proto_item_add_subtree( ti, ett_cip ); /* Add Service code & Request/Response tree */ diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index f28931d055..b20eb0c413 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -1821,7 +1821,7 @@ dissect_cipmotion(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) /* Create display subtree for the protocol by creating an item and then * creating a subtree from the item, the subtree must have been registered * in proto_register_cipmotion already */ - proto_item_top = proto_tree_add_item( tree, proto_cipmotion, tvb, 0, -1, ENC_LITTLE_ENDIAN ); + proto_item_top = proto_tree_add_item( tree, proto_cipmotion, tvb, 0, -1, ENC_NA ); proto_tree_top = proto_item_add_subtree( proto_item_top, ett_cipmotion ); /* Add the CIP class 1 sequence number to the tree */ diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index fcc23c272b..0f715c331a 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -53,7 +53,7 @@ * 0000030: 1002 0001 0000 0380 <-- ERSPAN header (01: erspan-id) * 0000040: 00d0 b7a7 7480 0015 c721 75c0 0800 4500 <-- Ethernet packet * ... - * + * * */ @@ -130,7 +130,7 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_erspan, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); erspan_tree = proto_item_add_subtree(ti, ett_erspan); version = tvb_get_ntohs(tvb, offset) >> 12; diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c index ff759108a2..d30123b6be 100644 --- a/epan/dissectors/packet-cisco-sm.c +++ b/epan/dissectors/packet-cisco-sm.c @@ -154,7 +154,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)", val_to_str(sm_message_type, sm_message_type_value_info,"reserved")); - ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, ENC_NA); sm_tree = proto_item_add_subtree(ti, ett_sm); proto_tree_add_uint_format(sm_tree, hf_sm_sm_msg_type, tvb, offset, 4, sm_message_type, diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 2484ed58db..b8267604ca 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -86,7 +86,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cwids_tree = NULL; while(tvb_length_remaining(tvb, offset) > 0) { - ti = proto_tree_add_item(tree, proto_cwids, tvb, offset, 28, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cwids, tvb, offset, 28, ENC_NA); cwids_tree = proto_item_add_subtree(ti, ett_cwids); proto_tree_add_item(cwids_tree, hf_cwids_version, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 712c8fa8a6..1fa9dab982 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -326,7 +326,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { guint transaction_id_first_word; - ti = proto_tree_add_item(tree, proto_classicstun, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_classicstun, tvb, 0, -1, ENC_NA); classicstun_tree = proto_item_add_subtree(ti, ett_classicstun); diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index fbe6147e82..0ec999eddf 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -223,7 +223,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cnf_proto_id == NLPID_NULL) { col_set_str(pinfo->cinfo, COL_INFO, "Inactive subset"); if (tree) { - ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, ENC_NA); clnp_tree = proto_item_add_subtree(ti, ett_clnp); proto_tree_add_uint_format(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1, cnf_proto_id, @@ -247,7 +247,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) opt_len = cnf_hdr_len; if (tree) { - ti = proto_tree_add_item(tree, proto_clnp, tvb, 0, cnf_hdr_len, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_clnp, tvb, 0, cnf_hdr_len, ENC_NA); clnp_tree = proto_item_add_subtree(ti, ett_clnp); proto_tree_add_uint(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1, cnf_proto_id); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index fb04ea3af6..31cefc9ec4 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -4411,7 +4411,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_cmip); } @@ -5809,7 +5809,7 @@ void proto_reg_handoff_cmip(void) { register_ber_oid_dissector("2.9.0.0.2", dissect_cmip, proto_cmip, "cmip"); register_ber_oid_dissector("2.9.1.1.4", dissect_cmip, proto_cmip, "joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); - oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)"); + oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)"); oid_add_from_string("2.9.3.2.3.2","managedObjectClass(3) attributeValueChangeRecord(2)"); oid_add_from_string("2.9.3.2.3.3","managedObjectClass(3) discriminator(3)"); oid_add_from_string("2.9.3.2.3.4","managedObjectClass(3) eventForwardingDiscriminator(4)"); diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 8705acbdf8..75ae3d3eca 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1506,7 +1506,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP"); if(parent_tree){ - item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE); + item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_cmp); } @@ -1515,7 +1515,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa if (pdu_type < 10) { /* RFC2510 TCP transport */ - ti = proto_tree_add_item(tree, proto_cmp, tvb, offset, 5, FALSE); + ti = proto_tree_add_item(tree, proto_cmp, tvb, offset, 5, ENC_NA); tcptrans_tree = proto_item_add_subtree(ti, ett_cmp); proto_tree_add_item(tree, hf_cmp_tcptrans_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1671,7 +1671,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP"); if(parent_tree){ - item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE); + item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_cmp); } diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index 85048bcdeb..f6bdf478ab 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.c @@ -580,7 +580,7 @@ dissect_cmpp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_cmpp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cmpp, tvb, 0, -1, ENC_NA); cmpp_tree = proto_item_add_subtree(ti, ett_cmpp); diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c index 8b7729decc..5c702599d8 100644 --- a/epan/dissectors/packet-cnip.c +++ b/epan/dissectors/packet-cnip.c @@ -100,7 +100,7 @@ static void dissect_cnip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; /* Take whole packet for now, we'll adjust it later */ - ti = proto_tree_add_item(tree, proto_cnip, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cnip, tvb, offset, -1, ENC_NA); cnip_tree = proto_item_add_subtree(ti, ett_cnip); proto_tree_add_item(cnip_tree, hf_cnip_len, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 191f81d681..31c3306f82 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -468,7 +468,7 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) coap_content_type = NULL; coap_content_type_value = ~0; - coap_root = proto_tree_add_item(parent_tree, proto_coap, tvb, offset, -1, FALSE); + coap_root = proto_tree_add_item(parent_tree, proto_coap, tvb, offset, -1, ENC_NA); coap_tree = proto_item_add_subtree(coap_root, ett_coap); proto_tree_add_item(coap_tree, hf_coap_version, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 02514c2149..741e79d49a 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -857,7 +857,7 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) size = tvb_reported_length(tvb); /* create the collectd protocol tree */ - pi = proto_tree_add_item(tree, proto_collectd, tvb, 0, -1, FALSE); + pi = proto_tree_add_item(tree, proto_collectd, tvb, 0, -1, ENC_NA); collectd_tree = proto_item_add_subtree(pi, ett_collectd); memset (&tap_data, 0, sizeof (tap_data)); diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index 0fa20d4f1f..3bc5fc4bf7 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.c @@ -170,7 +170,7 @@ dissect_componentstatusprotocol_componentstatusreport_message(tvbuff_t *message_ association_item = proto_tree_add_text(message_tree, message_tvb, offset, COMPONENTASSOCIATION_LENGTH, "Association #%d", i++); association_tree = proto_item_add_subtree(association_item, ett_association); - association_tvb = tvb_new_subset(message_tvb, offset, + association_tvb = tvb_new_subset(message_tvb, offset, MIN(COMPONENTASSOCIATION_LENGTH, tvb_length_remaining(message_tvb, offset)), COMPONENTASSOCIATION_LENGTH); @@ -230,7 +230,7 @@ dissect_componentstatusprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto necessary to generate protocol tree items. */ if (tree) { /* create the componentstatusprotocol protocol tree */ - componentstatusprotocol_item = proto_tree_add_item(tree, proto_componentstatusprotocol, message_tvb, 0, -1, ENC_BIG_ENDIAN); + componentstatusprotocol_item = proto_tree_add_item(tree, proto_componentstatusprotocol, message_tvb, 0, -1, ENC_NA); componentstatusprotocol_tree = proto_item_add_subtree(componentstatusprotocol_item, ett_componentstatusprotocol); } else { componentstatusprotocol_tree = NULL; diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 7ff0366436..74600d8c97 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -920,7 +920,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 ver_flags; gint garbage; - ti = proto_tree_add_item(tree, proto_cops, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_cops, tvb, offset, -1, ENC_NA); cops_tree = proto_item_add_subtree(ti, ett_cops); /* Version and flags share the same byte, put them in a subtree */ diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 5ddd415449..ca3b5224eb 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -354,7 +354,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the protocol tree */ - cpfi_item = proto_tree_add_item(tree, proto_cpfi, message_tvb, 0, -1, ENC_BIG_ENDIAN); + cpfi_item = proto_tree_add_item(tree, proto_cpfi, message_tvb, 0, -1, ENC_NA); cpfi_tree = proto_item_add_subtree(cpfi_item, ett_cpfi); } diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index 8dc2f22db6..fe1f0f4eae 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -229,7 +229,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr.ha_protocol_ver, opcode2str_short(opcode)); if (tree) { - ti = proto_tree_add_item(tree, proto_cphap, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cphap, tvb, offset, -1, ENC_NA); cpha_tree = proto_item_add_subtree(ti, ett_cphap); } if (tree) { diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index f0b11787f1..657a60eff6 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -262,7 +262,7 @@ dissect_csm_encaps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_csm_encaps, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_csm_encaps, tvb, 0, -1, ENC_NA); csm_encaps_tree = proto_item_add_subtree(ti, ett_csm_encaps); diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c index fa67a28c65..1a1d2ceb1d 100644 --- a/epan/dissectors/packet-cups.c +++ b/epan/dissectors/packet-cups.c @@ -164,7 +164,7 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_cups, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); cups_tree = proto_item_add_subtree(ti, ett_cups); } diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 63b0e3b387..3b68d3f4db 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -421,7 +421,7 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_daap, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_daap, tvb, 0, -1, ENC_NA); daap_tree = proto_item_add_subtree(ti, ett_daap); dissect_daap_one_tag(daap_tree, tvb); } @@ -458,7 +458,7 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb) offset += 8; - len = reported_length - offset; /* should be >= 0 since no exception above */ + len = reported_length - offset; /* should be >= 0 since no exception above */ DISSECTOR_ASSERT(len >= 0); if (tagsize <= (unsigned)len) { len = tagsize; @@ -685,7 +685,7 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb) /* now playing */ /* bytes 4-7 contain uint32 playlist id */ /* bytes 12-15 contain uint32 track id */ - proto_item_append_text(ti, + proto_item_append_text(ti, "; unknown: %d, playlist id: %d, unknown: %d, track id: %d", tvb_get_ntohl(tvb, offset), tvb_get_ntohl(tvb, offset+4), @@ -741,6 +741,6 @@ proto_reg_handoff_daap(void) daap_handle = create_dissector_handle(dissect_daap, proto_daap); http_dissector_add(TCP_PORT_DAAP, daap_handle); - + png_handle = find_dissector("png"); } diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c index 4522b2f6d0..3fc244a50c 100644 --- a/epan/dissectors/packet-daytime.c +++ b/epan/dissectors/packet-daytime.c @@ -52,7 +52,7 @@ dissect_daytime(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_daytime, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_daytime, tvb, 0, -1, ENC_NA); daytime_tree = proto_item_add_subtree(ti, ett_daytime); proto_tree_add_text(daytime_tree, tvb, 0, 0, diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index 3319ca55af..6ce601802c 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -168,7 +168,7 @@ 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, ENC_BIG_ENDIAN); + db_lsp_item = proto_tree_add_item (tree, proto_db_lsp_disc, tvb, offset, -1, ENC_NA); 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, ENC_ASCII|ENC_NA); diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 992274029f..e2542c7d07 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -239,7 +239,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_dcc, tvb, offset, -1, - FALSE); + ENC_NA); dcc_tree = proto_item_add_subtree(ti, ett_dcc); proto_tree_add_item(dcc_tree, hf_dcc_len, tvb, diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 791283c519..791c1bbb52 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -662,7 +662,7 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(dccph->type, dccp_packet_type_vals, "Unknown Type"), dccph->seq); } else { - dccp_item = proto_tree_add_item(tree, proto_dccp, tvb, offset, 8, ENC_BIG_ENDIAN); + dccp_item = proto_tree_add_item(tree, proto_dccp, tvb, offset, 8, ENC_NA); } dccp_tree = proto_item_add_subtree(dccp_item, ett_dccp); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index d656333244..17445a3b24 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -4377,7 +4377,7 @@ dissect_dcerpc_cn (tvbuff_t *tvb, int offset, packet_info *pinfo, offset = start_offset; tvb_ensure_bytes_exist(tvb, offset, 16); if (tree) { - ti = proto_tree_add_item (tree, proto_dcerpc, tvb, offset, hdr.frag_len, FALSE); + ti = proto_tree_add_item (tree, proto_dcerpc, tvb, offset, hdr.frag_len, ENC_NA); dcerpc_tree = proto_item_add_subtree (ti, ett_dcerpc); } @@ -5213,7 +5213,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr.serial_lo = tvb_get_guint8 (tvb, offset++); if (tree) { - ti = proto_tree_add_item (tree, proto_dcerpc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_dcerpc, tvb, 0, -1, ENC_NA); if (ti) { dcerpc_tree = proto_item_add_subtree(ti, ett_dcerpc); proto_item_append_text(ti, " %s, Seq: %u, Serial: %u, Frag: %u, FragLen: %u", diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index f2f1a4d5d3..f2b1268a73 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6595,7 +6595,7 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 off return offset; } - dcm_pitem = proto_tree_add_item(tree, proto_dcm, tvb, offset, -1, FALSE); + dcm_pitem = proto_tree_add_item(tree, proto_dcm, tvb, offset, -1, ENC_NA); dcm_ptree = proto_item_add_subtree(dcm_pitem, ett_dcm); pdu_type = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index e4285683a8..1e36601a5d 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -193,7 +193,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if(tree) { proto_item *ti = NULL; - ti = proto_tree_add_item (tree, proto_dcp_etsi, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_dcp_etsi, tvb, 0, -1, ENC_NA); dcp_tree = proto_item_add_subtree (ti, ett_edcp); } @@ -448,7 +448,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-PFT"); if (tree) { /* we are being asked for details */ - ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, ENC_NA); pft_tree = proto_item_add_subtree (ti, ett_pft); proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA); } @@ -550,7 +550,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-AF"); if (tree) { /* we are being asked for details */ - ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, ENC_NA); af_tree = proto_item_add_subtree (ti, ett_af); proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA); } @@ -624,7 +624,7 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if(tree) { proto_item *ti = NULL; - ti = proto_tree_add_item (tree, proto_tpl, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_tpl, tvb, 0, -1, ENC_NA); tpl_tree = proto_item_add_subtree (ti, ett_tpl); } while(offset<tvb_length(tvb)) { diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index e3ddc51bfa..a211e8e417 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -108,7 +108,7 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear (pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, -1, ENC_NA); ddtp_tree = proto_item_add_subtree(ti, ett_ddtp); proto_tree_add_item(ddtp_tree, hf_ddtp_version, tvb, 0, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index b897facf76..1581b8c753 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -128,7 +128,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_dec_bpdu, tvb, 0, DEC_BPDU_SIZE, - ENC_BIG_ENDIAN); + ENC_NA); bpdu_tree = proto_item_add_subtree(ti, ett_dec_bpdu); proto_tree_add_item(bpdu_tree, hf_dec_bpdu_proto_id, tvb, diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 83de7fd631..41e031b0c9 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -389,7 +389,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; msg_flags = tvb_get_guint8(tvb, offset); ti = proto_tree_add_item(tree, proto_dec_rt, tvb, 0, -1, - TRUE); + ENC_NA); rt_tree = proto_item_add_subtree(ti, ett_dec_rt); /* When padding, the first byte after the padding has the real routing flags */ diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 39efe29950..cf85f53d64 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1959,7 +1959,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - ti=proto_tree_add_item(tree, proto_dect, tvb, 0, -1, FALSE); + ti=proto_tree_add_item(tree, proto_dect, tvb, 0, -1, ENC_NA); DectTree=proto_item_add_subtree(ti, ett_dect); proto_tree_add_item(DectTree, hf_dect_transceivermode, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 6968253011..41ad1b1f6b 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -380,7 +380,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_ntohs(tvb, offset); if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_dhcpfo, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_dhcpfo, tvb, 0, -1, ENC_NA); dhcpfo_tree = proto_item_add_subtree(ti, ett_dhcpfo); diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index e86fd10874..8bebe7d1ce 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1871,7 +1871,7 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(msgtype, msgtype_vals, "Message Type %u")); if (tree) { - ti = proto_tree_add_item(tree, proto_dhcpv6, tvb, off, eoff - off, FALSE); + ti = proto_tree_add_item(tree, proto_dhcpv6, tvb, off, eoff - off, ENC_NA); bp_tree = proto_item_add_subtree(ti, ett_dhcpv6); } diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index e8b116240c..950a28e3bb 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -820,7 +820,7 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) pd_save = pinfo->private_data; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DIAMETER"); - pi = proto_tree_add_item(tree,proto_diameter,tvb,0,-1,FALSE); + pi = proto_tree_add_item(tree,proto_diameter,tvb,0,-1,ENC_NA); diam_tree = proto_item_add_subtree(pi,ett_diameter); c->tree = diam_tree; diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 2c2d2dc6f7..9a0182d5be 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -135,7 +135,7 @@ dissect_distcc_argc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int static int dissect_distcc_argv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gint parameter) { - char argv[256]; + char argv[256]; int argv_len; gint len=parameter; @@ -164,7 +164,7 @@ dissect_distcc_argv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int static int dissect_distcc_serr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gint parameter) { - char argv[256]; + char argv[256]; int argv_len; gint len=parameter; @@ -193,7 +193,7 @@ dissect_distcc_serr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int static int dissect_distcc_sout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gint parameter) { - char argv[256]; + char argv[256]; int argv_len; gint len=parameter; @@ -271,7 +271,7 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_item *item=NULL; char token[4]; guint32 parameter; - + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISTCC "); @@ -279,12 +279,12 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_distcc, tvb, offset, - -1, ENC_BIG_ENDIAN); + -1, ENC_NA); tree = proto_item_add_subtree(item, ett_distcc); } while(1){ - /* we must have at least 12 bytes so we can read the + /* we must have at least 12 bytes so we can read the token and the parameter */ if(tvb_length_remaining(tvb, offset)<12){ return; @@ -320,7 +320,7 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } else { call_dissector(data_handle, tvb, pinfo, tree); return; - } + } } diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 8b75e25499..b8fda239a2 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -798,7 +798,7 @@ dissect_dlm3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset = 0; item = proto_tree_add_item(parent_tree, proto_dlm3, tvb, offset, - -1, ENC_LITTLE_ENDIAN); + -1, ENC_NA); tree = proto_item_add_subtree(item, ett_dlm3); sub_item = proto_tree_add_uint(tree, diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index 69b9c9e303..7e61d1c92e 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -229,7 +229,7 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_dlsw, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_dlsw, tvb, 0, -1, ENC_NA); dlsw_tree = proto_item_add_subtree(ti, ett_dlsw); hlen=tvb_get_guint8(tvb,1); diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 72926ea024..c3be0cae54 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2761,7 +2761,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "len=%u, %s", dl_len, func_code_str); /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_dnp3, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_dnp3, tvb, offset, -1, ENC_NA); dnp3_tree = proto_item_add_subtree(ti, ett_dnp3); /* Create Subtree for Data Link Layer */ diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index af99458555..7d482f7546 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1052,7 +1052,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *dplay_data = NULL; gint offset = 0; - dplay_item = proto_tree_add_item(tree, proto_dplay, tvb, 0, -1, ENC_BIG_ENDIAN); + dplay_item = proto_tree_add_item(tree, proto_dplay, tvb, 0, -1, ENC_NA); dplay_tree = proto_item_add_subtree(dplay_item, ett_dplay); header_item = proto_tree_add_text(dplay_tree, tvb, offset, DPLAY_HEADER_OFFSET, "DirectPlay header"); dplay_header = proto_item_add_subtree(header_item, ett_dplay_header); @@ -1136,7 +1136,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr proto_tree *data_tree = NULL; gint offset = 0; - dplay_item = proto_tree_add_item(tree, proto_dplay, tvb, offset, -1, ENC_BIG_ENDIAN); + dplay_item = proto_tree_add_item(tree, proto_dplay, tvb, offset, -1, ENC_NA); dplay_tree = proto_item_add_subtree(dplay_item, ett_dplay); data_item = proto_tree_add_text(dplay_tree, tvb, offset, -1, "Message content"); data_tree = proto_item_add_subtree(data_item, ett_dplay_data); diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c index 2c490c9a58..868aa885fc 100644 --- a/epan/dissectors/packet-dpnss-link.c +++ b/epan/dissectors/packet-dpnss-link.c @@ -111,7 +111,7 @@ dissect_dpnss_link(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_DEF_SRC, uton?"TE":"NT"); col_set_str(pinfo->cinfo, COL_DEF_DST, uton?"NT":"TE"); - item = proto_tree_add_item(tree, proto_dpnss_link, tvb, 0, -1, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, proto_dpnss_link, tvb, 0, -1, ENC_NA); dpnss_link_tree = proto_item_add_subtree(item, ett_dpnss_link); proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_framegroup, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 12c6545a55..fff47f9e69 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -537,7 +537,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_dsi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_dsi, tvb, 0, -1, ENC_NA); dsi_tree = proto_item_add_subtree(ti, ett_dsi); proto_tree_add_uint(dsi_tree, hf_dsi_flags, tvb, diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 440fea0e22..bcc615953d 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -447,7 +447,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create display subtree for SSL as a whole */ if (tree) { - ti = proto_tree_add_item(tree, proto_dtls, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_dtls, tvb, 0, -1, ENC_NA); dtls_tree = proto_item_add_subtree(ti, ett_dtls); } diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 664c14c9f7..a5400fb2a1 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -327,7 +327,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) more_frags = TRUE; } ci = proto_tree_add_item(tree, proto_tcp_conv, tvb, - frame_offset, -1, FALSE); + frame_offset, -1, ENC_NA); conv_proto_tree = proto_item_add_subtree(ci, ett_tcp_conv); dissect_tcp_convergence_data_header(tvb, conv_proto_tree); @@ -344,7 +344,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; ti = proto_tree_add_item(tree, proto_bundle, tvb, - frame_offset, -1, FALSE); + frame_offset, -1, ENC_NA); bundle_tree = proto_item_add_subtree(ti, ett_bundle); new_tvb = process_reassembled_data(tvb, frame_offset + convergence_hdr_size, @@ -393,7 +393,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(frame_offset == 0) { ci = proto_tree_add_item(tree, proto_tcp_conv, tvb, - frame_offset, -1, FALSE); + frame_offset, -1, ENC_NA); conv_proto_tree = proto_item_add_subtree(ci, ett_tcp_conv); } @@ -519,7 +519,7 @@ dissect_udp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Clear out stuff in the info column */ col_clear(pinfo->cinfo,COL_INFO); - ti = proto_tree_add_item(tree, proto_bundle, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bundle, tvb, 0, -1, ENC_NA); bundle_tree = proto_item_add_subtree(ti, ett_bundle); primary_item = proto_tree_add_text(bundle_tree, tvb, 0, -1, @@ -1755,7 +1755,7 @@ dissect_admin_record(proto_tree *primary_tree, tvbuff_t *tvb, int offset) timestamp_sequence = evaluate_sdnv(tvb, offset, &sdnv_length); timestamp_sequence_item = proto_tree_add_text(admin_record_tree, tvb, offset, sdnv_length, " "); - + if(timestamp_sequence < 0) { gint64 ts_seq; @@ -1845,7 +1845,7 @@ dissect_admin_record(proto_tree *primary_tree, tvbuff_t *tvb, int offset) timestamp_sequence = evaluate_sdnv(tvb, offset, &sdnv_length); timestamp_sequence_item = proto_tree_add_text(admin_record_tree, tvb, offset, sdnv_length, " "); - + if(timestamp_sequence < 0) { gint64 ts_seq; diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index 9bec86fa7e..43030b13ec 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -81,7 +81,7 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Dynamic Trunking Protocol"); if (tree) { - ti = proto_tree_add_item(tree, proto_dtp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_dtp, tvb, offset, -1, ENC_NA); dtp_tree = proto_item_add_subtree(ti, ett_dtp); } @@ -95,12 +95,12 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_ntohs(tvb, offset); length = tvb_get_ntohs(tvb, offset + 2); valuelength = (length-4); - + /* make sure still in valid tlv */ if ((valuelength < 1) || ( length > tvb_length_remaining(tvb, offset) )) break; - ti = proto_tree_add_text(dtp_tree, tvb, offset, length, "%s", + ti = proto_tree_add_text(dtp_tree, tvb, offset, length, "%s", val_to_str(type, dtp_tlv_type_vals, "Unknown TLV type: 0x%02x")); tlv_tree = proto_item_add_subtree(ti, ett_dtp_tlv); @@ -198,19 +198,19 @@ proto_register_dtp(void) { static hf_register_info hf[] = { { &hf_dtp_version, - { "Version", "dtp.version", FT_UINT8, BASE_HEX, + { "Version", "dtp.version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dtp_tlvtype, - { "Type", "dtp.tlv_type", FT_UINT16, BASE_HEX, + { "Type", "dtp.tlv_type", FT_UINT16, BASE_HEX, VALS(dtp_tlv_type_vals), 0x0, NULL, HFILL }}, { &hf_dtp_tlvlength, - { "Length", "dtp.tlv_len", FT_UINT16, BASE_DEC, + { "Length", "dtp.tlv_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dtp_some_mac, - { "Neighbor", "dtp.neighbor", FT_ETHER, BASE_NONE, + { "Neighbor", "dtp.neighbor", FT_ETHER, BASE_NONE, NULL, 0x0, "MAC Address of neighbor", HFILL }}, }; diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 8ac75735d5..3a488e097c 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -460,7 +460,7 @@ dissect_dtpt_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { dtpt_item = proto_tree_add_item(tree, proto_dtpt, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); if (dtpt_item) dtpt_tree = proto_item_add_subtree(dtpt_item, ett_dtpt); } @@ -734,7 +734,7 @@ dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { dtpt_item = proto_tree_add_item(tree, proto_dtpt, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); if (dtpt_item) dtpt_tree = proto_item_add_subtree(dtpt_item, ett_dtpt); } diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index eeac4c43c3..7318e5ab27 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -496,8 +496,8 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - while ((tvb_reported_length_remaining(tvb, offset)>=4) - && (neighbor_count>0)) { + while ((tvb_reported_length_remaining(tvb, offset)>=4) + && (neighbor_count>0)) { proto_tree_add_item(parent_tree, hf_neighbor, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -697,7 +697,7 @@ dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of return offset+tvb_length_remaining(tvb, offset); } - item = proto_tree_add_item(parent_tree, proto_dvmrp, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_dvmrp, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_dvmrp); diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index 348bd90c75..cd16eb0851 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.c @@ -88,7 +88,7 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *e100_tree = NULL; - ti = proto_tree_add_item(tree, proto_e100, tvb, 0, e100_encap_len, FALSE); + ti = proto_tree_add_item(tree, proto_e100, tvb, 0, e100_encap_len, ENC_NA); e100_tree = proto_item_add_subtree(ti, ett_e100); proto_tree_add_item(e100_tree, hf_e100_header, tvb, diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index f38a6e5771..7b477966f0 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -312,7 +312,7 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, int offset, /* OpCode (1 byte), MS-CHAPv2-ID (1 byte), MS-Length (2 bytes), Data */ opcode = tvb_get_guint8(tvb, offset); proto_tree_add_text(eap_tree, tvb, offset, 1, - "OpCode: %d (%s)", + "OpCode: %d (%s)", opcode, val_to_str(opcode, opcodes, "Unknown")); offset++; left--; @@ -461,7 +461,7 @@ dissect_eap_sim(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size) subtype = tvb_get_guint8(tvb, offset); proto_tree_add_text(eap_tree, tvb, offset, 1, - "subtype: %d (%s)", + "subtype: %d (%s)", subtype, val_to_str(subtype, subtypes, "Unknown")); offset++; @@ -487,7 +487,7 @@ dissect_eap_sim(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size) aleft = 4 * length; pi = proto_tree_add_text(eap_tree, tvb, aoffset, aleft, - "Attribute: %s", + "Attribute: %s", val_to_str(type, attributes, "Unknown %u")); attr_tree = proto_item_add_subtree(pi, ett_eap_sim_attr); @@ -564,7 +564,7 @@ dissect_eap_aka(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size) subtype = tvb_get_guint8(tvb, offset); proto_tree_add_text(eap_tree, tvb, offset, 1, - "subtype: %d (%s)", + "subtype: %d (%s)", subtype, val_to_str(subtype, subtypes, "Unknown")); offset++; @@ -590,7 +590,7 @@ dissect_eap_aka(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size) aleft = 4 * length; pi = proto_tree_add_text(eap_tree, tvb, aoffset, aleft, - "Attribute: %s", + "Attribute: %s", val_to_str(type, attributes, "Unknown %u")); attr_tree = proto_item_add_subtree(pi, ett_eap_aka_attr); @@ -709,7 +709,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = eap_len; if (tree) { - ti = proto_tree_add_item(tree, proto_eap, tvb, 0, len, FALSE); + ti = proto_tree_add_item(tree, proto_eap, tvb, 0, len, ENC_NA); eap_tree = proto_item_add_subtree(ti, ett_eap); proto_tree_add_uint(eap_tree, hf_eap_code, tvb, 0, 1, eap_code); diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 2224a6f247..885a1fb71c 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -148,7 +148,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_eapol, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_eapol, tvb, 0, -1, ENC_NA); eapol_tree = proto_item_add_subtree(ti, ett_eapol); proto_tree_add_item(eapol_tree, hf_eapol_version, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index f566ff1dd5..24b066cfd2 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -65,7 +65,7 @@ static void dissect_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_echo, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_echo, tvb, offset, -1, ENC_NA); echo_tree = proto_item_add_subtree(ti, ett_echo); if (request) { diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index c1c3ed077a..d1b3bab466 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -2950,7 +2950,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); if (tree) { - ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, ENC_NA); edonkey_tree = proto_item_add_subtree(ti, ett_edonkey); } @@ -3072,7 +3072,7 @@ static void dissect_edonkey_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t col_set_str(pinfo->cinfo, COL_INFO, "eDonkey UDP Message"); if (tree) { - ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, ENC_NA); edonkey_tree = proto_item_add_subtree(ti, ett_edonkey); } diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index c854e2fd67..61e4d1c234 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -115,7 +115,7 @@ static void dissect_egd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) memset(&egd_time, 0, sizeof(nstime_t)); offset = 0; - ti = proto_tree_add_item(tree, proto_egd, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_egd, tvb, 0, -1, ENC_NA); egd_tree = proto_item_add_subtree(ti, ett_egd); proto_tree_add_item(egd_tree, hf_egd_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 069f41071c..d53fd5214b 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -866,7 +866,7 @@ static void aoslos_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, in * The AOS/LOS packet data zone is only 2 bytes in * length and only 2 bits in the first byte are * meaningful -- Ku band or S band and AOS or LOS - * + * * 7-2 - unused * 1-0 - band + AOS/LOS indicator * @@ -1064,7 +1064,7 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "EHS"); col_set_str(pinfo->cinfo, COL_INFO, "EHS"); - ehs_packet = proto_tree_add_item ( tree, proto_ehs, tvb, 0, -1, FALSE ); + ehs_packet = proto_tree_add_item ( tree, proto_ehs, tvb, 0, -1, ENC_NA ); ehs_tree = proto_item_add_subtree ( ehs_packet, ett_ehs ); /* build the ehs primary header tree */ diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 064b2995e3..8f03db77db 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -361,7 +361,7 @@ dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_enttec, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_enttec, tvb, offset, -1, ENC_NA); enttec_tree = proto_item_add_subtree(ti, ett_enttec); } diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 7f628455e4..e2f00d70c2 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -763,7 +763,7 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_epl, tvb, 0, -1, TRUE); + ti = proto_tree_add_item(tree, proto_epl, tvb, 0, -1, ENC_NA); epl_tree = proto_item_add_subtree(ti, ett_epl); proto_tree_add_item(epl_tree, diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index d30b7b4a8c..000efbbc4c 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -406,7 +406,7 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree){ /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_epl_v1, tvb, 0, -1, TRUE); + ti = proto_tree_add_item(tree, proto_epl_v1, tvb, 0, -1, ENC_NA); epl_v1_tree = proto_item_add_subtree(ti, ett_epl_v1); } diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index 6ca417d687..73bb83253d 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -318,7 +318,7 @@ dissect_epmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - ti = proto_tree_add_item(tree, proto_epmd, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_epmd, tvb, 0, -1, ENC_NA); epmd_tree = proto_item_add_subtree(ti, ett_epmd); if (pinfo->match_port == pinfo->destport) { diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 47635cdcec..ee1b273817 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -654,7 +654,7 @@ channelised_fill_sdh_g707_format(sdh_g707_format_t* in_fmt, guint16 bit_flds, gu /* check the value in bit flds */ aug_n_index = ((bit_flds >> (2 *i))& 0x3) +1; } - else + else { aug_n_index = 0; } @@ -669,7 +669,7 @@ channelised_fill_vc_id_string(char* out_string, int maxstrlen, sdh_g707_format_t int i = 0; int cur_len = 0, print_index = 0; guint8 is_printed = 0; - static char* g_vc_size_strings[] = { + static char* g_vc_size_strings[] = { "unknown", /* 0x0 */ "VC3", /*0x1*/ "VC4", /*0x2*/ @@ -715,7 +715,7 @@ channelised_fill_vc_id_string(char* out_string, int maxstrlen, sdh_g707_format_t } g_snprintf(out_string+print_index, maxstrlen, ")"); return; -} +} static void dissect_channelised_ex_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pseudo_hdr_tree, int idx) @@ -1130,7 +1130,7 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - erf_item = proto_tree_add_item(tree, proto_erf, tvb, 0, -1, FALSE); + erf_item = proto_tree_add_item(tree, proto_erf, tvb, 0, -1, ENC_NA); erf_tree = proto_item_add_subtree(erf_item, ett_erf); dissect_erf_pseudo_header(tvb, pinfo, erf_tree); diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index ae197c950e..62c916a711 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -452,7 +452,7 @@ static void dissect_erldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - ti = proto_tree_add_item(tree, proto_erldp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_erldp, tvb, 0, -1, ENC_NA); erldp_tree = proto_item_add_subtree(ti, ett_erldp); if (is_handshake(tvb, 0)) { diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index a8ea08d914..8500157a3f 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -83,7 +83,7 @@ static const value_string esio_sts_types[] = { static gboolean is_esio_pdu(tvbuff_t *tvb) { - /* we need at least 8 bytes to determine whether this is + /* we need at least 8 bytes to determine whether this is Ether-S-I/O or not*/ /* minimal length is 20 bytes*/ if (tvb_length(tvb) < 20) { @@ -173,7 +173,7 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ if (tree) { offset =0; - ti = proto_tree_add_item(tree, proto_esio, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_esio, tvb, offset, -1, ENC_NA); esio_tree = proto_item_add_subtree(ti, ett_esio); /*Add subtree for Ether-S-I/O header*/ et = proto_tree_add_text(esio_tree, tvb, offset, 12, "Ether-S-I/O header"); diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index dcbb8ee64f..87d6295f6c 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -286,7 +286,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr); if (tree) { - ti = proto_tree_add_item(tree, proto_esis, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_esis, tvb, 0, -1, ENC_NA); esis_tree = proto_item_add_subtree(ti, ett_esis); if (ehdr.esis_version != ESIS_REQUIRED_VERSION){ diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 54dd9c30a1..692d54d1d1 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -368,7 +368,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, get_ether_name(dst_addr), ether_to_str(dst_addr)); } else { - ti = proto_tree_add_item(parent_tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, FALSE); + ti = proto_tree_add_item(parent_tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, ENC_NA); } fh_tree = proto_item_add_subtree(ti, ett_ether2); } diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index d439bcf5ea..a6f5af1491 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -239,7 +239,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia len = tvb_length(tvb); - item = proto_tree_add_item(tree, proto_evrc, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_evrc, tvb, 0, -1, ENC_NA); evrc_tree = proto_item_add_subtree(item, ett_evrc); diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index 43ec382ea5..9466293dd2 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -221,7 +221,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_exec, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_exec, tvb, 0, -1, ENC_NA); exec_tree = proto_item_add_subtree(ti, ett_exec); /* If this packet doesn't end with a null terminated string, diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 8b6d431a82..48a729e1d9 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -976,7 +976,7 @@ dissect_edp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_edp, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); edp_tree = proto_item_add_subtree(ti, ett_edp); proto_tree_add_item(edp_tree, hf_edp_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index 227ae641d2..3be25b63dc 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -258,7 +258,7 @@ dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 clen; guint8 plen; - ti = proto_tree_add_item(tree, proto_fcgi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_fcgi, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, " (%s)", val_to_str(type, record_types, "Unknown (%u)")); fcgi_tree = proto_item_add_subtree(ti, ett_fcgi); diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index cbf8d06d18..76e13dd1c7 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -108,7 +108,7 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *flags_ti; proto_tree *flags_tree; - ti = proto_tree_add_item(tree, proto_fefd, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_fefd, tvb, offset, -1, ENC_NA); fefd_tree = proto_item_add_subtree(ti, ett_fefd); /* FEFD header */ diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index cd21fad357..b19bbc264d 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -12965,7 +12965,7 @@ dissect_ff(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_ntohl(tvb, 8); if(tree) { - ti = proto_tree_add_item(tree, proto_ff, tvb, offset, length, FALSE); + ti = proto_tree_add_item(tree, proto_ff, tvb, offset, length, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_ff); } diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index cb2eaba2a3..8378587c3d 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -244,14 +244,14 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (fix_marker(tvb, 0) != 0) { /* not a fix packet start but it's a fix packet */ col_set_str(pinfo->cinfo, COL_INFO, "[FIX continuation]"); - ti = proto_tree_add_item(tree, proto_fix, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_fix, tvb, 0, -1, ENC_NA); fix_tree = proto_item_add_subtree(ti, ett_fix); proto_tree_add_item(fix_tree, hf_fix_data, tvb, 0, -1, ENC_NA); return; } pdu_len = tvb_reported_length(tvb); - ti = proto_tree_add_item(tree, proto_fix, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_fix, tvb, 0, -1, ENC_NA); fix_tree = proto_item_add_subtree(ti, ett_fix); /* begin string */ diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index c086bd86db..eabff0a946 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -448,7 +448,7 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { ti = proto_tree_add_item(tree, proto_flip, flip_tvb, 0, - flip_len, FALSE); + flip_len, ENC_NA); } flip_tree = proto_item_add_subtree(ti, ett_flip); diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 27915e7388..cdc14a8112 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.c @@ -88,7 +88,7 @@ dissect_fmtp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Clear out stuff in the info column */ col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_fmtp, tvb, 0, -1, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(tree, proto_fmtp, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", %s", val_to_str(packet_type, packet_type_names, "Unknown (0x%02x)")); diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index e7b6d27c6c..66cb2c4830 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -500,7 +500,7 @@ static void dissect_fp_hint(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) channel_type = tvb_get_guint8(tvb, 3); if (tree) { - ti = proto_tree_add_item(tree, proto_fp_hint, tvb, 0, hdrlen, TRUE); + ti = proto_tree_add_item(tree, proto_fp_hint, tvb, 0, hdrlen, ENC_NA); fph_tree = proto_item_add_subtree(ti, ett_fph); proto_tree_add_uint(fph_tree, hf_fph_frametype, tvb, 2, 1, frame_type); proto_tree_add_uint(fph_tree, hf_fph_channeltype, tvb, 3, 1, channel_type); diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index 9638fc0565..fba74b334a 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -185,7 +185,7 @@ dissect_fractalgeneratorprotocol(tvbuff_t *message_tvb, packet_info *pinfo, prot necessary to generate protocol tree items. */ if (tree) { /* create the fractalgeneratorprotocol protocol tree */ - fractalgeneratorprotocol_item = proto_tree_add_item(tree, proto_fractalgeneratorprotocol, message_tvb, 0, -1, FALSE); + fractalgeneratorprotocol_item = proto_tree_add_item(tree, proto_fractalgeneratorprotocol, message_tvb, 0, -1, ENC_NA); fractalgeneratorprotocol_tree = proto_item_add_subtree(fractalgeneratorprotocol_item, ett_fractalgeneratorprotocol); } else { fractalgeneratorprotocol_tree = NULL; diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 89a8ce8b29..1f542a6ea5 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -354,7 +354,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ftp, tvb, offset, -1, - FALSE); + ENC_NA); ftp_tree = proto_item_add_subtree(ti, ett_ftp); if (is_request) { @@ -647,7 +647,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) data_length = tvb_length(tvb); ti = proto_tree_add_item(tree, proto_ftp_data, tvb, 0, -1, - FALSE); + ENC_NA); ftp_data_tree = proto_item_add_subtree(ti, ett_ftp_data); /* diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index 578265507e..6f0e272ad0 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -57,7 +57,7 @@ static int ett_g723 = -1; */ static const value_string g723_frame_size_and_codec_type_value[] = { - {0, "High-rate speech (6.3 kb/s)"}, + {0, "High-rate speech (6.3 kb/s)"}, {1, "Low-rate speech (5.3 kb/s)"}, /* Not coded */ {2, "SID frame"}, {3, "Reserved"}, @@ -79,16 +79,16 @@ dissect_g723(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "G.723.1"); if (tree) { - ti = proto_tree_add_item(tree, proto_g723, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_g723, tvb, 0, -1, ENC_NA); g723_tree = proto_item_add_subtree(ti, ett_g723); octet = tvb_get_guint8(tvb,offset); proto_tree_add_item(g723_tree, hf_g723_frame_size_and_codec, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(g723_tree, hf_g723_lpc_B5_B0, tvb, offset, 1, ENC_BIG_ENDIAN); - + if ((octet & 0x1) == 1 ) /* Low rate */ - return; + return; }/* if tree */ } @@ -103,7 +103,7 @@ void proto_reg_handoff_g723(void) { dissector_handle_t g723_handle; - + g723_handle = create_dissector_handle(dissect_g723, proto_g723); dissector_add_uint("rtp.pt", PT_G723, g723_handle); @@ -116,19 +116,19 @@ proto_reg_handoff_g723(void) void proto_register_g723(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_g723_frame_size_and_codec, { "Frame size and codec type", "g723.frame_size_and_codec", - FT_UINT8, BASE_HEX, VALS(g723_frame_size_and_codec_type_value), 0x03, + FT_UINT8, BASE_HEX, VALS(g723_frame_size_and_codec_type_value), 0x03, "RATEFLAG_B0", HFILL } }, { &hf_g723_lpc_B5_B0, { "LPC_B5...LPC_B0", "g723.lpc.b5b0", - FT_UINT8, BASE_HEX, NULL, 0xfc, + FT_UINT8, BASE_HEX, NULL, 0xfc, NULL, HFILL } }, diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 18d8cbf887..796316b6af 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -1247,7 +1247,7 @@ dissect_gdsdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gdsdb_tree = NULL; /* So the opcode functions can check on if(tree) */ nopi.cinfo = NULL; - if (tvb_length(tvb) < 4) + if (tvb_length(tvb) < 4) return 0; opcode = tvb_get_ntohl(tvb, 0); @@ -1264,7 +1264,7 @@ dissect_gdsdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_gdsdb, tvb, 0, -1, - FALSE); + ENC_NA); gdsdb_tree = proto_item_add_subtree(ti, ett_gdsdb); proto_tree_add_item(gdsdb_tree, hf_gdsdb_opcode, tvb, 0, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index da497fb678..cda1dfd896 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -14,12 +14,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -69,14 +69,14 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) line = tvb_get_ptr(tvb, offset, linelen); /* set "Info" column text */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", is_request ? "Request" : "Response", format_text(line, linelen)); /* if tree != NULL, build protocol tree */ if (tree) { - ti = proto_tree_add_item(tree, proto_gift, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_gift, tvb, 0, -1, ENC_NA); gift_tree = proto_item_add_subtree(ti, ett_gift); if (is_request) { @@ -86,7 +86,7 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } PROTO_ITEM_SET_HIDDEN(hidden_item); - ti = proto_tree_add_text(gift_tree, tvb, offset, next_offset - offset, "%s", + ti = proto_tree_add_text(gift_tree, tvb, offset, next_offset - offset, "%s", tvb_format_text(tvb, offset, next_offset - offset)); cmd_tree = proto_item_add_subtree(ti, ett_gift_cmd); diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 49a66c58e6..6a025ba6f2 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -3945,7 +3945,7 @@ static void dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree } if (tree) { - ti = proto_tree_add_item (tree, proto_giop, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_giop, tvb, 0, -1, ENC_NA); clnp_tree = proto_item_add_subtree (ti, ett_giop); proto_tree_add_text (clnp_tree, giop_header_tvb, 0, -1, "Version %u.%u not supported", @@ -3981,7 +3981,7 @@ static void dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree if (tree) { - ti = proto_tree_add_item (tree, proto_giop, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_giop, tvb, 0, -1, ENC_NA); clnp_tree = proto_item_add_subtree (ti, ett_giop); proto_tree_add_text (clnp_tree, giop_header_tvb, offset, 4, "Magic number: %s", GIOP_MAGIC); diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c index 4f9dedf389..a2700fb624 100644 --- a/epan/dissectors/packet-git.c +++ b/epan/dissectors/packet-git.c @@ -90,7 +90,7 @@ dissect_git_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Git Smart Protocol"); - ti = proto_tree_add_item(tree, proto_git, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_git, tvb, offset, -1, ENC_NA); git_tree = proto_item_add_subtree(ti, ett_git); if (!tvb_get_packet_length(tvb, 0, &plen)) @@ -107,7 +107,7 @@ dissect_git_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(git_tree, hf_git_packet_len, tvb, offset, 4, plen); - proto_tree_add_item(git_tree, hf_git_packet_data, tvb, offset+4, + proto_tree_add_item(git_tree, hf_git_packet_data, tvb, offset+4, plen-4, ENC_NA); } } diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index 5994fe462f..8b3b7e3a6e 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -309,7 +309,7 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "G: %d", group); if (tree) { - ti = proto_tree_add_item(tree, proto_glbp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_glbp, tvb, 0, -1, ENC_NA); glbp_tree = proto_item_add_subtree(ti, ett_glbp); /* glbp header? */ diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index ed6e8426e4..b79686e082 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.c @@ -166,7 +166,7 @@ dissect_gmhdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_guint8(tvb, offset); /* Length of the Gigamon header */ if (tree) { - ti = proto_tree_add_item(tree, proto_gmhdr, tvb, offset, length, FALSE); + ti = proto_tree_add_item(tree, proto_gmhdr, tvb, offset, length, ENC_NA); if (gmhdr_summary_in_tree) { proto_item_append_text(ti, ", Length: %u", length); @@ -244,7 +244,7 @@ dissect_gmtrailer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) /* OK: We appear to have a Gigamon trailer */ if (tree) { - ti = proto_tree_add_item(tree, proto_gmhdr, tvb, offset, length + 5, FALSE); + ti = proto_tree_add_item(tree, proto_gmhdr, tvb, offset, length + 5, ENC_NA); if (gmhdr_summary_in_tree) { proto_item_append_text(ti, ", Length: %u, Checksum: 0x%x", length, cksum); diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index b2c70fa2cc..906861f58c 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -124,7 +124,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_gmrp, tvb, 0, length, FALSE); + ti = proto_tree_add_item(tree, proto_gmrp, tvb, 0, length, ENC_NA); gmrp_tree = proto_item_add_subtree(ti, ett_gmrp); diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index c74756840d..e65293358f 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -357,7 +357,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tvb, 0, -1, - FALSE); + ENC_NA); gnutella_tree = proto_item_add_subtree(ti, ett_gnutella); size = tvb_get_letohl( @@ -548,7 +548,7 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree tvb, 0, -1, - FALSE); + ENC_NA); gnutella_tree = proto_item_add_subtree(ti, ett_gnutella); diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index 27eb5784ca..4fd51b25f0 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -703,7 +703,7 @@ dissect_goose(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_goose, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_goose, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_goose); } col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); @@ -1035,6 +1035,6 @@ void proto_reg_handoff_goose(void) { dissector_handle_t goose_handle; goose_handle = find_dissector("goose"); - + dissector_add_uint("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle); } diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index 9cdc507898..c9719e6fdd 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -160,7 +160,7 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (tree) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_gopher, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_gopher, tvb, 0, -1, ENC_NA); gopher_tree = proto_item_add_subtree(ti, ett_gopher); if (client) { diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c index 054b765978..160cb344d4 100644 --- a/epan/dissectors/packet-gpef.c +++ b/epan/dissectors/packet-gpef.c @@ -120,7 +120,7 @@ dissect_gpef_efsblob(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_t guint32 count; if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_gpef, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_gpef, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_gpef); } diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index 61451eaef6..f9e19f1194 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -807,7 +807,7 @@ dissect_gsm_bsslap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_PROTOCOL, "/BSSLAP"); if (tree) { octet = tvb_get_guint8(tvb, offset); - item = proto_tree_add_item(tree, proto_gsm_bsslap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_gsm_bsslap, tvb, 0, -1, ENC_NA); sub_tree = proto_item_add_subtree(item, ett_gsm_bsslap); /* Message Type IE / 5.1 M V 1 */ diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index bc95d7f909..6601bc3d87 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -35,11 +35,11 @@ #include <epan/prefs.h> /* http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml - * + * * exlm-agent 3002 * cgms 3003 * ii-admin 3006 - * vrml-multi-use 4200-4299 + * vrml-multi-use 4200-4299 * commplex-main 5000 */ #define IPA_TCP_PORTS "3002,3003,3006,4249,4250,5000" @@ -189,7 +189,7 @@ dissect_ipaccess(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(msg_type, ipaccess_msgtype_vals, "unknown 0x%02x")); if (tree) { - ti = proto_tree_add_item(tree, proto_ipaccess, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_ipaccess, tvb, 0, -1, ENC_NA); ipaccess_tree = proto_item_add_subtree(ti, ett_ipaccess); proto_tree_add_item(ipaccess_tree, hf_ipaccess_msgtype, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 683aa7c986..b3965c2071 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -391,7 +391,7 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo, if ( prevent_subdissectors_changing_columns && col_get_writable(pinfo->cinfo) ) { disallow_write = TRUE; col_set_writable(pinfo->cinfo, FALSE); - } + } if ( port_number_udh_means_wsp ) { call_dissector (wsp_handle, sm_tvb, pinfo, top_tree); @@ -407,7 +407,7 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo, } } } - + if ( disallow_write ) col_set_writable(pinfo->cinfo, TRUE); } else { /* No ports IE */ @@ -433,7 +433,7 @@ dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; proto_tree *subtree; - ti = proto_tree_add_item(tree, proto_gsm_sms_ud, tvb, 0, -1, TRUE); + ti = proto_tree_add_item(tree, proto_gsm_sms_ud, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_gsm_sms); parse_gsm_sms_ud_message(subtree, tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index 87bef0dcb7..feb111ef51 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -140,7 +140,7 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { const char *channel; - ti = proto_tree_add_item(tree, proto_gsm_um, tvb, 0, 0, FALSE); + ti = proto_tree_add_item(tree, proto_gsm_um, tvb, 0, 0, ENC_NA); gsm_um_tree = proto_item_add_subtree(ti, ett_gsm_um); switch( pinfo->pseudo_header->gsm_um.channel ) { diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index d6af5f8e66..ddfaf1ad92 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -227,7 +227,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } item = proto_tree_add_item( - tree, proto_gssapi, tvb, offset, -1, FALSE); + tree, proto_gssapi, tvb, offset, -1, ENC_NA); subtree = proto_item_add_subtree(item, ett_gssapi); diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 7d957c29e0..136ac864ac 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -6673,7 +6673,7 @@ static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(gtp_hdr.message, &message_type_ext, "Unknown")); if (tree) { - ti = proto_tree_add_item(tree, proto_gtp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_gtp, tvb, 0, -1, ENC_NA); gtp_tree = proto_item_add_subtree(ti, ett_gtp); tf = proto_tree_add_uint(gtp_tree, hf_gtp_flags, tvb, 0, 1, gtp_hdr.flags); @@ -6748,14 +6748,14 @@ static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* proto_tree_add_uint(gtp_tree, hf_gtp_next, tvb, offset, 1, next_hdr); */ offset++; - + /* Change to while? */ if (next_hdr) { /* TODO Add support for more than one extension header */ - + noOfExtHdrs++; - + tf = proto_tree_add_uint(gtp_tree, hf_gtp_ext_hdr, tvb, offset, 4, next_hdr); ext_tree = proto_item_add_subtree(tf, ett_gtp_ext_hdr); @@ -6772,7 +6772,7 @@ static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * * Wireshark Note: TS 29.060 does not define bit 5-6 as spare, so no check is possible unless a preference is used. */ if (next_hdr == GTP_EXT_HDR_PDCP_SN) { - + /* First byte is length (should be 1) */ ext_hdr_length = tvb_get_guint8(tvb, offset); if (ext_hdr_length != 1) { @@ -6783,7 +6783,7 @@ static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_pdcpsn, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - + /* Last is next_hdr */ next_hdr = tvb_get_guint8(tvb, offset); item = proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_next, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -6791,9 +6791,9 @@ static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * if (next_hdr) { expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "Can't decode more than one extension header."); } - offset++; + offset++; } - } + } } break; default: diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index a3fe47123d..84cc6693e8 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -3712,7 +3712,7 @@ dissect_gtpv2(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(message_type, gtpv2_message_type_vals, "Unknown")); - proto_tree_add_item(tree, proto_gtpv2, tvb, offset, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, proto_gtpv2, tvb, offset, -1, ENC_NA); if (tree) { ti = proto_tree_add_text(tree, tvb, offset, -1, "%s", val_to_str(message_type, gtpv2_message_type_vals, "Unknown")); diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 1a882fd57d..38311a21af 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -256,7 +256,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *gvcp_tree = NULL; - ti = proto_tree_add_item(tree, proto_gvcp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_gvcp, tvb, 0, -1, ENC_NA); gvcp_tree = proto_item_add_subtree(ti, ett_gvcp); proto_tree_add_item(gvcp_tree, hf_gvcp_type, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item(gvcp_tree, hf_gvcp_opcode, tvb, 2, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index 905d5d39d1..c2b0495f09 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.c @@ -108,7 +108,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_gvrp, tvb, 0, length, FALSE); + ti = proto_tree_add_item(tree, proto_gvrp, tvb, 0, length, ENC_NA); gvrp_tree = proto_item_add_subtree(ti, ett_gvrp); diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index 6a492c540c..3814d34d8a 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -124,7 +124,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "S5: "); if (tree) { - ti = proto_tree_add_item (tree, proto_h1, tvb, offset, 16, FALSE); + ti = proto_tree_add_item (tree, proto_h1, tvb, offset, 16, ENC_NA); h1_tree = proto_item_add_subtree (ti, ett_h1); proto_tree_add_uint (h1_tree, hf_h1_header, tvb, offset, 2, tvb_get_ntohs(tvb,offset)); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 859315e416..e1c64ed928 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1310,7 +1310,7 @@ dissect_h223 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add the 'h223' tree to the main tree */ if (tree) { - h223_item = proto_tree_add_item (tree, proto_h223, tvb, 0, -1, FALSE); + h223_item = proto_tree_add_item (tree, proto_h223, tvb, 0, -1, ENC_NA); h223_tree = proto_item_add_subtree (h223_item, ett_h223); } diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 649f07d5fe..dac1262baa 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -5400,7 +5400,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.248"); if (tree) { - h248_item = proto_tree_add_item(tree, proto_h248, tvb, 0, -1, FALSE); + h248_item = proto_tree_add_item(tree, proto_h248, tvb, 0, -1, ENC_NA); h248_tree = proto_item_add_subtree(h248_item, ett_h248); } diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index cdceb30e74..f5b6a9dafb 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -70,7 +70,7 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str(pinfo->cinfo, COL_INFO, "H.261 message"); if ( tree ) { - ti = proto_tree_add_item( tree, proto_h261, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_h261, tvb, offset, -1, ENC_NA ); h261_tree = proto_item_add_subtree( ti, ett_h261 ); /* SBIT 1st octet, 3 bits */ proto_tree_add_uint( h261_tree, hf_h261_sbit, tvb, offset, 1, tvb_get_guint8( tvb, offset ) >> 5 ); diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 68339de63e..c89c128bba 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -190,13 +190,13 @@ dissect_h263_group_of_blocks_layer( tvbuff_t *tvb, proto_tree *tree, gint offset proto_tree_add_bits_item(tree, hf_h263_gbsc, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN); offset_in_bits++; }else{ - /* Group of Block Start Code (GBSC) (17 bits) + /* Group of Block Start Code (GBSC) (17 bits) * A word of 17 bits. Its value is 0000 0000 0000 0000 1. */ proto_tree_add_bits_item(tree, hf_h263_gbsc, tvb, offset_in_bits, 17, ENC_BIG_ENDIAN); offset_in_bits = offset_in_bits +17; } - /* + /* * Group Number (GN) (5 bits) */ proto_tree_add_bits_item(tree, hf_h263_GN, tvb, offset_in_bits, 5, ENC_BIG_ENDIAN); @@ -204,7 +204,7 @@ dissect_h263_group_of_blocks_layer( tvbuff_t *tvb, proto_tree *tree, gint offset /* 5.2.4 GOB Sub-Bitstream Indicator (GSBI) (2 bits) * A fixed length codeword of 2 bits that is only present if CPM is "1" in the picture header. */ - /* + /* * 5.2.5 GOB Frame ID (GFID) (2 bits) */ /* @@ -238,12 +238,12 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint64 pei; if(is_rfc4626){ - /* PC 1000 00xx */ + /* PC 1000 00xx */ proto_tree_add_bits_item(tree, hf_h263_psc, tvb, offset_in_bits, 6, ENC_BIG_ENDIAN); offset_in_bits = offset_in_bits +6; }else{ - /* Check for PSC, PSC is a word of 22 bits. + /* Check for PSC, PSC is a word of 22 bits. * Its value is 0000 0000 0000 0000' 1000 00xx xxxx xxxx. */ proto_tree_add_bits_item(tree, hf_h263_psc, tvb, offset_in_bits, 22, ENC_BIG_ENDIAN); @@ -253,7 +253,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_bits_item(tree, hf_h263_TR, tvb, offset_in_bits, 8, ENC_BIG_ENDIAN); offset_in_bits = offset_in_bits +8; /* - * Bit 1: Always "1", in order to avoid start code emulation. + * Bit 1: Always "1", in order to avoid start code emulation. * Bit 2: Always "0", for distinction with Recommendation H.261. */ offset_in_bits = offset_in_bits +2; @@ -290,14 +290,14 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_bits_ret_val( tree, hf_h263_PB_frames_mode, tvb, offset_in_bits, 1, &PB_frames_mode, ENC_BIG_ENDIAN); offset_in_bits++; }else{ - /* Extended PTYPE + /* Extended PTYPE * Update Full Extended PTYPE (UFEP) (3 bits) */ /* .... ..xx x... .... */ proto_tree_add_bits_ret_val( tree, hf_h263_UFEP, tvb, offset_in_bits, 3, &ufep, ENC_BIG_ENDIAN); offset_in_bits = offset_in_bits +3; if(ufep==1){ - /* The Optional Part of PLUSPTYPE (OPPTYPE) (18 bits) + /* The Optional Part of PLUSPTYPE (OPPTYPE) (18 bits) */ /* .xxx xxxx xxxx xxxx xxx. .... */ opptype_item = proto_tree_add_bits_item( tree, hf_h263_opptype, tvb, offset_in_bits, 18, ENC_BIG_ENDIAN); @@ -309,7 +309,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ proto_tree_add_bits_item( h263_opptype_tree, hf_h263_ext_source_format, tvb, offset_in_bits, 3, ENC_BIG_ENDIAN); offset_in_bits+=3; - + /* * Bit 4 Optional Custom PCF, "0" CIF PCF, "1" custom PCF; */ @@ -373,7 +373,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ offset_in_bits++; proto_tree_add_bits_item( h263_opptype_tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_NA); - + } /* * 5.1.4.3 The mandatory part of PLUSPTYPE when PLUSPTYPE present (MPPTYPE) (9 bits) @@ -417,7 +417,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset_in_bits++; proto_tree_add_bits_item( tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_NA); /* The picture header location of CPM (1 bit) and PSBI (2 bits) - * the picture header depends on whether or not PLUSPTYPE is present + * the picture header depends on whether or not PLUSPTYPE is present * (see 5.1.20 and 5.1.21). If PLUSPTYPE is present, then CPM follows * immediately after PLUSPTYPE in the picture header. */ @@ -586,7 +586,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset_in_bits++; while(pei==1) { - /*5.1.25 Supplemental Enhancement Information (PSUPP) (0/8/16 ... bits) + /*5.1.25 Supplemental Enhancement Information (PSUPP) (0/8/16 ... bits) * If PEI is set to "1", then 9 bits follow consisting of 8 bits of data (PSUPP) and then another PEI bit * to indicate if a further 9 bits follow and so on. Encoders shall use PSUPP as specified in Annex L. */ @@ -641,14 +641,14 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr col_append_str( pinfo->cinfo, COL_INFO, "H263 payload "); if( tree ) { - h263_payload_item = proto_tree_add_item( tree, proto_h263_data, tvb, offset, -1, FALSE ); + h263_payload_item = proto_tree_add_item( tree, proto_h263_data, tvb, offset, -1, ENC_NA ); h263_payload_tree = proto_item_add_subtree( h263_payload_item, ett_h263_payload ); } /* Check for PSC, PSC is a word of 22 bits. Its value is 0000 0000 0000 0000' 1000 00xx xxxx xxxx. */ data = tvb_get_ntohl(tvb, offset); - - if (( data & 0xffff8000) == 0x00008000 ) { + + if (( data & 0xffff8000) == 0x00008000 ) { /* Start Code found * * Startc code holds bit 17 -23 of the codeword @@ -657,7 +657,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (startcode & 0x80){ switch(startcode){ case 0xf8: - /* End Of Sub-Bitstream code (EOSBS) + /* End Of Sub-Bitstream code (EOSBS) * ( 1111 100. ) */ break; diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 524f131546..2ec9400fa6 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -88,9 +88,9 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.263 RFC4629 "); if ( tree ) { - ti = proto_tree_add_item( tree, proto_h263P, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_h263P, tvb, offset, -1, ENC_NA ); h263P_tree = proto_item_add_subtree( ti, ett_h263P ); - + data16 = tvb_get_ntohs(tvb,offset); proto_tree_add_item( h263P_tree, hf_h263P_rr, tvb, offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item( h263P_tree, hf_h263P_pbit, tvb, offset, 2, ENC_BIG_ENDIAN ); @@ -108,7 +108,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) */ if ((data16&0x0200)==0x0200){ - /* V bit = 1 + /* V bit = 1 * The format of the VRC header extension is as follows: * * 0 1 2 3 4 5 6 7 @@ -136,7 +136,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * * S: 1 bit * - * A bit that indicates that the packet content is for a sync frame. + * A bit that indicates that the packet content is for a sync frame. * : */ proto_tree_add_item( h263P_tree, hf_h263P_tid, tvb, offset, 1, ENC_BIG_ENDIAN ); @@ -151,7 +151,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) extra_hdr_item = proto_tree_add_item( h263P_tree, hf_h263P_extra_hdr, tvb, offset, plen, ENC_NA ); h263P_extr_hdr_tree = proto_item_add_subtree( extra_hdr_item, ett_h263P_extra_hdr ); dissect_h263_picture_layer( tvb, pinfo, h263P_extr_hdr_tree, offset, plen, TRUE); - offset += plen; + offset += plen; } if ((data16&0x0400)!=0){ /* P bit = 1 */ @@ -165,7 +165,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) */ switch(startcode){ case 0xf8: - /* End Of Sub-Bitstream code (EOSBS) + /* End Of Sub-Bitstream code (EOSBS) * EOSBS codes shall be byte aligned * ( 1111 100. ) */ diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index e8588c6ff4..b325d5490b 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -4407,7 +4407,7 @@ dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - ti = proto_tree_add_item(tree, proto_h282, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_h282, tvb, 0, -1, ENC_NA); h282_tree = proto_item_add_subtree(ti, ett_h282); return dissect_RDCPDU_PDU(tvb, pinfo, h282_tree); @@ -6325,7 +6325,7 @@ void proto_register_h282(void) { } /*--- proto_reg_handoff_h282 -------------------------------------------*/ -void proto_reg_handoff_h282(void) +void proto_reg_handoff_h282(void) { } diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index c9b0ad1908..9fb10b35ad 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -111,9 +111,9 @@ static gint ett_h283_NonStandardMessage = -1; #line 48 "../../asn1/h283/packet-h283-template.c" /* Subdissectors */ -static dissector_handle_t rdc_pdu_handle; -static dissector_handle_t rdc_device_list_handle; -static dissector_handle_t data_handle; +static dissector_handle_t rdc_pdu_handle; +static dissector_handle_t rdc_device_list_handle; +static dissector_handle_t data_handle; static gboolean info_is_set; @@ -578,7 +578,7 @@ dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) info_is_set = FALSE; - ti = proto_tree_add_item(tree, proto_h283, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_h283, tvb, 0, -1, ENC_NA); h283_tree = proto_item_add_subtree(ti, ett_h283); return dissect_LCTPDU_PDU(tvb, pinfo, h283_tree); @@ -762,12 +762,12 @@ void proto_register_h283(void) { } /*--- proto_reg_handoff_h283 -------------------------------------------*/ -void proto_reg_handoff_h283(void) +void proto_reg_handoff_h283(void) { - dissector_handle_t h283_udp_handle; + dissector_handle_t h283_udp_handle; h283_udp_handle = find_dissector(PFNAME); - dissector_add_handle("udp.port", h283_udp_handle); + dissector_add_handle("udp.port", h283_udp_handle); rdc_pdu_handle = find_dissector("rdc"); rdc_device_list_handle = find_dissector("rdc.device_list"); diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index 7ebcc81862..1d0bf06e2f 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -2527,7 +2527,7 @@ dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - ti = proto_tree_add_item(tree, proto_h501, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_h501, tvb, 0, -1, ENC_NA); h501_tree = proto_item_add_subtree(ti, ett_h501); return dissect_Message_PDU(tvb, pinfo, h501_tree); @@ -3697,7 +3697,7 @@ void proto_register_h501(void) { } /*--- proto_reg_handoff_h501 -------------------------------------------*/ -void proto_reg_handoff_h501(void) +void proto_reg_handoff_h501(void) { static gboolean h501_prefs_initialized = FALSE; static dissector_handle_t h501_udp_handle; diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index 5d7b7ebf50..46d81b37a0 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -69,7 +69,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = pinfo->pseudo_header->bthci.channel; if(tree){ - ti = proto_tree_add_item(tree, proto_hci_h1, tvb, 0, 0, FALSE); + ti = proto_tree_add_item(tree, proto_hci_h1, tvb, 0, 0, ENC_NA); hci_h1_tree = proto_item_add_subtree(ti, ett_hci_h1); if(pinfo->p2p_dir == P2P_DIR_SENT || diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 4802574422..490c1a54ae 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -92,7 +92,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_guint8(tvb, 0); if(tree){ - ti = proto_tree_add_item(tree, proto_hci_h4, tvb, 0, 1, FALSE); + ti = proto_tree_add_item(tree, proto_hci_h4, tvb, 0, 1, ENC_NA); hci_h4_tree = proto_item_add_subtree(ti, ett_hci_h4); } diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index 43a24e756c..cc7b8dafbe 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -537,7 +537,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *hdfs_tree = NULL; - ti = proto_tree_add_item(tree, proto_hdfs, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_hdfs, tvb, 0, -1, ENC_NA); hdfs_tree = proto_item_add_subtree(ti, ett_hdfs); /* Response */ diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index 9debc7ee33..0c576b8d9c 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -180,7 +180,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) /* token id = amount of bytes in previous */ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_ASCII|ENC_NA); *offset += len; - + len = tvb_get_guint8(tvb, *offset); proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenlen, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; @@ -198,7 +198,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += len; len = tvb_get_guint8(tvb, *offset); - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenlen, tvb, *offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenlen, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; /* token service = amount of bytes in previous; */ @@ -269,11 +269,11 @@ dissect_read_request(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) { /* 8 bytes = start offset */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_startoffset, tvb, *offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_startoffset, tvb, *offset, 8, ENC_BIG_ENDIAN); *offset += 8; /* 8 bytes = block length */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_blocklen, tvb, *offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_blocklen, tvb, *offset, 8, ENC_BIG_ENDIAN); *offset += 8; } @@ -342,7 +342,7 @@ dissect_header(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int* offset){ /* decodes the write response messages */ static void -dissect_write_response(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int offset) +dissect_write_response(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int offset) { /* 4 bytes = packetsize */ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_packetsize, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -405,7 +405,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *hdfsdata_tree = NULL; - ti = proto_tree_add_item(tree, proto_hdfsdata, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_hdfsdata, tvb, offset, -1, ENC_NA); hdfsdata_tree = proto_item_add_subtree(ti, ett_hdfsdata); /* if only 1 bytes packet must just contain just the pipeline status */ @@ -466,7 +466,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* write responses store the data length in the first 4 bytes. This length does not include 21 bits of header */ - } else if (tvb_reported_length(tvb) >= 4 && tvb_get_ntohl(tvb, 0) == + } else if (tvb_reported_length(tvb) >= 4 && tvb_get_ntohl(tvb, 0) == tvb_reported_length(tvb) - WRITE_RESP_HEAD_LEN) { dissect_write_response(tvb, hdfsdata_tree, offset); diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 7099a8d8a3..36f82b521b 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -436,7 +436,7 @@ dissect_hip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* populate a tree in the second pane with the status of the link layer (i.e. none) */ if(tree) { - ti = proto_tree_add_item(tree, proto_hip, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_hip, tvb, 0, -1, ENC_NA); hip_tree = proto_item_add_subtree(ti, ett_hip); proto_tree_add_item(hip_tree, hf_hip_proto, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -660,7 +660,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, tvb, newoffset, 16, ENC_NA); - newoffset += 16; + newoffset += 16; tlv_len -= 24; } else if (locator_type == 1) { /* Locator types 1 and 0 RFC 5206 section 4.2.*/ @@ -671,7 +671,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, tvb, newoffset, 16, ENC_NA); - newoffset += 16; + newoffset += 16; tlv_len -= 28; } else if (locator_type == 2) { /* Locator type 2 RFC 5770 section 5.7. */ diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index f1c16669d1..b750f89437 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -2038,7 +2038,7 @@ dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HNBAP"); /* create the hnbap protocol tree */ - hnbap_item = proto_tree_add_item(tree, proto_hnbap, tvb, 0, -1, FALSE); + hnbap_item = proto_tree_add_item(tree, proto_hnbap, tvb, 0, -1, ENC_NA); hnbap_tree = proto_item_add_subtree(hnbap_item, ett_hnbap); dissect_HNBAP_PDU_PDU(tvb, pinfo, hnbap_tree); diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index d3dde4090f..d74a2316bb 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -2840,7 +2840,7 @@ dissect_homeplug_av(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) col_set_str(pinfo->cinfo, COL_INFO, "MAC Management"); if (tree) { - ti = proto_tree_add_item(tree, proto_homeplug_av, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_homeplug_av, tvb, 0, -1, ENC_NA); homeplug_av_tree = proto_item_add_subtree(ti, ett_homeplug_av); } diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index a47e6982b0..bcc6a642a7 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1324,7 +1324,7 @@ dissect_homeplug(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) homeplug_offset = 0; if (tree) { - it = proto_tree_add_item(tree, proto_homeplug, tvb, homeplug_offset, -1, FALSE); + it = proto_tree_add_item(tree, proto_homeplug, tvb, homeplug_offset, -1, ENC_NA); homeplug_tree = proto_item_add_subtree(it, ett_homeplug); cursor = ptvcursor_new(homeplug_tree, tvb, 0); } diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index d167d13025..07fe00c2ea 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -30,14 +30,14 @@ * "Traffic Mirroring" in Appendix B of the HP manual * "Management and Configuration Guide for the ProCurve Series * 3500, 3500yl, 5400zl, 6200yl, 6600, and 8200zl Switches (September 2009)" - * + * * Format: * The above manual indicates that the encapsulatedmirrored frame is transmitted * on the network as a [UDP] packet which has 54 bytes preceding the mirrored frame. - * Examining a sample capture shows that this means that the data payload - * of the UDP packet consists of a 12 byte "header" followed by the + * Examining a sample capture shows that this means that the data payload + * of the UDP packet consists of a 12 byte "header" followed by the * byes of the mirrored frame. - * + * */ #ifdef HAVE_CONFIG_H @@ -70,7 +70,7 @@ dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, PROTO_SHORT_NAME ":"); if (tree) { - ti = proto_tree_add_item(tree, proto_hp_erm, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_hp_erm, tvb, 0, -1, ENC_NA); hp_erm_tree = proto_item_add_subtree(ti, ett_hp_erm); proto_tree_add_item(hp_erm_tree, hf_hp_erm_unknown, tvb, 0, 12, ENC_NA); } diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index 56731b38b2..a6edb5cb08 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.c @@ -67,7 +67,7 @@ dissect_hpext(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sxsap = tvb_get_ntohs(tvb, 5); if (tree) { - ti = proto_tree_add_item(tree, proto_hpext, tvb, 0, 7, FALSE); + ti = proto_tree_add_item(tree, proto_hpext, tvb, 0, 7, ENC_NA); hpext_tree = proto_item_add_subtree(ti, ett_hpext); proto_tree_add_text(hpext_tree, tvb, 0, 3, "Reserved"); proto_tree_add_uint(hpext_tree, hf_hpext_dxsap, tvb, 3, diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index d8d0468e26..0943f80607 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.c @@ -94,7 +94,7 @@ dissect_hpsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { guint16 offset =0; - ti = proto_tree_add_item(tree, proto_hpsw, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_hpsw, tvb, 0, -1, ENC_NA); hp_tree = proto_item_add_subtree(ti, ett_hpsw); proto_tree_add_uint(hp_tree, hf_hpsw_version, tvb, 0, 1, version); offset++; diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 597a237e19..465d9fa975 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -65,7 +65,7 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) strPtr = ether_to_str(mac_addr); HP_Mac = "03:00:c7:00:00:ee"; /* - * Check to see if SNAP frame is a HP Teaming frame or + * Check to see if SNAP frame is a HP Teaming frame or * if it is really just SNAP */ if (memcmp(strPtr, HP_Mac, 17) == 0) { @@ -77,7 +77,7 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, "Port MAC = %s ", strPtr); if (tree) { /* we are being asked for details */ - hpteam_item = proto_tree_add_item(tree, proto_hpteam, tvb, 0, -1, FALSE); + hpteam_item = proto_tree_add_item(tree, proto_hpteam, tvb, 0, -1, ENC_NA); hpteam_tree = proto_item_add_subtree(hpteam_item, ett_hpteam); proto_tree_add_item(hpteam_tree, hf_hpteam, tvb, offset, 58, ENC_NA); } @@ -107,7 +107,7 @@ void proto_register_hpteam(void) proto_hpteam = proto_register_protocol ("HP NIC Teaming Heartbeat", "HPTEAM", "hpteam"); - /*Tied into the LLC dissector so register the OUI with LLC*/ + /*Tied into the LLC dissector so register the OUI with LLC*/ llc_add_oui(OUI_HP_2, "llc.hpteam_pid", "Hewlett Packard OUI PID", &hf_pid); proto_register_field_array(proto_hpteam, hf_data, array_length(hf_data)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 66b08755cd..2877ee4aba 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -375,7 +375,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gchar auth_buf[8 + 1]; offset = 0; - ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, -1, ENC_NA); hsrp_tree = proto_item_add_subtree(ti, ett_hsrp); proto_tree_add_item(hsrp_tree, hf_hsrp_version, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -443,7 +443,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRPv2"); if (tree) { - ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, -1, ENC_NA); hsrp_tree = proto_item_add_subtree(ti, ett_hsrp); } diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 2b3d851fc6..14356617d0 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -211,7 +211,7 @@ static gboolean http_decompress_body = FALSE; /* Simple Service Discovery Protocol * SSDP is implemented atop HTTP (yes, it really *does* run over UDP). - * SSDP is the discovery protocol of Universal Plug and Play + * SSDP is the discovery protocol of Universal Plug and Play * UPnP http://www.upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1.pdf */ #define TCP_PORT_SSDP 1900 @@ -688,7 +688,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, orig_offset = offset; if (tree) { ti = proto_tree_add_item(tree, proto_http, tvb, offset, -1, - FALSE); + ENC_NA); http_tree = proto_item_add_subtree(ti, ett_http); } @@ -1599,7 +1599,7 @@ http_payload_subdissector(tvbuff_t *tvb, proto_tree *tree, * Create a proxy-connect subtree */ if(tree) { - item = proto_tree_add_item(tree, proto_http, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_http, tvb, 0, -1, ENC_NA); proxy_tree = proto_item_add_subtree(item, ett_http); item = proto_tree_add_string(proxy_tree, hf_http_proxy_connect_host, @@ -2674,7 +2674,7 @@ dissect_message_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, " (message/http)"); if (tree) { ti = proto_tree_add_item(tree, proto_message_http, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_message_http); while (tvb_reported_length_remaining(tvb, offset) != 0) { len = tvb_find_line_end(tvb, offset, diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index b7f6294465..c6590b3957 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.c @@ -6,7 +6,7 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * Copyright 2002 Richard Sharpe <rsharpe@richardsharpe.com> + * Copyright 2002 Richard Sharpe <rsharpe@richardsharpe.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -40,7 +40,7 @@ static int hf_hs_tagno = -1; static int hf_hs_lastfrag = -1; static int hf_hs_fragno = -1; -static gint ett_hyperscsi = -1; +static gint ett_hyperscsi = -1; static gint ett_hs_hdr = -1; static gint ett_hs_pdu = -1; @@ -65,7 +65,7 @@ static const true_false_string tfs_lastfrag = { #define HSCSI_OPCODE_REMOTE_REPLY 0x35 static const value_string hscsi_opcodes[] = { - { HSCSI_OPCODE_REQUEST, "Command Block Encap Request"}, + { HSCSI_OPCODE_REQUEST, "Command Block Encap Request"}, { HSCSI_OPCODE_REPLY, "Command Block Encap Reply"}, { HSCSI_OPCODE_DEV_DISCOVERY, "Device Discovery Reply"}, { HSCSI_OPCODE_ADN_REQUEST, "Auth/Device Neg Request"}, @@ -95,9 +95,9 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_hyperscsi, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_hyperscsi, tvb, offset, -1, ENC_NA); hs_tree = proto_item_add_subtree(ti, ett_hyperscsi); - } + } hs_hdr1 = tvb_get_guint8(tvb, offset); offset++; @@ -129,8 +129,8 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - /* - * Now, add the PDU + /* + * Now, add the PDU */ hs_ver = tvb_get_guint8(tvb, offset++); @@ -160,8 +160,8 @@ proto_register_hyperscsi(void) { static hf_register_info hf[] = { - { &hf_hs_res, - { "Reserved", "hyperscsi.reserved", FT_UINT8, BASE_DEC, NULL, 0x0, + { &hf_hs_res, + { "Reserved", "hyperscsi.reserved", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_hs_tagno, @@ -171,16 +171,16 @@ proto_register_hyperscsi(void) { &hf_hs_lastfrag, { "Last Fragment", "hyperscsi.lastfrag", FT_BOOLEAN, 8, TFS(&tfs_lastfrag), 0x04, NULL, HFILL}}, - { &hf_hs_fragno, + { &hf_hs_fragno, { "Fragment No", "hyperscsi.fragno", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_hs_ver, - { "HyperSCSI Version", "hyperscsi.version", FT_UINT8, BASE_DEC, NULL, + { "HyperSCSI Version", "hyperscsi.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_hs_cmd, - { "HyperSCSI Command", "hyperscsi.cmd", FT_UINT8, BASE_DEC, VALS(hscsi_opcodes), 0x0, + { "HyperSCSI Command", "hyperscsi.cmd", FT_UINT8, BASE_DEC, VALS(hscsi_opcodes), 0x0, NULL, HFILL}}, }; @@ -189,7 +189,7 @@ proto_register_hyperscsi(void) &ett_hs_hdr, &ett_hs_pdu, }; - + proto_hyperscsi = proto_register_protocol("HyperSCSI", "HyperSCSI", "hyperscsi"); proto_register_field_array(proto_hyperscsi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 1012393217..0e61c9137b 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -425,7 +425,7 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_iapp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_iapp, tvb, 0, -1, ENC_NA); iapp_tree = proto_item_add_subtree(ti, ett_iapp); /* common header for all IAPP frames */ diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index ca207fe3cb..d3db34a862 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1037,7 +1037,7 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* add the 'iax2' tree to the main tree */ if (tree) { - iax2_item = proto_tree_add_item (tree, proto_iax2, tvb, offset, -1, FALSE); + iax2_item = proto_tree_add_item (tree, proto_iax2, tvb, offset, -1, ENC_NA); iax2_tree = proto_item_add_subtree (iax2_item, ett_iax2); } diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 884024cc96..6977348e1c 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -98,7 +98,7 @@ dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_icap, tvb, offset, -1, - FALSE); + ENC_NA); icap_tree = proto_item_add_subtree(ti, ett_icap); } diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 8b85468651..3eced10c77 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1096,7 +1096,7 @@ static void dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_icep, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_icep, tvb, 0, -1, ENC_NA); icep_tree = proto_item_add_subtree(ti, ett_icep); diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index ba7b248641..77b3eb3ddd 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -832,7 +832,7 @@ static guint32 get_best_guess_mstimeofday(tvbuff_t *tvb, gint offset, guint32 co if (be_ts < MSPERDAY && le_ts < MSPERDAY) { guint32 saved_be_ts = be_ts; - guint32 saved_le_ts = le_ts; + guint32 saved_le_ts = le_ts; /* Is this a rollover to a new day, clocks not synchronized, different * timezones between originate and receive/transmit, .. what??? */ @@ -930,7 +930,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_length(tvb); reported_length = tvb_reported_length(tvb); - ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, FALSE); + ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, ENC_NA); icmp_tree = proto_item_add_subtree(ti, ett_icmp); ti = proto_tree_add_item(icmp_tree, hf_icmp_type, tvb, 0, 1, ENC_BIG_ENDIAN); @@ -1082,7 +1082,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - /* Make sure we have enough bytes in the payload before trying to + /* Make sure we have enough bytes in the payload before trying to * see if the data looks like a timestamp; otherwise we'll get * malformed packets as we try to access data that isn't there. */ if (tvb_length_remaining(tvb, 8) < 8) { @@ -1093,7 +1093,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Interpret the first 8 bytes of the icmp data as a timestamp * But only if it does look like it's a timestamp. - * + * * FIXME: * Timestamps could be in different formats depending on the OS */ @@ -1143,9 +1143,9 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint32 frame_ts, orig_ts; - frame_ts = ((pinfo->fd->abs_ts.secs * 1000) + + frame_ts = ((pinfo->fd->abs_ts.secs * 1000) + (pinfo->fd->abs_ts.nsecs / 1000000)) % 86400000; - + orig_ts = get_best_guess_mstimeofday(tvb, 8, frame_ts); proto_tree_add_text(icmp_tree, tvb, 8, 4, "Originate timestamp: %s after midnight UTC", diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 2fb5b04f5f..8d04affca7 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -3099,7 +3099,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; if (tree) { - ti = proto_tree_add_item(tree, proto_icmpv6, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_icmpv6, tvb, offset, -1, ENC_NA); icmp6_tree = proto_item_add_subtree(ti, ett_icmpv6); /* Type */ diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 8fc3042fd9..6aef654893 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -167,7 +167,7 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree,proto_icp, tvb, 0, message_length, FALSE); + ti = proto_tree_add_item(tree,proto_icp, tvb, 0, message_length, ENC_NA); icp_tree = proto_item_add_subtree(ti, ett_icp); proto_tree_add_uint(icp_tree,hf_icp_opcode, tvb, 0, 1, opcode); diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index 91bb7bca58..2cd00b8926 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -654,7 +654,7 @@ static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t top_tree=parent_tree; if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_idmp, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_idmp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_idmp); } diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index 759d5dcf98..355f6d2bed 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -90,7 +90,7 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, FALSE); + ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, ENC_NA); idp_tree = proto_item_add_subtree(ti, ett_idp); } diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 76f8e7f169..f7466ec732 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -124,7 +124,7 @@ typedef struct { gboolean OFF; gboolean ON; - gboolean UP; + gboolean UP; gboolean DOWN; /* QOC qualifier-bits */ @@ -1118,7 +1118,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /*** *** DISSECT 'Packet Details' *** ***/ - it104 = proto_tree_add_item(tree, proto_iec104asdu, tvb, 0, -1, FALSE); + it104 = proto_tree_add_item(tree, proto_iec104asdu, tvb, 0, -1, ENC_NA); /* 'Packet Details': ROOT ITEM */ proto_item_append_text(it104, ": %s'%s'", res->str, Len >= ASDU_HEAD_LEN ? val_to_str(asduh->TypeId, asdu_lngtypes, "<Unknown TypeId>") : ""); @@ -1176,7 +1176,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case C_CS_NA_1: /* create subtree for the signal values ... */ - itSignal = proto_tree_add_item( trHead, proto_iec104asdu, tvb, offset, -1, FALSE ); + itSignal = proto_tree_add_item( trHead, proto_iec104asdu, tvb, offset, -1, ENC_NA ); proto_item_append_text(itSignal, ": Value"); trSignal = proto_item_add_subtree( itSignal, ett_asdu ); @@ -1606,7 +1606,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /*** *** DISSECT 'Packet Details' *** ***/ - it104 = proto_tree_add_item(tree, proto_iec104apci, tvb, 0, Off+ APCI_LEN, FALSE); + it104 = proto_tree_add_item(tree, proto_iec104apci, tvb, 0, Off+ APCI_LEN, ENC_NA); /* 'Packet Details': ROOT ITEM */ proto_item_append_text(it104, ": %s", res->str); diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index a46fbe0844..b084ee5f14 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -132,11 +132,11 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "AVB Transportation Protocol"); if (tree) { - ti = proto_tree_add_item(tree, proto_1722, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_1722, tvb, 0, -1, ENC_NA); ieee1722_tree = proto_item_add_subtree(ti, ett_1722); - /* Add the CD and Subtype fields + /* Add the CD and Subtype fields * CD field is 1 bit * Subtype field is 7 bits */ @@ -156,7 +156,7 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ieee1722_tree, hf_1722_tufield, tvb, IEEE_1722_TU_FIELD_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ieee1722_tree, hf_1722_stream_id, tvb, + proto_tree_add_item(ieee1722_tree, hf_1722_stream_id, tvb, IEEE_1722_STREAM_ID_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_avbtp_timestamp, tvb, @@ -170,10 +170,10 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ieee1722_tree, hf_1722_tag, tvb, IEEE_1722_TAG_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ieee1722_tree, hf_1722_channel, tvb, + proto_tree_add_item(ieee1722_tree, hf_1722_channel, tvb, IEEE_1722_TAG_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ieee1722_tree, hf_1722_tcode, tvb, + proto_tree_add_item(ieee1722_tree, hf_1722_tcode, tvb, IEEE_1722_TCODE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_sy, tvb, IEEE_1722_TCODE_OFFSET, 1, ENC_BIG_ENDIAN); @@ -203,13 +203,13 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ieee1722_tree, hf_1722_syt, tvb, IEEE_1722_SYT_OFFSET, 2, ENC_BIG_ENDIAN); - /* Calculate the remaining size by subtracting the CIP header size + /* Calculate the remaining size by subtracting the CIP header size from the value in the packet data length field */ datalen = tvb_get_ntohs(tvb, IEEE_1722_PKT_DATA_LENGTH_OFFSET); datalen -= IEEE_1722_CIP_HEADER_SIZE; /* Make the Audio sample tree. */ - ti = proto_tree_add_item(ieee1722_tree, hf_1722_data, tvb, + ti = proto_tree_add_item(ieee1722_tree, hf_1722_data, tvb, IEEE_1722_DATA_OFFSET, datalen, ENC_NA); audio_tree = proto_item_add_subtree(ti, ett_1722_audio); @@ -240,36 +240,36 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Register the protocol with Wireshark */ -void proto_register_1722(void) +void proto_register_1722(void) { static hf_register_info hf[] = { { &hf_1722_cdfield, - { "Control/Data Indicator", "ieee1722.cdfield", - FT_BOOLEAN, 8, NULL, IEEE_1722_CD_MASK, NULL, HFILL } + { "Control/Data Indicator", "ieee1722.cdfield", + FT_BOOLEAN, 8, NULL, IEEE_1722_CD_MASK, NULL, HFILL } }, { &hf_1722_subtype, { "AVBTP Subtype", "ieee1722.subtype", - FT_UINT8, BASE_HEX, NULL, IEEE_1722_SUBTYPE_MASK, NULL, HFILL } + FT_UINT8, BASE_HEX, NULL, IEEE_1722_SUBTYPE_MASK, NULL, HFILL } }, { &hf_1722_svfield, { "AVBTP Stream ID Valid", "ieee1722.svfield", - FT_BOOLEAN, 8, NULL, IEEE_1722_SV_MASK, NULL, HFILL } + FT_BOOLEAN, 8, NULL, IEEE_1722_SV_MASK, NULL, HFILL } }, { &hf_1722_verfield, { "AVBTP Version", "ieee1722.verfield", - FT_UINT8, BASE_HEX, NULL, IEEE_1722_VER_MASK, NULL, HFILL } + FT_UINT8, BASE_HEX, NULL, IEEE_1722_VER_MASK, NULL, HFILL } }, { &hf_1722_mrfield, { "AVBTP Media Reset", "ieee1722.mrfield", - FT_UINT8, BASE_DEC, NULL, IEEE_1722_MR_MASK, NULL, HFILL } + FT_UINT8, BASE_DEC, NULL, IEEE_1722_MR_MASK, NULL, HFILL } }, { &hf_1722_gvfield, { "AVBTP Gateway Info Valid", "ieee1722.gvfield", - FT_BOOLEAN, 8, NULL, IEEE_1722_GV_MASK, NULL, HFILL } + FT_BOOLEAN, 8, NULL, IEEE_1722_GV_MASK, NULL, HFILL } }, { &hf_1722_tvfield, { "Source Timestamp Valid", "ieee1722.tvfield", - FT_BOOLEAN, 8, NULL, IEEE_1722_TV_MASK, NULL, HFILL } + FT_BOOLEAN, 8, NULL, IEEE_1722_TV_MASK, NULL, HFILL } }, { &hf_1722_seqnum, { "Sequence Number", "ieee1722.seqnum", @@ -375,7 +375,7 @@ void proto_register_1722(void) proto_register_subtree_array(ett, array_length(ett)); } -void proto_reg_handoff_1722(void) +void proto_reg_handoff_1722(void) { dissector_handle_t avbtp_handle; diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 2b7a682092..810d073e50 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -232,7 +232,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if(tree) { - ti = proto_tree_add_item(tree, proto_prism, tvb, 0, 144, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_prism, tvb, 0, 144, ENC_NA); prism_tree = proto_item_add_subtree(ti, ett_prism); } diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index a5f47f09b0..23789070fd 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -66,7 +66,7 @@ dissect_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pinfo->pseudo_header->ieee_802_11.signal_level); if (tree) { - ti = proto_tree_add_item(tree, proto_radio, tvb, 0, 0, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_radio, tvb, 0, 0, ENC_NA); radio_tree = proto_item_add_subtree (ti, ett_radio); proto_tree_add_uint64_format(radio_tree, hf_data_rate, tvb, 0, 0, diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index 5765ecd0f8..9c8e16613c 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -373,7 +373,7 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Dissect the AVS header */ if (tree) { - ti = proto_tree_add_item(tree, proto_wlancap, tvb, 0, length, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_wlancap, tvb, 0, length, ENC_NA); wlan_tree = proto_item_add_subtree(ti, ett_radio); proto_tree_add_item(wlan_tree, hf_wlan_magic, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(wlan_tree, hf_wlan_version, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 9af5d2b59c..0c80e5bec6 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -9653,7 +9653,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, CHECK_DISPLAY_AS_X(data_handle,proto_wlan_mgt, tvb, pinfo, tree); - ti = proto_tree_add_item (tree, proto_wlan_mgt, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_wlan_mgt, tvb, 0, -1, ENC_NA); mgt_tree = proto_item_add_subtree (ti, ett_80211_mgt); switch (COMPOSE_FRAME_TYPE(fcf)) diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index d59ac234e7..b36d1f38d5 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -95,7 +95,7 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_ieee802a, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ieee802a, tvb, 0, -1, ENC_NA); ieee802a_tree = proto_item_add_subtree(ti, ett_ieee802a); } else ieee802a_tree = NULL; diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index f354420c70..3e8abe22c1 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -143,7 +143,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off return offset + tvb_length_remaining(tvb, offset); } - item = proto_tree_add_item(parent_tree, proto_igap, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_igap, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_igap); col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGAP"); diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 674159656e..4442ed5c0b 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -898,7 +898,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) unsigned char type; guint32 dst; - item = proto_tree_add_item(parent_tree, proto_igmp, tvb, offset, -1, ENC_BIG_ENDIAN); + item = proto_tree_add_item(parent_tree, proto_igmp, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_igmp); col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGMP"); diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index 651e080123..63e39add7f 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -177,7 +177,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) * items to the protocol tree. */ if (tree) { - ti = proto_tree_add_item(tree, proto_gif, tvb, 0, -1, TRUE); + ti = proto_tree_add_item(tree, proto_gif, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Version: %s", str); gif_tree = proto_item_add_subtree(ti, ett_gif); /* GIF signature */ diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index 1e18bce6af..529908bf72 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -779,7 +779,7 @@ dissect_jfif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_jfif, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_jfif); proto_tree_add_item(subtree, hf_marker, tvb, 0, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index 781b86dc80..6678aac1eb 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -236,7 +236,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_append_str(pinfo->cinfo, COL_INFO, " (PNG)"); if(parent_tree){ - ti=proto_tree_add_item(parent_tree, proto_png, tvb, offset, -1, FALSE); + ti=proto_tree_add_item(parent_tree, proto_png, tvb, offset, -1, ENC_NA); tree=proto_item_add_subtree(ti, ett_png); } diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index 6f0f94d517..31701d21b9 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -80,7 +80,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_imap, tvb, offset, -1, - FALSE); + ENC_NA); imap_tree = proto_item_add_subtree(ti, ett_imap); if (is_request) { diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 7753ea1b49..82a3f85f9e 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -680,7 +680,7 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if(tree){ - item = proto_tree_add_item(tree, proto_imf, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_imf, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_imf); } diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index b29b1df734..89759fbbbb 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -9363,7 +9363,7 @@ dissect_inap(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_inap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_inap, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_inap); } inap_pdu_type = tvb_get_guint8(tvb, offset)&0x0f; diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index db95005ac2..bc449df147 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1668,7 +1668,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } /* Top Level Packet */ - infiniband_packet = proto_tree_add_item(tree, proto_infiniband, tvb, offset, -1, FALSE); + infiniband_packet = proto_tree_add_item(tree, proto_infiniband, tvb, offset, -1, ENC_NA); /* Headers Level Tree */ all_headers_tree = proto_item_add_subtree(infiniband_packet, ett_all_headers); @@ -2096,7 +2096,7 @@ dissect_infiniband_link(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Top Level Packet */ - infiniband_link_packet = proto_tree_add_item(tree, proto_infiniband_link, tvb, offset, -1, FALSE); + infiniband_link_packet = proto_tree_add_item(tree, proto_infiniband_link, tvb, offset, -1, ENC_NA); /* Headers Level Tree */ link_tree = proto_item_add_subtree(infiniband_link_packet, ett_link); diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c index bb1e4a8761..5437379d80 100644 --- a/epan/dissectors/packet-interlink.c +++ b/epan/dissectors/packet-interlink.c @@ -86,7 +86,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_item *il_item; il_item = proto_tree_add_item(tree, proto_interlink, - tvb, 0, 16, FALSE); + tvb, 0, 16, ENC_NA); if (il_item) il_tree = proto_item_add_subtree(il_item, ett_interlink); } diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 8c8bc65072..d2e82505ae 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1371,7 +1371,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) hlen = lo_nibble(iph->ip_v_hl) * 4; /* IP header length, in bytes */ if (tree) { - ti = proto_tree_add_item(tree, proto_ip, tvb, offset, hlen, FALSE); + ti = proto_tree_add_item(tree, proto_ip, tvb, offset, hlen, ENC_NA); ip_tree = proto_item_add_subtree(ti, ett_ip); proto_tree_add_uint(ip_tree, hf_ip_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index 9a2b29a719..448b9766b6 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -761,7 +761,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!tree) return; - ti = proto_tree_add_item(tree, proto_ipdc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ipdc, tvb, 0, -1, ENC_NA); ipdc_tree = proto_item_add_subtree(ti, ett_ipdc); proto_tree_add_item(ipdc_tree, hf_ipdc_nr, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ipdc_tree, hf_ipdc_ns, tvb, 1, 1, ENC_BIG_ENDIAN); @@ -786,7 +786,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TEXT_UNDEFINED)); - ti = proto_tree_add_item(tree, proto_ipdc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ipdc, tvb, 0, -1, ENC_NA); ipdc_tree = proto_item_add_subtree(ti, ett_ipdc); proto_tree_add_item(ipdc_tree, hf_ipdc_nr, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 6cb6fc2332..f2ceb7f0dc 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1353,7 +1353,7 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) current_pinfo = pinfo; if (tree) { - ti = proto_tree_add_item(tree, proto_ipmi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ipmi, tvb, 0, -1, ENC_NA); ipmi_tree = proto_item_add_subtree(ti, ett_ipmi); } diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 21b374fbbc..385187dacb 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -74,7 +74,7 @@ dissect_ipnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* populate a tree in the second pane with the IPNET header data */ if(tree) { - ti = proto_tree_add_item (tree, proto_ipnet, tvb, 0, 24, FALSE); + ti = proto_tree_add_item (tree, proto_ipnet, tvb, 0, 24, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_raw); proto_tree_add_item(fh_tree, hf_version, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 48b44dc170..c649e96e51 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -200,7 +200,7 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ipp, tvb, offset, -1, - FALSE); + ENC_NA); ipp_tree = proto_item_add_subtree(ti, ett_ipp); proto_tree_add_text(ipp_tree, tvb, offset, 2, "Version: %u.%u", @@ -583,7 +583,7 @@ add_integer_value(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, ns.secs=tvb_get_ntohl(tvb, offset); ns.nsecs=0; proto_tree_add_time(tree, hf_ipp_timestamp, tvb, offset, 4, &ns); - } + } else if((name_length > 5) && name_val && !strcmp(name_val, "printer-state")){ guint32 printer_state_reason; diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index f561e5465e..b6dc2861b8 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -103,7 +103,7 @@ packet_is_tcpencap(tvbuff_t *tvb, packet_info *pinfo, guint32 offset) } /* - * TCP Encapsulation of IPsec Packets + * TCP Encapsulation of IPsec Packets * as supported by the cisco vpn3000 concentrator series */ static int @@ -130,7 +130,7 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* If the first 4 bytes are 0x01f401f4 (udp src and dst port = 500) we most likely have UDP (isakmp) traffic */ - + if (tvb_get_ntohl(tvb, 0) == 0x01f401f4) { /* UDP means ISAKMP */ protocol = TCP_ENCAP_P_UDP; } else { /* Hopefully ESP */ @@ -138,7 +138,7 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - tree_item = proto_tree_add_item(tree, proto_tcpencap, tvb, 0, -1, ENC_BIG_ENDIAN); + tree_item = proto_tree_add_item(tree, proto_tcpencap, tvb, 0, -1, ENC_NA); tcpencap_tree = proto_item_add_subtree(tree_item, ett_tcpencap); /* Dissect the trailer following the encapsulated IPSEC/ISAKMP packet */ diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 9e4140e1a0..a5fba11583 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -600,7 +600,7 @@ filter_address_match(gchar *addr, gchar *filter, gint typ) guint addr_len = (guint)strlen(addr); guint filter_len = (guint)strlen(filter); - if(addr_len != filter_len) + if(addr_len != filter_len) return FALSE; /* No length specified */ @@ -609,7 +609,7 @@ filter_address_match(gchar *addr, gchar *filter, gint typ) { for(i = 0; i < addr_len; i++) { - if((filter[i] != IPSEC_SA_WILDCARDS_ANY) && (filter[i] != addr[i])) + if((filter[i] != IPSEC_SA_WILDCARDS_ANY) && (filter[i] != addr[i])) return FALSE; } return TRUE; @@ -618,11 +618,11 @@ filter_address_match(gchar *addr, gchar *filter, gint typ) { for(i = 0; i < (filter_len/4); i++) { - if((filter[i] != IPSEC_SA_WILDCARDS_ANY) && (filter[i] != addr[i])) + if((filter[i] != IPSEC_SA_WILDCARDS_ANY) && (filter[i] != addr[i])) return FALSE; } - if(filter[i] == IPSEC_SA_WILDCARDS_ANY) + if(filter[i] == IPSEC_SA_WILDCARDS_ANY) return TRUE; else if (filter_len % 4 != 0) { @@ -667,7 +667,7 @@ filter_spi_match(gchar *spi, gchar *filter) return FALSE; for(i = 0; filter[i]; i++) - if((filter[i] != IPSEC_SA_WILDCARDS_ANY) && (filter[i] != spi[i])) + if((filter[i] != IPSEC_SA_WILDCARDS_ANY) && (filter[i] != spi[i])) return FALSE; return TRUE; @@ -894,7 +894,7 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { /* !!! specify length */ - ti = proto_tree_add_item(tree, proto_ah, tvb, 0, advance, FALSE); + ti = proto_tree_add_item(tree, proto_ah, tvb, 0, advance, ENC_NA); ah_tree = proto_item_add_subtree(ti, ett_ah); proto_tree_add_text(ah_tree, tvb, @@ -1086,7 +1086,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) decrypt_dissect_ok = FALSE; i = 0; - ti = proto_tree_add_item(tree, proto_esp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_esp, tvb, 0, -1, ENC_NA); esp_tree = proto_item_add_subtree(ti, ett_esp); proto_tree_add_uint(esp_tree, hf_esp_spi, tvb, offsetof(struct newesp, esp_spi), 4, @@ -1911,9 +1911,9 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) g_free(ip_src); g_free(ip_dst); - if(esp_auth_key_len != 0) + if(esp_auth_key_len != 0) g_free(esp_auth_key); - if(esp_crypt_key_len != 0) + if(esp_crypt_key_len != 0) g_free(esp_crypt_key); } } @@ -2031,7 +2031,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { tvbuff_t *data, *decomp; - ti = proto_tree_add_item(tree, proto_ipcomp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ipcomp, tvb, 0, -1, ENC_NA); ipcomp_tree = proto_item_add_subtree(ti, ett_ipcomp); proto_tree_add_text(ipcomp_tree, tvb, @@ -2146,13 +2146,13 @@ proto_register_ipsec(void) }; static uat_field_t esp_uat_flds[] = { - UAT_FLD_VS(uat_esp_sa_records, protocol, "Protocol", esp_proto_type_vals, "Protocol used"), + UAT_FLD_VS(uat_esp_sa_records, protocol, "Protocol", esp_proto_type_vals, "Protocol used"), UAT_FLD_CSTRING(uat_esp_sa_records, srcIP, "Src IP", "Source Address"), UAT_FLD_CSTRING(uat_esp_sa_records, dstIP, "Dest IP", "Destination Address"), UAT_FLD_CSTRING(uat_esp_sa_records, spi, "SPI", "SPI"), - UAT_FLD_VS(uat_esp_sa_records, encryption_algo, "Encryption", esp_encryption_type_vals, "Encryption algorithm"), + UAT_FLD_VS(uat_esp_sa_records, encryption_algo, "Encryption", esp_encryption_type_vals, "Encryption algorithm"), UAT_FLD_CSTRING(uat_esp_sa_records, encryption_key, "Encryption Key", "Encryption Key"), - UAT_FLD_VS(uat_esp_sa_records, authentication_algo, "Authentication", esp_authentication_type_vals, "Authentication algorithm"), + UAT_FLD_VS(uat_esp_sa_records, authentication_algo, "Authentication", esp_authentication_type_vals, "Authentication algorithm"), UAT_FLD_CSTRING(uat_esp_sa_records, authentication_key, "Authentication Key", "Authentication Key"), UAT_END_FIELDS }; @@ -2215,7 +2215,7 @@ proto_register_ipsec(void) NULL, /* post update callback */ esp_uat_flds); /* UAT field definitions */ - prefs_register_uat_preference(esp_module, + prefs_register_uat_preference(esp_module, "sa_table", "ESP SAs", "Preconfigured ESP Security Associations", diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index 5e0e3269b0..d6c7afb74c 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.c @@ -73,7 +73,7 @@ static void dissect_ipsictl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_ipsictl, tvb, offset, remaining_length, FALSE); + ti = proto_tree_add_item(tree, proto_ipsictl, tvb, offset, remaining_length, ENC_NA); ipsictl_tree = proto_item_add_subtree(ti, ett_ipsictl); } diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 32a533a222..084fdab5ea 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1650,7 +1650,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ipv6_tc; const char *name; - ipv6_item = proto_tree_add_item(tree, proto_ipv6, tvb, offset, -1, FALSE); + ipv6_item = proto_tree_add_item(tree, proto_ipv6, tvb, offset, -1, ENC_NA); ipv6_tree = proto_item_add_subtree(ipv6_item, ett_ipv6); /* !!! warning: (4-bit) version, (6-bit) DSCP, (1-bit) ECN-ECT, (1-bit) ECN-CE and (20-bit) Flow */ diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index be0a114120..9466b0d7f3 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -101,7 +101,7 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) guint8 cnt = 0; int conn = 0; - item = proto_tree_add_item(parent_tree, proto_ipvs_syncd, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_ipvs_syncd, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_ipvs_syncd); diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index d0b45287c5..d1fb91e263 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -290,7 +290,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_ipx, tvb, 0, IPX_HEADER_LEN, FALSE); + ti = proto_tree_add_item(tree, proto_ipx, tvb, 0, IPX_HEADER_LEN, ENC_NA); ipx_tree = proto_item_add_subtree(ti, ett_ipx); } @@ -588,7 +588,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "SPX"); if (tree) { - ti = proto_tree_add_item(tree, proto_spx, tvb, 0, SPX_HEADER_LEN, FALSE); + ti = proto_tree_add_item(tree, proto_spx, tvb, 0, SPX_HEADER_LEN, ENC_NA); spx_tree = proto_item_add_subtree(ti, ett_spx); } @@ -846,7 +846,7 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_ipxmsg, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ipxmsg, tvb, 0, -1, ENC_NA); msg_tree = proto_item_add_subtree(ti, ett_ipxmsg); proto_tree_add_uint(msg_tree, hf_msg_conn, tvb, 0, 1, conn_number); @@ -881,7 +881,7 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_ipxrip, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ipxrip, tvb, 0, -1, ENC_NA); rip_tree = proto_item_add_subtree(ti, ett_ipxrip); if (operation < 2) { @@ -943,7 +943,7 @@ dissect_serialization(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_serialization, tvb, 0, -1, - FALSE); + ENC_NA); ser_tree = proto_item_add_subtree(ti, ett_serialization); } @@ -1227,7 +1227,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_sap, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sap, tvb, 0, -1, ENC_NA); sap_tree = proto_item_add_subtree(ti, ett_ipxsap); if (query.query_type >= 1 && query.query_type <= 4) { diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index de1c31e2f7..87ef5c0d64 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -138,7 +138,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ipxwan, tvb, 0, -1, - FALSE); + ENC_NA); ipxwan_tree = proto_item_add_subtree(ti, ett_ipxwan); } diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index 30185a451d..7b96e589ad 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -87,7 +87,7 @@ dissect_irc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_irc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_irc, tvb, 0, -1, ENC_NA); irc_tree = proto_item_add_subtree(ti, ett_irc); /* diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 989c3400b3..fa2294559d 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2654,7 +2654,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_isakmp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_isakmp, tvb, offset, -1, ENC_NA); isakmp_tree = proto_item_add_subtree(ti, ett_isakmp); } diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index cb44c3bce8..7bf56cdc12 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -98,7 +98,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->circuit_id = pinfo->pseudo_header->isdn.channel; if (tree) { - ti = proto_tree_add_item(tree, proto_isdn, tvb, 0, 0, FALSE); + ti = proto_tree_add_item(tree, proto_isdn, tvb, 0, 0, ENC_NA); isdn_tree = proto_item_add_subtree(ti, ett_isdn); proto_tree_add_uint(isdn_tree, hf_isdn_channel, tvb, 0, 0, diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 40759333f9..fb345a45ff 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -138,7 +138,7 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_isis, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_isis, tvb, 0, -1, ENC_NA); isis_tree = proto_item_add_subtree(ti, ett_isis); } diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index f63191466b..e1800ff684 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -343,7 +343,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre s_offset.offset_bits = 0; /* initialise bit offset */ poffset = &s_offset; - ismacryp_item = proto_tree_add_item(tree, proto_ismacryp, tvb, 0, -1, FALSE); + ismacryp_item = proto_tree_add_item(tree, proto_ismacryp, tvb, 0, -1, ENC_NA); ismacryp_tree = proto_item_add_subtree(ismacryp_item, ett_ismacryp); proto_item_append_text(tree, ", %s", "ismacryp packet"); /* add text to tree */ diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 8b1a2169b6..a073a53487 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -508,7 +508,7 @@ dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 3; /* skip the weird stuff, for now */ if (tree) { /* create display subtree for ismp */ - ti = proto_tree_add_item(tree, proto_ismp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ismp, tvb, offset, -1, ENC_NA); ismp_tree = proto_item_add_subtree(ti, ett_ismp); diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 38d1511546..724be7974e 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -582,7 +582,7 @@ dissect_isns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *tpayload; /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_isns, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_isns, tvb, 0, -1, ENC_NA); isns_tree = proto_item_add_subtree(ti, ett_isns); /* OK... Sort out the header */ diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index c40a11c56b..96d5f80e2b 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -7510,7 +7510,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, ENC_NA); isup_tree = proto_item_add_subtree(ti, ett_isup); @@ -7564,7 +7564,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_bicc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bicc, tvb, 0, -1, ENC_NA); bicc_tree = proto_item_add_subtree(ti, ett_bicc); @@ -7598,7 +7598,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, ENC_NA); isup_tree = proto_item_add_subtree(ti, ett_isup); } diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index a74d1a1b84..fd2f9c0bcd 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -221,7 +221,7 @@ dissect_itdm_125usec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - itdm_item = proto_tree_add_item(tree, proto_itdm, tvb, 0, -1, FALSE); + itdm_item = proto_tree_add_item(tree, proto_itdm, tvb, 0, -1, ENC_NA); itdm_tree = proto_item_add_subtree(itdm_item, ett_itdm); proto_tree_add_item(itdm_tree, hf_itdm_timestamp, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -316,7 +316,7 @@ dissect_itdm_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - itdm_ctl_item = proto_tree_add_item(tree, proto_itdm, tvb, 0, -1, FALSE); + itdm_ctl_item = proto_tree_add_item(tree, proto_itdm, tvb, 0, -1, ENC_NA); itdm_ctl_tree = proto_item_add_subtree(itdm_ctl_item, ett_itdm_ctl); /* These eventually should go into a SFP.0 dissector... */ @@ -369,7 +369,7 @@ dissect_itdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint32 flowid; - /* ZZZ for now, 125 usec mode and I-TDM control protocol + /* ZZZ for now, 125 usec mode and I-TDM control protocol * need to add 1ms mode */ if (tvb_length(tvb) < 18) return; diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 95539da872..b7955d5256 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -503,7 +503,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* DDP/RDMA protocol tree */ ddp_rdma_item = proto_tree_add_item(tree, proto_iwarp_ddp_rdmap, - tvb, offset, header_end, FALSE); + tvb, offset, header_end, ENC_NA); ddp_rdma_tree = proto_item_add_subtree(ddp_rdma_item, ett_iwarp_ddp_rdmap); diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 2a87e7871e..aae4c59319 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -481,7 +481,7 @@ dissect_mpa_req_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { mpa_item = proto_tree_add_item(tree, proto_iwarp_mpa, tvb, 0, - -1, FALSE); + -1, ENC_NA); mpa_tree = proto_item_add_subtree(mpa_item, ett_mpa); if (message_type == MPA_REQUEST_FRAME) { @@ -735,7 +735,7 @@ dissect_mpa_fpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } mpa_item = proto_tree_add_item(tree, proto_iwarp_mpa, tvb, 0, - -1, FALSE); + -1, ENC_NA); mpa_tree = proto_item_add_subtree(mpa_item, ett_mpa); mpa_header_item = proto_tree_add_item(mpa_tree, hf_mpa_fpdu, diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 904a002072..6577c9f34d 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -88,7 +88,7 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str(pinfo->cinfo, COL_INFO, "JPEG message"); if ( tree ) { - ti = proto_tree_add_item( tree, proto_jpeg, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_jpeg, tvb, offset, -1, ENC_NA ); jpeg_tree = proto_item_add_subtree( ti, ett_jpeg ); ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_main_hdr, tvb, offset, 8, ENC_NA); diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 3a9bea071e..c750e667cf 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -106,7 +106,7 @@ dissect_json(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_json, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_json, tvb, 0, -1, ENC_NA); json_tree = proto_item_add_subtree(ti, ett_json); if (data_name) diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index 1d743dfb7d..4ea9a57ea5 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -100,7 +100,7 @@ static void dissect_kdp(tvbuff_t *tvb, kdp_tree = NULL; flags_tree = NULL; - ti = proto_tree_add_item(tree, proto_kdp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_kdp, tvb, 0, -1, ENC_NA); kdp_tree = proto_item_add_subtree(ti, ett_kdp); version = tvb_get_guint8(tvb, 0); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index fb4b520ca9..0bb15fd0c8 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -4728,7 +4728,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); } if (tree) { - item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, ENC_NA); kerberos_tree = proto_item_add_subtree(item, ett_krb_kerberos); } show_krb_recordmark(kerberos_tree, tvb, offset, krb_rm); @@ -4779,7 +4779,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_clear(pinfo->cinfo, COL_INFO); } if (tree) { - item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, ENC_NA); kerberos_tree = proto_item_add_subtree(item, ett_krb_kerberos); } } diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 5811d1d16a..90153f717a 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -314,7 +314,7 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } /* create a tree for krb4 */ - item = proto_tree_add_item(parent_tree, proto_krb4, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_krb4, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_krb4); col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB4"); diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 70eb0e7458..63925630a7 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -203,7 +203,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ } /* Make the kink tree */ if(tree){ - ti = proto_tree_add_item(tree, proto_kink, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_kink, tvb, offset, -1, ENC_NA); kink_tree = proto_item_add_subtree(ti, ett_kink); } diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 2d8d02f708..b8779bac1f 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -130,7 +130,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_kismet, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_kismet, tvb, offset, -1, ENC_NA); kismet_tree = proto_item_add_subtree(ti, ett_kismet); } @@ -262,7 +262,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } offset = next_offset; } - + return TRUE; } @@ -283,11 +283,11 @@ proto_register_kismet(void) { static hf_register_info hf[] = { {&hf_kismet_response, - {"Response", "kismet.response", FT_BOOLEAN, BASE_NONE, + {"Response", "kismet.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if kismet response", HFILL}}, {&hf_kismet_request, - {"Request", "kismet.request", FT_BOOLEAN, BASE_NONE, + {"Request", "kismet.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if kismet request", HFILL}} }; diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index f81145c10b..9260d64614 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -2,7 +2,7 @@ * Routines for kpasswd packet dissection * Ronnie Sahlberg 2003 * - * See RFC 3244 + * See RFC 3244 * * $Id$ * @@ -92,9 +92,9 @@ static int dissect_kpasswd_newpassword(proto_tree *tree, tvbuff_t *tvb, int offs static ber_old_sequence_t ChangePasswdData_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_kpasswd_newpassword }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_cname }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_realm }, { 0, 0, 0, NULL } }; @@ -147,13 +147,13 @@ dissect_kpasswd_user_data_reply(packet_info *pinfo, tvbuff_t *tvb, proto_tree *t proto_tree_add_uint(tree, hf_kpasswd_result, tvb, offset, 2, result); offset+=2; if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(result, kpasswd_result_types, "Result: %u")); - + /* optional result string */ if(tvb_length_remaining(tvb, offset)){ - proto_tree_add_item(tree, hf_kpasswd_result_string, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_kpasswd_result_string, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); offset+=tvb_length_remaining(tvb, offset); } @@ -231,7 +231,7 @@ dissect_kpasswd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboo version=tvb_get_ntohs(tvb, offset+2); ap_req_len=tvb_get_ntohs(tvb, offset+4); if(tree){ - kpasswd_item=proto_tree_add_item(tree, proto_kpasswd, tvb, offset-krb_rm_size, message_len+krb_rm_size, FALSE); + kpasswd_item=proto_tree_add_item(tree, proto_kpasswd, tvb, offset-krb_rm_size, message_len+krb_rm_size, ENC_NA); kpasswd_tree=proto_item_add_subtree(kpasswd_item, ett_kpasswd); if (have_rm) { show_krb_recordmark(kpasswd_tree, tvb, offset-krb_rm_size, krb_rm); diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index e44868ea33..43e3d16fec 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -75,19 +75,19 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Layer1"); if (check_col(pinfo->cinfo, COL_DEF_SRC)) - col_set_str(pinfo->cinfo, COL_DEF_SRC, + col_set_str(pinfo->cinfo, COL_DEF_SRC, pinfo->pseudo_header->l1event.uton? "TE" : "NT"); if (check_col(pinfo->cinfo, COL_INFO)) { len = tvb_find_line_end(tvb, 0, tvb_ensure_length_remaining(tvb, 0), &next_offset, FALSE); - if(len>0) - col_add_str(pinfo->cinfo, COL_INFO, + if(len>0) + col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, 0, len)); } if (tree) { ti = proto_tree_add_item(tree, proto_l1_events, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); if (data_name) proto_item_append_text(ti, ": %s", data_name); subtree = proto_item_add_subtree(ti, ett_l1_events); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index cf184ad7f1..1a64e6e42b 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1521,7 +1521,7 @@ process_l2tpv3_data_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sid = tvb_get_ntohl(tvb, idx); if (tree) { - l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, FALSE); + l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, ENC_NA); l2tp_tree = proto_item_add_subtree(l2tp_item, ett_l2tp); proto_item_append_text(l2tp_item, " version 3"); @@ -1558,7 +1558,7 @@ process_l2tpv3_data_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sid = tvb_get_ntohl(tvb, idx); if (tree) { - l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, FALSE); + l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, ENC_NA); l2tp_tree = proto_item_add_subtree(l2tp_item, ett_l2tp); proto_item_append_text(l2tp_item, " version 3"); @@ -1653,7 +1653,7 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } if (tree) { - l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, FALSE); + l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, ENC_NA); l2tp_tree = proto_item_add_subtree(l2tp_item, ett_l2tp); proto_item_append_text(l2tp_item, " version 3"); @@ -1840,7 +1840,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - l2tp_item = proto_tree_add_item(tree,proto_l2tp, tvb, 0, -1, FALSE); + l2tp_item = proto_tree_add_item(tree,proto_l2tp, tvb, 0, -1, ENC_NA); l2tp_tree = proto_item_add_subtree(l2tp_item, ett_l2tp); ti = proto_tree_add_text(l2tp_tree, tvb, 0, 2, diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index af0068a00f..8a03a13bab 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -99,7 +99,7 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_lanforge, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lanforge, tvb, 0, -1, ENC_NA); lanforge_tree = proto_item_add_subtree(ti, ett_lanforge); diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index dc970d8b72..84efd9bd72 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -460,7 +460,7 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *direction_ti; lapd_ti = proto_tree_add_item(tree, proto_lapd, tvb, 0, -1, - FALSE); + ENC_NA); lapd_tree = proto_item_add_subtree(lapd_ti, ett_lapd); /* diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index b770e22e8f..29cad29480 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -240,7 +240,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - lapdm_ti = proto_tree_add_item(tree, proto_lapdm, tvb, 0, LAPDM_HEADER_LEN, FALSE); + lapdm_ti = proto_tree_add_item(tree, proto_lapdm, tvb, 0, LAPDM_HEADER_LEN, ENC_NA); lapdm_tree = proto_item_add_subtree(lapdm_ti, ett_lapdm); addr_ti = proto_tree_add_uint(lapdm_tree, hf_lapdm_address, tvb, 0, 1, addr); diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index ecd1afc931..6978f2c741 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -99,9 +99,9 @@ dissect_laplink_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, udp_ident_string); - + if (tree){ - ti = proto_tree_add_item(tree, proto_laplink, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_laplink, tvb, 0, -1, ENC_NA); laplink_tree = proto_item_add_subtree(ti, ett_laplink); proto_tree_add_uint(laplink_tree, hf_laplink_udp_ident, tvb, offset, 4, udp_ident); @@ -130,9 +130,9 @@ dissect_laplink_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tcp_ident, laplink_tcp_magic, "TCP TBA (%u)")); } - + if (tree){ - ti = proto_tree_add_item(tree, proto_laplink, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_laplink, tvb, 0, -1, ENC_NA); laplink_tree = proto_item_add_subtree(ti, ett_laplink); @@ -168,7 +168,7 @@ static void dissect_laplink_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tcp_dissect_pdus(tvb, pinfo, tree, laplink_desegment, - 6, get_laplink_pdu_len, + 6, get_laplink_pdu_len, dissect_laplink_tcp_pdu); } @@ -177,33 +177,33 @@ dissect_laplink_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_laplink(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_laplink_udp_ident, { "UDP Ident", "laplink.udp_ident", - FT_UINT32, BASE_HEX, VALS(laplink_udp_magic), 0x0, + FT_UINT32, BASE_HEX, VALS(laplink_udp_magic), 0x0, "Unknown magic", HFILL } }, { &hf_laplink_udp_name, { "UDP Name", "laplink.udp_name", - FT_STRINGZ, BASE_NONE, NULL, 0x0, + FT_STRINGZ, BASE_NONE, NULL, 0x0, "Machine name", HFILL } }, { &hf_laplink_tcp_ident, { "TCP Ident", "laplink.tcp_ident", - FT_UINT32, BASE_HEX, VALS(laplink_tcp_magic), 0x0, + FT_UINT32, BASE_HEX, VALS(laplink_tcp_magic), 0x0, "Unknown magic", HFILL } }, { &hf_laplink_tcp_length, { "TCP Data payload length", "laplink.tcp_length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "Length of remaining payload", HFILL } }, { &hf_laplink_tcp_data, { "Unknown TCP data", "laplink.tcp_data", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "TCP data", HFILL } }, }; diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c index 51bc82e298..dd3554ff05 100644 --- a/epan/dissectors/packet-lcsap.c +++ b/epan/dissectors/packet-lcsap.c @@ -33,7 +33,7 @@ * References: * ETSI TS 129 171 V9.2.0 (2010-10) */ - + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -2050,9 +2050,9 @@ dissect_lcsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LCSAP"); /* create the lcsap protocol tree */ - lcsap_item = proto_tree_add_item(tree, proto_lcsap, tvb, 0, -1, FALSE); + lcsap_item = proto_tree_add_item(tree, proto_lcsap, tvb, 0, -1, ENC_NA); lcsap_tree = proto_item_add_subtree(lcsap_item, ett_lcsap); - + dissect_LCS_AP_PDU_PDU(tvb, pinfo, lcsap_tree); } @@ -2066,7 +2066,7 @@ proto_reg_handoff_lcsap(void) if (!Initialized) { lcsap_handle = find_dissector("lcsap"); - + dissector_add_handle("sctp.port", lcsap_handle); /* for "decode-as" */ dissector_add_uint("sctp.ppi", LCS_AP_PAYLOAD_PROTOCOL_ID, lcsap_handle); Initialized=TRUE; @@ -2625,13 +2625,13 @@ void proto_register_lcsap(void) { /* Register dissector tables */ lcsap_ies_dissector_table = register_dissector_table("lcsap.ies", "LCS-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC); - + lcsap_extension_dissector_table = register_dissector_table("lcsap.extension", "LCS-AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC); lcsap_proc_imsg_dissector_table = register_dissector_table("lcsap.proc.imsg", "LCS-AP-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC); lcsap_proc_sout_dissector_table = register_dissector_table("lcsap.proc.sout", "LCS-AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC); lcsap_proc_uout_dissector_table = register_dissector_table("lcsap.proc.uout", "LCS-AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); - + /* Register configuration options for ports */ lcsap_module = prefs_register_protocol(proto_lcsap, proto_reg_handoff_lcsap); diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 466149591d..1eac1b6017 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -2620,7 +2620,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti=proto_tree_add_item(tree, proto_ldp, tvb, 0, -1, FALSE); + ti=proto_tree_add_item(tree, proto_ldp, tvb, 0, -1, ENC_NA); pdu_tree = proto_item_add_subtree(ti, ett_ldp); proto_tree_add_item(pdu_tree, hf_ldp_version, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index d1aaf1bfb6..3ba601688e 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -336,7 +336,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * instead of just filling out the columns), then give more detail. */ if (tree) { ti = proto_tree_add_item(tree, proto_ldss, - tvb, 0, (tvb_length(tvb) > 72) ? tvb_length(tvb) : 72, FALSE); + tvb, 0, (tvb_length(tvb) > 72) ? tvb_length(tvb) : 72, ENC_NA); ldss_tree = proto_item_add_subtree(ti, ett_ldss_broadcast); proto_tree_add_item(ldss_tree, hf_ldss_message_id, @@ -504,7 +504,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ldss, - tvb, 0, tvb_reported_length(tvb), FALSE); + tvb, 0, tvb_reported_length(tvb), ENC_NA); ldss_tree = proto_item_add_subtree(ti, ett_ldss_transfer); } @@ -691,7 +691,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ldss, - tvb, 0, tvb_reported_length(tvb), FALSE); + tvb, 0, tvb_reported_length(tvb), ENC_NA); ldss_tree = proto_item_add_subtree(ti, ett_ldss_transfer); proto_tree_add_bytes_format(ldss_tree, hf_ldss_file_data, tvb, 0, tvb_length(tvb), NULL, diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index b218cfc712..6b70b4df03 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -80,7 +80,7 @@ dissect_lge_monitor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LGE Monitor"); - ti = proto_tree_add_item(tree, proto_lge_monitor, tvb, 0, LGEMON_PROTO_HEADER_LENGTH, FALSE); + ti = proto_tree_add_item(tree, proto_lge_monitor, tvb, 0, LGEMON_PROTO_HEADER_LENGTH, ENC_NA); lge_monitor_tree = proto_item_add_subtree(ti, ett_lge_monitor); proto_tree_add_text(lge_monitor_tree, tvb, offset, LGEMON_PROTO_HEADER_LENGTH, "LGE Monitor PDU"); diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 8d829f2009..bc4a52d515 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -304,7 +304,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *linx_tree = NULL; - ti = proto_tree_add_item(tree, proto_linx, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_linx, tvb, 0, -1, ENC_NA); linx_tree = proto_item_add_subtree(ti, ett_linx); dword = tvb_get_ntohl(tvb, offset); @@ -873,7 +873,7 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_set_reported_length(tvb, size); linx_tcp_tvb = tvb_new_subset(tvb, 0, size, size); - ti = proto_tree_add_item(tree, proto_linx_tcp, linx_tcp_tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_linx_tcp, linx_tcp_tvb, 0, -1, ENC_NA); linx_tcp_tree = proto_item_add_subtree(ti, ett_linx_tcp); if (version != 3) { diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index d1eff75bee..959b6cc657 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -104,7 +104,7 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_lisp_data, tvb, 0, - LISP_DATA_HEADER_LEN, FALSE); + LISP_DATA_HEADER_LEN, ENC_NA); lisp_data_tree = proto_item_add_subtree(ti, ett_lisp_data); diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 29ada9a480..c9718f0c32 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -848,7 +848,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_lisp, tvb, 0, - (type == LISP_ECM) ? LISP_ECM_HEADER_LEN : -1, FALSE); + (type == LISP_ECM) ? LISP_ECM_HEADER_LEN : -1, ENC_NA); lisp_tree = proto_item_add_subtree(ti, ett_lisp); diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index cc21be1050..dd46d61be3 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -426,7 +426,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) format = tvb_get_guint8(tvb, 0); if (tree) { - ti = proto_tree_add_item(tree, proto_basicxid, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_basicxid, tvb, 0, -1, ENC_NA); xid_tree = proto_item_add_subtree(ti, ett_llc_basicxid); proto_tree_add_uint(xid_tree, hf_llc_xid_format, tvb, 0, 1, format); @@ -472,7 +472,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dsap = tvb_get_guint8(tvb, 0); if (tree) { - ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, ENC_NA); llc_tree = proto_item_add_subtree(ti, ett_llc); proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0, 1, dsap & SAP_MASK); diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index e202ef987b..0782861aff 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -2745,7 +2745,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_lldp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lldp, tvb, offset, -1, ENC_NA); lldp_tree = proto_item_add_subtree(ti, ett_lldp); } diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index dbf43c3b2a..463dd26532 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -77,7 +77,7 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_llt, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_llt, tvb, 0, -1, ENC_NA); llt_tree = proto_item_add_subtree(ti, ett_llt); } diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index b088693db8..099cfa4cf1 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -147,7 +147,7 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lmi, tvb, 0, 3, FALSE); + ti = proto_tree_add_item(tree, proto_lmi, tvb, 0, 3, ENC_NA); lmi_tree = proto_item_add_subtree(ti, ett_lmi_ele); proto_tree_add_item(lmi_tree, hf_lmi_call_ref, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 89afdb96f3..ad2aadd47a 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -695,7 +695,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { msg_length = tvb_get_ntohs(tvb, offset+4); ti = proto_tree_add_item(tree, proto_lmp, tvb, offset, msg_length, - FALSE); + ENC_NA); lmp_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_MAIN]); ti = proto_tree_add_text(lmp_tree, tvb, offset, 12, "LMP Header. %s", val_to_str(message_type, message_type_vals, diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index de5256a4a6..555acf6d91 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -69,7 +69,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_loop, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_loop, tvb, offset, -1, ENC_NA); loop_tree = proto_item_add_subtree(ti, ett_loop); proto_tree_add_item(loop_tree, hf_loop_skipcount, tvb, offset, 2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 95de019007..8f6e0800f0 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -103,7 +103,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_lpd, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lpd, tvb, 0, -1, ENC_NA); lpd_tree = proto_item_add_subtree(ti, ett_lpd); if (lpr_packet_type == response) { diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index d725dd981a..3d7c89c125 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -213,7 +213,7 @@ dissect_lsc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_lsc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lsc, tvb, 0, -1, ENC_NA); lsc_tree = proto_item_add_subtree(ti, ett_lsc); /* Add already fetched items to the tree */ diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index b203a7358a..ee30f06c90 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -19719,7 +19719,7 @@ dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc); dissect_DL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree); } @@ -19735,7 +19735,7 @@ dissect_lte_rrc_DL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc); dissect_DL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree); } @@ -19752,7 +19752,7 @@ dissect_lte_rrc_UL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc); dissect_UL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree); } @@ -19768,7 +19768,7 @@ dissect_lte_rrc_UL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc); dissect_UL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree); } @@ -19784,12 +19784,12 @@ dissect_lte_rrc_BCCH_BCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc); dissect_BCCH_BCH_Message_PDU(tvb, pinfo, lte_rrc_tree); } } - + static void dissect_lte_rrc_BCCH_DL_SCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -19800,7 +19800,7 @@ dissect_lte_rrc_BCCH_DL_SCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc); dissect_BCCH_DL_SCH_Message_PDU(tvb, pinfo, lte_rrc_tree); } diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 744c673d7f..489cd89c88 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -666,7 +666,7 @@ dissect_ltp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } - ti = proto_tree_add_item(tree, proto_ltp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ltp, tvb, 0, -1, ENC_NA); ltp_tree = proto_item_add_subtree(ti, ett_ltp); /* Adding Header Subtree */ diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 8187183731..37b35e902a 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -292,7 +292,7 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo, if (tree) { /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_lwapp_control, tvb, offset, - -1, FALSE); + -1, ENC_NA); control_tree = proto_item_add_subtree(ti, ett_lwapp_control); proto_tree_add_uint(control_tree, hf_lwapp_control_type, @@ -335,7 +335,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo, if (tree) { /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_lwapp_l3, tvb, offset, - -1, FALSE); + -1, ENC_NA); lwapp_tree = proto_item_add_subtree(ti, ett_lwapp_l3); } else { lwapp_tree = NULL; @@ -411,7 +411,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_lwapp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_lwapp, tvb, offset, -1, ENC_NA); lwapp_tree = proto_item_add_subtree(ti, ett_lwapp); if (have_destmac) { diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index 6dc68b176b..60c9e8692f 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -935,7 +935,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) { - lwres_item = proto_tree_add_item(tree,proto_lwres, tvb,0, -1, FALSE); + lwres_item = proto_tree_add_item(tree,proto_lwres, tvb,0, -1, ENC_NA); lwres_tree = proto_item_add_subtree(lwres_item, ett_lwres); } else return; diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index b09432f1ed..04c82295c7 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -539,7 +539,7 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the m2tp protocol tree */ - m2tp_item = proto_tree_add_item(tree, proto_m2tp, message_tvb, 0, -1, FALSE); + m2tp_item = proto_tree_add_item(tree, proto_m2tp, message_tvb, 0, -1, ENC_NA); m2tp_tree = proto_item_add_subtree(m2tp_item, ett_m2tp); } else { m2tp_item = NULL; diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index fc40fa85c3..e585fc20e0 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2597,7 +2597,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree default: proto_item_append_text(pdu_subheader_ti, ", length=%u)", pdu_lengths[number_of_headers]); - proto_item_append_text(pdu_header_ti, " (%s:%u)", + proto_item_append_text(pdu_header_ti, " (%s:%u)", val_to_str_const(lcids[number_of_headers], (direction == DIRECTION_UPLINK) ? ulsch_lcid_vals : dlsch_lcid_vals, "Unknown"), @@ -3195,7 +3195,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC-LTE"); /* Create protocol tree. */ - pdu_ti = proto_tree_add_item(tree, proto_mac_lte, tvb, offset, -1, FALSE); + pdu_ti = proto_tree_add_item(tree, proto_mac_lte, tvb, offset, -1, ENC_NA); proto_item_append_text(pdu_ti, " "); mac_lte_tree = proto_item_add_subtree(pdu_ti, ett_mac_lte); @@ -3276,7 +3276,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (n=0; n < p_mac_lte_info->number_of_srs; n++) { proto_item *sr_ti; proto_tree *sr_tree; - + /* SR event is subtree */ sr_ti = proto_tree_add_item(mac_lte_tree, hf_mac_lte_oob_send_sr, tvb, 0, 0, ENC_NA); diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index 8066d3681f..d4e9137d9a 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -109,7 +109,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) opcode = tvb_get_ntohs(tvb, 0); if (tree) { - ti = proto_tree_add_item(tree, proto_macctrl, tvb, 0, 46, FALSE); + ti = proto_tree_add_item(tree, proto_macctrl, tvb, 0, 46, ENC_NA); macctrl_tree = proto_item_add_subtree(ti, ett_macctrl); proto_tree_add_uint(macctrl_tree, hf_macctrl_opcode, tvb, 0, 2, opcode); diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c index 9d7745628b..934edfa95f 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.c @@ -62,7 +62,7 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MANOLITO"); - ti = proto_tree_add_item(tree, proto_manolito, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_manolito, tvb, 0, -1, ENC_NA); manolito_tree = proto_item_add_subtree(ti, ett_manolito); diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index 1e776a90af..797d34b821 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.c @@ -61,7 +61,7 @@ dissect_media(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree) if (tree) { if ( (bytes = tvb_length(tvb)) > 0 ) { - ti = proto_tree_add_item(tree, proto_media, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_media, tvb, 0, -1, ENC_NA); media_tree = proto_item_add_subtree(ti, ett_media); if (pinfo->private_data) { diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index d170374334..0b5f386f7a 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -409,7 +409,7 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Build the info tree if we've been given a root */ /* Create megaco subtree */ - ti = proto_tree_add_item(tree,proto_megaco,tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree,proto_megaco,tvb, 0, -1, ENC_NA); megaco_tree = proto_item_add_subtree(ti, ett_megaco); /* Format of 'message' is = MegacopToken SLASH Version SEP mId SEP messageBody */ @@ -682,7 +682,7 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default : - ti = proto_tree_add_item(tree,proto_megaco,tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree,proto_megaco,tvb, 0, -1, ENC_NA); megaco_tree = proto_item_add_subtree(ti, ett_megaco); proto_tree_add_text(megaco_tree, tvb, 0, -1, "Sorry, can't understand errorDescriptor / transactionList = %s, can't parse it pos %u", diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c index 15208e8894..a9fdf4ef47 100644 --- a/epan/dissectors/packet-mesh.c +++ b/epan/dissectors/packet-mesh.c @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -49,24 +49,24 @@ dissect_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti; proto_tree *mesh_tree; - guint8 mesh_ttl; - guint16 mesh_e2eseq; - + guint8 mesh_ttl; + guint16 mesh_e2eseq; + /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Mesh"); - + if (tree) { - ti = proto_tree_add_item(tree, proto_mesh, tvb, 0, 5, FALSE); + ti = proto_tree_add_item(tree, proto_mesh, tvb, 0, 5, ENC_NA); mesh_tree = proto_item_add_subtree(ti, ett_mesh); /* add an item to the subtree, see section 1.6 for more information */ mesh_ttl = tvb_get_guint8(tvb, 2); proto_tree_add_uint(mesh_tree, hf_mesh_ttl, tvb, 2, 1, mesh_ttl); - + mesh_e2eseq = tvb_get_ntohs(tvb, 3); proto_tree_add_uint(mesh_tree, hf_mesh_e2eseq, tvb, 3, 2, mesh_e2eseq); } - + /* Return the amount of data this dissector was able to dissect */ return 5; } @@ -80,7 +80,7 @@ dissect_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_mesh(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_mesh_ttl, diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index 30c4f7f727..27517ec58f 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -444,7 +444,7 @@ dissect_meta(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reserved = tvb_get_letohs(tvb, 6); if (tree) { - ti = proto_tree_add_item(tree, proto_meta, tvb, 0, hdrlen + 4, FALSE); + ti = proto_tree_add_item(tree, proto_meta, tvb, 0, hdrlen + 4, ENC_NA); meta_tree = proto_item_add_subtree(ti, ett_meta); proto_tree_add_uint(meta_tree, hf_meta_schema, tvb, 0, 2, schema); proto_tree_add_uint(meta_tree, hf_meta_hdrlen, tvb, 2, 2, hdrlen); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 23b1d2d1b8..7a55da8bb0 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -369,7 +369,7 @@ static int dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Create our mgcp subtree */ - ti = proto_tree_add_item(tree,proto_mgcp,tvb,0,0, FALSE); + ti = proto_tree_add_item(tree,proto_mgcp,tvb,0,0, ENC_NA); mgcp_tree = proto_item_add_subtree(ti, ett_mgcp); } diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 3ec4fb06bc..369c91df44 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -1247,7 +1247,7 @@ dissect_mikey(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) payload = -1; if (tree) { - ti = proto_tree_add_item(tree, proto_mikey, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mikey, tvb, 0, -1, ENC_NA); mikey_tree = proto_item_add_subtree(ti, ett_mikey); } diff --git a/epan/dissectors/packet-mim.c b/epan/dissectors/packet-mim.c index e4733f3443..0c8a477aaa 100644 --- a/epan/dissectors/packet-mim.c +++ b/epan/dissectors/packet-mim.c @@ -255,7 +255,7 @@ dissect_fp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) dswid, dsswid, dlid); } } else { - ti = proto_tree_add_item( tree, proto_fp, tvb, 0, -1, FALSE ) ; + ti = proto_tree_add_item( tree, proto_fp, tvb, 0, -1, ENC_NA ) ; } fp_tree = proto_item_add_subtree( ti, ett_mim ) ; diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c index f573f2c031..2142b965e6 100644 --- a/epan/dissectors/packet-mime-encap.c +++ b/epan/dissectors/packet-mime-encap.c @@ -60,7 +60,7 @@ dissect_mime_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* XXX, COL_INFO */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MIME_FILE"); - item = proto_tree_add_item(tree, proto_mime_encap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_mime_encap, tvb, 0, -1, ENC_NA); /* frames with nsec >= 1000000000 means errors :) */ if (pinfo->fd->abs_ts.nsecs >= 1000000000) { diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c index 8ad4186527..abf342a430 100644 --- a/epan/dissectors/packet-miop.c +++ b/epan/dissectors/packet-miop.c @@ -154,7 +154,7 @@ static void dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree version_major, version_minor); if (tree) { - ti = proto_tree_add_item (tree, proto_miop, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_miop, tvb, 0, -1, ENC_NA); miop_tree = proto_item_add_subtree (ti, ett_miop); proto_tree_add_text (miop_tree, tvb, 0, -1, "Version %u.%u", @@ -190,7 +190,7 @@ static void dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree if (tree) { - ti = proto_tree_add_item (tree, proto_miop, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_miop, tvb, 0, -1, ENC_NA); miop_tree = proto_item_add_subtree (ti, ett_miop); /* XXX - Should we bail out if we don't have the right magic number? */ diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 25f4f2f73c..081dd85a65 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -676,7 +676,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 12)); if (tree) { - ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, ENC_NA); mip_tree = proto_item_add_subtree(ti, ett_mip); /* type */ @@ -728,7 +728,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, ENC_NA); mip_tree = proto_item_add_subtree(ti, ett_mip); /* Type */ @@ -762,7 +762,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, ENC_NA); mip_tree = proto_item_add_subtree(ti, ett_mip); /* Type */ @@ -793,7 +793,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 12)); if (tree) { - ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, ENC_NA); mip_tree = proto_item_add_subtree(ti, ett_mip); /* type */ @@ -837,7 +837,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ip_to_str(tvb, 4)); if (tree) { - ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, ENC_NA); mip_tree = proto_item_add_subtree(ti, ett_mip); /* type */ diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index af54fecd9b..3f4d3f3b55 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -2019,7 +2019,7 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = (tvb_get_guint8(tvb, MIP6_HLEN_OFF) + 1) * 8; pproto = tvb_get_guint8(tvb, MIP6_PROTO_OFF); if (tree) { - ti = proto_tree_add_item(tree, proto_mip6, tvb, 0, len, FALSE); + ti = proto_tree_add_item(tree, proto_mip6, tvb, 0, len, ENC_NA); mip6_tree = proto_item_add_subtree(ti, ett_mip6); /* Process header fields */ diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 0366fbaf5b..c26b993cd4 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -7070,7 +7070,7 @@ dissect_mms(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_mms, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_mms, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mms); } col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS"); @@ -7090,7 +7090,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /*--- proto_register_mms -------------------------------------------*/ void proto_register_mms(void) { - + /* List of fields */ static hf_register_info hf[] = { @@ -9998,7 +9998,7 @@ void proto_register_mms(void) { static gboolean dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ +{ /* must check that this really is an mms packet */ int offset = 0; guint32 length = 0 ; @@ -10008,40 +10008,40 @@ dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) gint8 tmp_class; gboolean tmp_pc; gint32 tmp_tag; - + /* first, check do we have at least 2 bytes (pdu) */ if (!tvb_bytes_exist(tvb, 0, 2)) return FALSE; /* no */ - + /* can we recognize MMS PDU ? Return FALSE if not */ /* get MMS PDU type */ offset = get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag); - + /* check MMS type */ - - /* Class should be constructed */ + + /* Class should be constructed */ if (tmp_class!=BER_CLASS_CON) return FALSE; - + /* see if the tag is a valid MMS PDU */ match_strval_idx(tmp_tag, mms_MMSpdu_vals, &idx); - if (idx == -1) { + if (idx == -1) { return FALSE; /* no, it isn't an MMS PDU */ } - + /* check MMS length */ oct = tvb_get_guint8(tvb, offset)& 0x7F; if (oct==0) /* MMS requires length after tag so not MMS if indefinite length*/ return FALSE; - + offset = get_ber_length(tvb, offset, &length, NULL); /* do we have enough bytes? */ if (!tvb_bytes_exist(tvb, offset, length)) - return FALSE; - + return FALSE; + dissect_mms(tvb, pinfo, parent_tree); - return TRUE; + return TRUE; } /*--- proto_reg_handoff_mms --- */ diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 99687c8517..ea65607f12 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -728,7 +728,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, if (tree) { DebugLog(("tree != NULL\n")); - ti = proto_tree_add_item(tree, proto_mmse, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mmse, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Type: %s", message_type); /* create display subtree for the protocol */ mmse_tree = proto_item_add_subtree(ti, ett_mmse); diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c index eb8e795bec..9e2c1b7c2a 100644 --- a/epan/dissectors/packet-mndp.c +++ b/epan/dissectors/packet-mndp.c @@ -232,7 +232,7 @@ dissect_mndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Header dissection */ ti = proto_tree_add_item(tree, proto_mndp, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); mndp_tree = proto_item_add_subtree(ti, ett_mndp); proto_tree_add_item(mndp_tree, hf_mndp_header_unknown, tvb, offset, 2, diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 055bff7e2e..85a45d9460 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -776,7 +776,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, proto_tree *mp2t_af_tree = NULL; proto_tree *mp2t_analysis_tree = NULL; - ti = proto_tree_add_item( tree, proto_mp2t, tvb, offset, MP2T_PACKET_SIZE, FALSE ); + ti = proto_tree_add_item( tree, proto_mp2t, tvb, offset, MP2T_PACKET_SIZE, ENC_NA ); mp2t_tree = proto_item_add_subtree( ti, ett_mp2t ); header = tvb_get_ntohl(tvb, offset); diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index f8c19ebc46..9ec83a392f 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -690,7 +690,7 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MP4V-ES"); if (tree) { - item = proto_tree_add_item(tree, proto_mp4ves, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_mp4ves, tvb, 0, -1, ENC_NA); mp4ves_tree = proto_item_add_subtree(item, ett_mp4ves); /* +------+------+------+------+ diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 8f3065e3fb..8c10ab130c 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -999,7 +999,7 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); col_clear(pinfo->cinfo, COL_INFO); if (tree) - proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE); + proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index fa56a36181..2d92f50ad8 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -152,7 +152,7 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( tree ) { - ti = proto_tree_add_item( tree, proto_mpg, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_mpg, tvb, offset, -1, ENC_NA ); mpg_tree = proto_item_add_subtree( ti, ett_mpg ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_mbz, tvb, offset, 1, mpg_mbz ); diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 701002e14b..b3d93a4456 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -994,7 +994,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ((MSGTYPE_MPLS_ECHO(msgtype)) && (rem < 32)) ) { col_set_str(pinfo->cinfo, COL_INFO, "Malformed Message"); if(tree) { - ti = proto_tree_add_item(tree, proto_mpls_echo, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mpls_echo, tvb, 0, -1, ENC_NA); mpls_echo_tree = proto_item_add_subtree(ti, ett_mpls_echo); proto_tree_add_text(mpls_echo_tree, tvb, offset, rem, "Error processing Message: length is %d, should be >= %u", @@ -1011,7 +1011,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Add subtree and dissect the fixed part of the message */ - ti = proto_tree_add_item(tree, proto_mpls_echo, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mpls_echo, tvb, 0, -1, ENC_NA); mpls_echo_tree = proto_item_add_subtree(ti, ett_mpls_echo); proto_tree_add_item(mpls_echo_tree, diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 594f2ab999..e78e244df8 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -366,7 +366,7 @@ dissect_pw_ach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) res = tvb_get_guint8(tvb, 1); channel_type = tvb_get_ntohs(tvb, 2); if (tree) { - ti = proto_tree_add_item(tree, proto_pw_ach, tvb, 0, 4, FALSE); + ti = proto_tree_add_item(tree, proto_pw_ach, tvb, 0, 4, ENC_NA); mpls_pw_ach_tree = proto_item_add_subtree(ti, ett_mpls_pw_ach); if (mpls_pw_ach_tree == NULL) return; @@ -471,7 +471,7 @@ dissect_pw_mcw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_guint8(tvb, 1) & 0x3F; sequence_number = tvb_get_ntohs(tvb, 2); if (tree) { - ti = proto_tree_add_item(tree, proto_pw_mcw, tvb, 0, 4, FALSE); + ti = proto_tree_add_item(tree, proto_pw_mcw, tvb, 0, 4, ENC_NA); mpls_pw_mcw_tree = proto_item_add_subtree(ti, ett_mpls_pw_mcw); if (mpls_pw_mcw_tree == NULL) return; @@ -719,7 +719,7 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_mpls, tvb, offset, 4, FALSE); + ti = proto_tree_add_item(tree, proto_mpls, tvb, offset, 4, ENC_NA); mpls_tree = proto_item_add_subtree(ti, ett_mpls); proto_item_append_text(ti, ", Label: %u", label); diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index 7fadb12fa0..91ab758144 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -230,7 +230,7 @@ dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_mqpcf, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mqpcf, tvb, offset, -1, ENC_NA); proto_item_append_text(ti, " (%s)", val_to_str(iCommand, mqpcf_opcode_vals, "Unknown (0x%02x)")); mqroot_tree = proto_item_add_subtree(ti, ett_mqpcf); diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index 4aec2b79fc..7d40fc44a0 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -197,7 +197,7 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o return offset+tvb_length_remaining(tvb, offset); } - item = proto_tree_add_item(parent_tree, proto_mrdisc, tvb, offset, 0, FALSE); + item = proto_tree_add_item(parent_tree, proto_mrdisc, tvb, offset, 0, ENC_NA); tree = proto_item_add_subtree(item, ett_mrdisc); diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index c32bbb597c..8dc83c8e09 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -471,7 +471,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int msg_offset; /* Use when handling multiple messages. This points to current msg being decoded. */ int vect_offset; /* Use when handling multiple vector attributes. This points to the current vector attribute being decoded. */ - ti = proto_tree_add_item(tree, proto_msrp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_msrp, tvb, 0, -1, ENC_NA); msrp_tree = proto_item_add_subtree(ti, ett_msrp); proto_tree_add_item(msrp_tree, hf_msrp_proto_id, tvb, MSRP_PROTOCOL_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 86bb717284..8bc2f9445d 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -400,7 +400,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Create MSMMS control protocol tree */ if (tree) { - ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, ENC_NA); msmms_tree = proto_item_add_subtree(ti, ett_msmms_command); } @@ -582,7 +582,7 @@ static gint dissect_msmms_data_udp_command(tvbuff_t *tvb, packet_info *pinfo, pr /* Create MSMMS data protocol tree */ if (tree) { - ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, ENC_NA); msmms_tree = proto_item_add_subtree(ti, ett_msmms_data); } @@ -669,7 +669,7 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Create MSMMS data protocol tree */ if (tree) { - ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_msmms, tvb, offset, -1, ENC_NA); msmms_tree = proto_item_add_subtree(ti, ett_msmms_data); } diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 5e4ed2ede5..050c7343ad 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -191,7 +191,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 type; guint16 length; - ti = proto_tree_add_item(tree, proto_msdp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_msdp, tvb, 0, -1, ENC_NA); msdp_tree = proto_item_add_subtree(ti, ett_msdp); offset = 0; diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c index deb603b484..c207c37871 100644 --- a/epan/dissectors/packet-msn-messenger.c +++ b/epan/dissectors/packet-msn-messenger.c @@ -90,13 +90,13 @@ dissect_msnms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Put the first line from the buffer into the summary. */ - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, format_text(line, linelen)); } if (tree) { ti = proto_tree_add_item(tree, proto_msnms, tvb, offset, -1, - FALSE); + ENC_NA); msnms_tree = proto_item_add_subtree(ti, ett_msnms); /* diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index 63ed2bb5a8..de95cf5bf2 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -227,7 +227,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of return offset+tvb_length_remaining(tvb, offset); } - item = proto_tree_add_item(parent_tree, proto_msnip, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_msnip, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_msnip); diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 85e3e9a028..af3f4ed9fe 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -59,7 +59,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "MS NLB heartbeat"); if (tree) { - ti = proto_tree_add_item(tree, proto_msnlb, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_msnlb, tvb, 0, -1, ENC_NA); msnlb_tree = proto_item_add_subtree(ti, ett_msnlb); type = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 7eddd24335..f9c9593168 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -210,7 +210,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, if ( tree) { ti = proto_tree_add_item( tree, proto_msproxy, tvb, 0, 0, - FALSE ); + ENC_NA ); msp_tree = proto_item_add_subtree(ti, ett_msproxy); @@ -1110,7 +1110,7 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* if proto tree, decode data */ ti = proto_tree_add_item( tree, proto_msproxy, tvb, 0, -1, - FALSE ); + ENC_NA ); msproxy_tree = proto_item_add_subtree(ti, ett_msproxy); } diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 94f89727a2..79fcc0264e 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -563,7 +563,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_msrp, tvb, 0, message_end_offset, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_msrp, tvb, 0, message_end_offset, ENC_NA); msrp_tree = proto_item_add_subtree(ti, ett_msrp); if (is_msrp_response){ diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index eac9947512..ca96929539 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -337,7 +337,7 @@ dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mstp_frame_source, mstp_frame_destination, mstp_frame_type_text(mstp_frame_type)); #else - ti = proto_tree_add_item(tree, proto_mstp, tvb, offset, 8, FALSE); + ti = proto_tree_add_item(tree, proto_mstp, tvb, offset, 8, ENC_NA); #endif subtree = proto_item_add_subtree(ti, ett_bacnet_mstp); proto_tree_add_item(subtree, hf_mstp_preamble_55, tvb, diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 2283418ba3..23a3cd64b2 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -833,7 +833,7 @@ static void dissect_multipart(tvbuff_t *tvb, packet_info *pinfo, if (tree) { proto_item *type_ti; ti = proto_tree_add_item(tree, proto_multipart, - tvb, 0, -1, ENC_BIG_ENDIAN); + tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_multipart); proto_item_append_text(ti, ", Type: %s, Boundary: \"%s\"", m_info->type, m_info->boundary); diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index e1ee41d28d..d364ea4690 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -870,7 +870,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*@param proto_mux27010: Protocol name*/ /*@param tvb: Buffer to dissect (data for protocol)*/ /*@param "0" and "-1": All data is for the protocol*/ - ti = proto_tree_add_item(tree, proto_mux27010, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_mux27010, tvb, 0, -1, ENC_NA); /*Add a subtree to the protocol tree (child node)*/ mux27010_tree = proto_item_add_subtree(ti, ett_mux27010); diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 0201379b82..f91b189689 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -4514,7 +4514,7 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* make entry in the Protocol column on summary display */ col_append_str(pinfo->cinfo, COL_PROTOCOL, "/NAS-EPS"); - item = proto_tree_add_item(tree, proto_nas_eps, tvb, 0, -1, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, proto_nas_eps, tvb, 0, -1, ENC_NA); nas_eps_tree = proto_item_add_subtree(item, ett_nas_eps); /* Security header type Security header type 9.3.1 M V 1/2 */ @@ -4554,10 +4554,10 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Integrity protected and ciphered = 2, Integrity protected and ciphered with new EPS security context = 4 */ pd = tvb_get_guint8(tvb,offset)&0x0f; #if 0 - /* Does not work see Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6348 + /* Does not work see Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6348 * 9.2 Protocol discriminator * : - * The protocol discriminator in the header (see 3GPP TS 24.007 [12]) of a + * The protocol discriminator in the header (see 3GPP TS 24.007 [12]) of a * security protected NAS message is encoded as "EPS mobility management messages". * XXX Should we check for PD == 7? */ @@ -4628,7 +4628,7 @@ dissect_nas_eps_plain(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* make entry in the Protocol column on summary display */ col_append_str(pinfo->cinfo, COL_PROTOCOL, "/NAS-EPS"); - item = proto_tree_add_item(tree, proto_nas_eps, tvb, 0, -1, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, proto_nas_eps, tvb, 0, -1, ENC_NA); nas_eps_tree = proto_item_add_subtree(item, ett_nas_eps); pd = tvb_get_guint8(tvb,offset)&0x0f; diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c index 01310580ba..43170e9cc3 100644 --- a/epan/dissectors/packet-nasdaq-soup.c +++ b/epan/dissectors/packet-nasdaq-soup.c @@ -69,15 +69,15 @@ static range_t *nasdaq_soup_tcp_range = NULL; /* Initialize the subtree pointers */ static gint ett_nasdaq_soup = -1; -static int hf_nasdaq_soup_packet_type = -1; -static int hf_nasdaq_soup_message = -1; -static int hf_nasdaq_soup_text = -1; -static int hf_nasdaq_soup_packet_eol = -1; -static int hf_nasdaq_soup_username = -1; -static int hf_nasdaq_soup_password = -1; -static int hf_nasdaq_soup_session = -1; -static int hf_nasdaq_soup_seq_number = -1; -static int hf_nasdaq_soup_reject_code = -1; +static int hf_nasdaq_soup_packet_type = -1; +static int hf_nasdaq_soup_message = -1; +static int hf_nasdaq_soup_text = -1; +static int hf_nasdaq_soup_packet_eol = -1; +static int hf_nasdaq_soup_username = -1; +static int hf_nasdaq_soup_password = -1; +static int hf_nasdaq_soup_session = -1; +static int hf_nasdaq_soup_seq_number = -1; +static int hf_nasdaq_soup_reject_code = -1; static void dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree *tree, int offset, int linelen) @@ -194,7 +194,7 @@ dissect_nasdaq_soup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } counter++; if (tree) { - ti = proto_tree_add_item(tree, proto_nasdaq_soup, tvb, offset, linelen +1, FALSE); + ti = proto_tree_add_item(tree, proto_nasdaq_soup, tvb, offset, linelen +1, ENC_NA); nasdaq_soup_tree = proto_item_add_subtree(ti, ett_nasdaq_soup); } dissect_nasdaq_soup_packet(tvb, pinfo, tree, nasdaq_soup_tree, offset, linelen); @@ -211,7 +211,7 @@ static void range_add_nasdaq_soup_tcp_callback(guint32 port) { dissector_add_uint("tcp.port", port, nasdaq_soup_handle); } -static void nasdaq_soup_prefs(void) +static void nasdaq_soup_prefs(void) { range_foreach(nasdaq_soup_tcp_range, range_delete_nasdaq_soup_tcp_callback); g_free(nasdaq_soup_tcp_range); @@ -226,7 +226,7 @@ proto_register_nasdaq_soup(void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { - { &hf_nasdaq_soup_packet_type, + { &hf_nasdaq_soup_packet_type, { "Packet Type", "nasdaq-soup.packet_type", FT_UINT8, BASE_DEC, VALS(message_types_val), 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index 959c371c34..8805180f61 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -105,7 +105,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_guint8(tvb, offset+2); ti = proto_tree_add_item(tree, proto_nb_rtpmux, tvb, offset, - length+5, FALSE); + length+5, ENC_NA); nb_rtpmux_tree = proto_item_add_subtree(ti, ett_nb_rtpmux); /* XXX - what if the T bit is set? */ @@ -118,7 +118,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_dstport, tvb, offset, 2, dstport ); proto_tree_add_item(nb_rtpmux_tree, hf_nb_rtpmux_length, tvb, offset+2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, ENC_BIG_ENDIAN); srcport = (tvb_get_ntohs(tvb, offset+3) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_srcport, tvb, offset+3, 2, srcport ); cmp_rtp_item = proto_tree_add_text( nb_rtpmux_tree, tvb, offset+5, 3, "Compressed RTP header" ); @@ -136,7 +136,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_dstport, tvb, offset, 2, dstport ); proto_tree_add_item(nb_rtpmux_tree, hf_nb_rtpmux_length, tvb, offset+2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, ENC_BIG_ENDIAN); srcport = (tvb_get_ntohs(tvb, offset+3) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_srcport, tvb, offset+3, 2, srcport ); @@ -212,11 +212,11 @@ proto_register_nb_rtpmux(void) { "Sequence Number", "nb_rtpmux.cmp_rtp.sequence_no", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } - }, + }, { &hf_nb_rtpmux_cmp_rtp_timestamp, { "Timestamp", "nb_rtpmux.cmp_rtp.timestamp", FT_UINT16, BASE_DEC, NULL, 0x00, - NULL, HFILL } + NULL, HFILL } }, { &hf_nb_rtpmux_cmp_rtp_data, { "RTP Data", "nb_rtpmux.cmp_rtp.data", diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 49595bc31e..c8b5c8d777 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -52895,9 +52895,9 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBAP"); /* create the nbap protocol tree */ - nbap_item = proto_tree_add_item(tree, proto_nbap, tvb, 0, -1, FALSE); + nbap_item = proto_tree_add_item(tree, proto_nbap, tvb, 0, -1, ENC_NA); nbap_tree = proto_item_add_subtree(nbap_item, ett_nbap); - + dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree); } @@ -67696,7 +67696,7 @@ void proto_register_nbap(void) { /* Register fields and subtrees */ proto_register_field_array(proto_nbap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector */ register_dissector("nbap", dissect_nbap, proto_nbap); diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 4bd3096630..e373b98d8a 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -193,7 +193,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); - item = proto_tree_add_item(parent_tree, proto_nbd, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_nbd, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_nbd); diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 953f02bc7e..6d57e0f971 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -260,7 +260,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_nbipx, tvb, 0, - -1, FALSE); + -1, ENC_NA); nbipx_tree = proto_item_add_subtree(ti, ett_nbipx); } @@ -404,7 +404,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case NBIPX_DIRECTED_DATAGRAM: if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, nbipx_data_stream_type_vals, "Unknown")); } dissect_conn_control(tvb, offset, nbipx_tree); @@ -431,7 +431,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, nbipx_data_stream_type_vals, "Unknown")); } @@ -676,7 +676,7 @@ dissect_nmpi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_nmpi, tvb, offset, 68, - FALSE); + ENC_NA); nmpi_tree = proto_item_add_subtree(ti, ett_nmpi); add_routers(nmpi_tree, tvb, offset); diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 942626ea76..0321e6283e 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1066,7 +1066,7 @@ dissect_nbns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_nbns, tvb, offset, -1, - FALSE); + ENC_NA); nbns_tree = proto_item_add_subtree(ti, ett_nbns); proto_tree_add_uint(nbns_tree, hf_nbns_transaction_id, tvb, @@ -1251,7 +1251,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_nbdgm, tvb, offset, -1, - FALSE); + ENC_NA); nbdgm_tree = proto_item_add_subtree(ti, ett_nbdgm); proto_tree_add_uint(nbdgm_tree, hf_nbdgm_type, tvb, @@ -1489,7 +1489,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo, msg_type = tvb_get_guint8(tvb, offset); if (tree) { - ti = proto_tree_add_item(tree, proto_nbss, tvb, offset, length + 4, FALSE); + ti = proto_tree_add_item(tree, proto_nbss, tvb, offset, length + 4, ENC_NA); nbss_tree = proto_item_add_subtree(ti, ett_nbss); proto_tree_add_item(nbss_tree, hf_nbss_type, tvb, offset, 1, ENC_NA); @@ -1831,7 +1831,7 @@ continuation: col_set_str(pinfo->cinfo, COL_INFO, "NBSS Continuation Message"); if (tree) { - ti = proto_tree_add_item(tree, proto_nbss, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_nbss, tvb, 0, -1, ENC_NA); nbss_tree = proto_item_add_subtree(ti, ett_nbss); proto_tree_add_text(nbss_tree, tvb, 0, -1, "Continuation data"); } diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index f82be08fe8..b65658dbca 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -340,7 +340,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ncp_hdr = &header; - ti = proto_tree_add_item(tree, proto_ncp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ncp, tvb, 0, -1, ENC_NA); ncp_tree = proto_item_add_subtree(ti, ett_ncp); if (is_tcp) { if (tvb_get_ntohl(tvb, hdr_offset) != NCPIP_RQST && tvb_get_ntohl(tvb, hdr_offset) != NCPIP_RPLY) diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c index 1f190ebb4b..557baaa9fb 100644 --- a/epan/dissectors/packet-ncs.c +++ b/epan/dissectors/packet-ncs.c @@ -23,8 +23,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - - + + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -44,9 +44,9 @@ dissect_ncs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ncs_tree = NULL; proto_item *ti; - + if (tree) { - ti = proto_tree_add_item(tree, proto_ncs, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ncs, tvb, 0, -1, ENC_NA); ncs_tree = proto_item_add_subtree(ti, ett_ncs); } diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 9af4a0fa05..52df55cb13 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3279,7 +3279,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Add the record marker information to the tree */ if (tree) { - ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, FALSE); + ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, ENC_NA); ndmp_tree = proto_item_add_subtree(ndmp_item, ett_ndmp); } hdr_item = proto_tree_add_text(ndmp_tree, tvb, 0, 4, @@ -3341,7 +3341,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, FALSE); + ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, ENC_NA); ndmp_tree = proto_item_add_subtree(ndmp_item, ett_ndmp); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index f2d7413695..ef85dc70d5 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4303,7 +4303,7 @@ dissect_ndps_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_ndps, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ndps, tvb, 0, -1, ENC_NA); ndps_tree = proto_item_add_subtree(ti, ett_ndps); } dissect_ndps(tvb, pinfo, ndps_tree); @@ -4494,7 +4494,7 @@ dissect_ndps_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_ndps, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ndps, tvb, 0, -1, ENC_NA); ndps_tree = proto_item_add_subtree(ti, ett_ndps); } ndps_defrag(tvb, pinfo, ndps_tree); diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 4f6e66401f..8b2a2e5366 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1150,7 +1150,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if ( tree) { - ti = proto_tree_add_item(tree, proto_netbios, tvb, 0, hdr_len, FALSE); + ti = proto_tree_add_item(tree, proto_netbios, tvb, 0, hdr_len, ENC_NA); netb_tree = proto_item_add_subtree(ti, ett_netb); proto_tree_add_uint_format(netb_tree, hf_netb_hdr_len, tvb, offset, 2, hdr_len, diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index ddef3c2ab8..ab70ea2af6 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -1,6 +1,6 @@ /* packet-netdump.c * Routines for Netdump dissection - * Copyright 2009, Neil Horman <nhorman@tuxdriver.com> + * Copyright 2009, Neil Horman <nhorman@tuxdriver.com> * * $Id$ * @@ -104,7 +104,7 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* we are being asked for details */ proto_item *ti = NULL; proto_tree *netdump_tree = NULL; - ti = proto_tree_add_item(tree, proto_netdump, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_netdump, tvb, 0, -1, ENC_NA); netdump_tree = proto_item_add_subtree(ti, ett_netdump); if (tvb_reported_length(tvb) == 24) { /* Its a request format packet */ diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index 8a00c2617e..a30c5ef026 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -402,7 +402,7 @@ dissect_npmp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the npmp protocol tree */ - npmp_item = proto_tree_add_item(tree, proto_npmp, message_tvb, 0, -1, FALSE); + npmp_item = proto_tree_add_item(tree, proto_npmp, message_tvb, 0, -1, ENC_NA); npmp_tree = proto_item_add_subtree(npmp_item, ett_npmp); } else { npmp_tree = NULL; diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index ea3c1ef266..5eb92df4a9 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -471,7 +471,7 @@ dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; while (tvb_reported_length_remaining(tvb, offset) > 0) { - ti = proto_tree_add_item(tree, proto_netsync, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_netsync, tvb, offset, -1, ENC_NA); netsync_tree = proto_item_add_subtree(ti, ett_netsync); version = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c index afbab6213d..9e795b694e 100644 --- a/epan/dissectors/packet-newmail.c +++ b/epan/dissectors/packet-newmail.c @@ -13,17 +13,17 @@ * don't bother with the "Copied from" - you don't even need to put * in a "Copied from" if you copied an existing dissector, especially * if the bulk of the code in the new dissector is your code) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -67,7 +67,7 @@ dissect_newmail(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Microsoft Exchange new mail notification"); if (tree) { - ti = proto_tree_add_item(tree, proto_newmail, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_newmail, tvb, 0, -1, ENC_NA); newmail_tree = proto_item_add_subtree(ti, ett_newmail); @@ -79,13 +79,13 @@ dissect_newmail(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Wireshark */ void proto_register_newmail(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_newmail_payload, { "Notification payload", "newmail.notification_payload", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Payload requested by client in the MAPI register push notification packet", HFILL } }, }; @@ -107,7 +107,7 @@ proto_register_newmail(void) /* Register the dissector without a port yet */ register_dissector("newmail", dissect_newmail, proto_newmail); - + /* Register preferences module */ newmail_module = prefs_register_protocol(proto_newmail, proto_reg_handoff_newmail); @@ -117,7 +117,7 @@ proto_register_newmail(void) "Default UDP port (optional)", "Always dissect this port's traffic as newmail notifications. Additional ports will be dynamically registered as they are seen in MAPI register push notification packets.", 10, &preference_default_port); - + } void @@ -135,9 +135,9 @@ proto_reg_handoff_newmail(void) if (preference_default_port_last != 0) { dissector_delete_uint("udp.port", preference_default_port_last, newmail_handle); } - } + } - if(preference_default_port != 0) { + if(preference_default_port != 0) { dissector_add_uint("udp.port", preference_default_port, newmail_handle); } preference_default_port_last = preference_default_port; diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index e76bff4279..1adc90469b 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -1449,7 +1449,7 @@ dissect_nlsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_nlsp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_nlsp, tvb, 0, -1, ENC_NA); nlsp_tree = proto_item_add_subtree(ti, ett_nlsp); } diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c index 941d7def41..6885a2f2b5 100644 --- a/epan/dissectors/packet-nntp.c +++ b/epan/dissectors/packet-nntp.c @@ -73,7 +73,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_nntp, tvb, offset, -1, - FALSE); + ENC_NA); nntp_tree = proto_item_add_subtree(ti, ett_nntp); if (pinfo->match_uint == pinfo->destport) { diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index c7f2793d68..4e212d0956 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -1006,7 +1006,7 @@ dissect_nsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (tree) { bi.ti = proto_tree_add_item(tree, proto_nsip, tvb, 0, -1, - FALSE); + ENC_NA); nsip_tree = proto_item_add_subtree(bi.ti, ett_nsip); proto_tree_add_uint_format(nsip_tree, hf_nsip_pdu_type, tvb, 0, 1, pdu_type, diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 416df33ea3..ae3798f7f4 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -161,7 +161,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "NSRP Protocol"); if (tree) { - ti = proto_tree_add_item(tree, proto_nsrp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_nsrp, tvb, 0, -1, ENC_NA); nsrp_tree = proto_item_add_subtree(ti, ett_nsrp); diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 782931f5b3..abba774efb 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2133,7 +2133,7 @@ dissect_ntlmssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { tf = proto_tree_add_item (tree, proto_ntlmssp, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); ntlmssp_tree = proto_item_add_subtree (tf, ett_ntlmssp); @@ -2213,7 +2213,7 @@ dissect_ntlmssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dissect_ntlmssp(tvb, pinfo, parent_tree); return TRUE; } - + return FALSE; } diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index d8a67f5945..51e88fce0a 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -656,7 +656,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Adding NTP item and subtree */ - ti = proto_tree_add_item(tree, proto_ntp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_ntp, tvb, 0, -1, ENC_NA); ntp_tree = proto_item_add_subtree(ti, ett_ntp); /* Show version and mode in info column and NTP root */ diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index fc169ab770..b69672172c 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -256,7 +256,7 @@ capture_null( const guchar *pd, int len, packet_counts *ld ) * * If it's an IRIX or UNICOS/mp DLT_NULL header, the upper 4 hex * digits would be zero and the next 2 hex digits would not be zero. - * Furthermore, the third hex digit from the bottom would be < + * Furthermore, the third hex digit from the bottom would be < */ if (!BYTES_ARE_IN_FRAME(0, len, 2)) { ld->other++; @@ -423,7 +423,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (null_header > IEEE_802_3_MAX_LEN) { if (tree) { - ti = proto_tree_add_item(tree, proto_null, tvb, 0, 4, FALSE); + ti = proto_tree_add_item(tree, proto_null, tvb, 0, 4, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_null); proto_tree_add_uint(fh_tree, hf_null_etype, tvb, 0, 4, (guint16) null_header); @@ -437,7 +437,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* populate a tree in the second pane with the status of the link layer (ie none) */ if (tree) { - ti = proto_tree_add_item(tree, proto_null, tvb, 0, 4, FALSE); + ti = proto_tree_add_item(tree, proto_null, tvb, 0, 4, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_null); proto_tree_add_uint(fh_tree, hf_null_family, tvb, 0, 4, null_header); } diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 8ad46de24a..447d961eda 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -665,7 +665,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(parent_tree){ - item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, FALSE); + item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_ocsp); } @@ -687,7 +687,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree if(parent_tree){ - item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, FALSE); + item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_ocsp); } diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 9ed13eb34a..8af49d28b6 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -6,10 +6,10 @@ * * OICQ is an IM software,which is popular in China. And, * OICQ has more than 10 millions users at present. - * The Protocol showed in this file, is found by investigating OICQ's + * The Protocol showed in this file, is found by investigating OICQ's * Packets as a black box. * - * The OICQ client software is always changing,and the protocol of + * The OICQ client software is always changing,and the protocol of * communication is also. * * Wireshark - Network traffic analyzer @@ -46,7 +46,7 @@ Sequence Number: 16bit unsigned OICQ Number: 32bit unsigned Data: Variable Length data - + * */ @@ -134,12 +134,12 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_oicq, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_oicq, tvb, 0, -1, ENC_NA); oicq_tree = proto_item_add_subtree(ti, ett_oicq); proto_tree_add_item(oicq_tree, hf_oicq_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + proto_tree_add_item(oicq_tree, hf_oicq_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -152,12 +152,12 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(oicq_tree, hf_oicq_qqid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - + proto_tree_add_item(oicq_tree, hf_oicq_data, tvb, offset, -1, ENC_ASCII|ENC_NA); - - + + } - + return tvb_length(tvb); } diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 5aec072119..ba6ddebdb8 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -573,7 +573,7 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*-----------------Fetching Info from IP Packet and Adding to Tree------------------------*/ if (tree) { - ti = proto_tree_add_item(tree, proto_olsr, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_olsr, tvb, 0, -1, ENC_NA); olsr_tree = proto_item_add_subtree(ti, ett_olsr); proto_tree_add_item(olsr_tree, hf_olsr_packet_len, tvb, 0, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index 5af8ba3f04..4bcd91ab53 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -112,7 +112,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_omapi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_omapi, tvb, 0, -1, ENC_NA); omapi_tree = proto_item_add_subtree(ti, ett_omapi); cursor = ptvcursor_new(omapi_tree, tvb, 0); @@ -128,7 +128,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptvcursor_add(cursor, hf_omapi_hlength, 4, FALSE); col_set_str(pinfo->cinfo, COL_INFO, "Status message"); - proto_item_append_text(ti, ", Status message"); + proto_item_append_text(ti, ", Status message"); return; } @@ -142,19 +142,19 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_append_str(pinfo->cinfo, COL_INFO, "Status message"); } - proto_item_append_text(ti, ", Status message"); + proto_item_append_text(ti, ", Status message"); } ptvcursor_add(cursor, hf_omapi_auth_id, 4, FALSE); authlength = tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_omapi_auth_len, 4, FALSE); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, val_to_str(tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)), omapi_opcode_vals, "Unknown opcode (0x%04x)")); } - proto_item_append_text(ti, ", Opcode: %s", + proto_item_append_text(ti, ", Opcode: %s", val_to_str(tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)), omapi_opcode_vals, "Unknown opcode (0x%04x)")); ptvcursor_add(cursor, hf_omapi_opcode, 4, FALSE); @@ -177,7 +177,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (msglength == (guint32)~0) { proto_tree_add_text(omapi_tree, tvb, 0, 0, "No value"); - } + } else { ptvcursor_add(cursor, hf_omapi_msg_value, msglength, FALSE); @@ -204,7 +204,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (objlength == (guint32)~0) { proto_tree_add_text(omapi_tree, tvb, 0, 0, "No value"); - } + } else { ptvcursor_add(cursor, hf_omapi_obj_value, objlength, FALSE); diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index f853d207c9..ea28137996 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -1140,7 +1140,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { /* we are being asked for details */ - ti = proto_tree_add_item(tree, proto_omron_fins, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_omron_fins, tvb, 0, -1, ENC_NA); omron_tree = proto_item_add_subtree(ti, ett_omron); ti = proto_tree_add_text(omron_tree, tvb, 0, 12, "Omron Header"); diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 4516137b50..aaf3d3bd8d 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1385,7 +1385,7 @@ opensafety_package_dissector(const gchar * protocolName, const gchar * sub_diss_ if ( tree ) { /* create the opensafety protocol tree */ - opensafety_item = proto_tree_add_item(tree, proto_opensafety, message_tvb, frameOffset, frameLength, ENC_BIG_ENDIAN); + opensafety_item = proto_tree_add_item(tree, proto_opensafety, message_tvb, frameOffset, frameLength, ENC_NA); opensafety_tree = proto_item_add_subtree(opensafety_item, ett_opensafety); if ( dissect_opensafety_message(frameStart1, frameStart2, type, next_tvb, pinfo, opensafety_tree, found) == TRUE ) diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index f9027ffc77..d02347fec5 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -582,7 +582,7 @@ dissect_opsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_opsi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_opsi, tvb, 0, -1, ENC_NA); opsi_tree = proto_item_add_subtree(ti, ett_opsi); if (tvb_length(tvb) < 8 ) { proto_tree_add_text(opsi_tree, tvb, 0, -1, "Too short OPSI packet!"); diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index d758144902..ba20e1d3ff 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -288,7 +288,7 @@ const enum_val_t tsap_display_options[] = { static void cotp_frame_end(void) { if (!cotp_last_fragment) { - /* Last COTP in frame is not fragmented. + /* Last COTP in frame is not fragmented. * No need for incrementing the dst_ref, so we decrement it here. */ cotp_dst_ref--; @@ -743,7 +743,7 @@ static int ositp_decode_DR(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, src_ref, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); proto_tree_add_uint(cotp_tree, hf_cotp_type, tvb, offset + 1, 1, tpdu); @@ -838,7 +838,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, p_add_proto_data (pinfo->fd, proto_clnp, prev_dst_ref); } else if (cotp_frame_reset) { cotp_dst_ref = *prev_dst_ref; - } + } cotp_frame_reset = FALSE; cotp_last_fragment = fragment; dst_ref = cotp_dst_ref; @@ -872,7 +872,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, } if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -921,7 +921,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, fragment_length = tvb_length(next_tvb); if (check_col(pinfo->cinfo, COL_INFO)) { if(fragment) { - col_append_fstr(pinfo->cinfo, COL_INFO, " [COTP fragment, %u byte%s]", + col_append_fstr(pinfo->cinfo, COL_INFO, " [COTP fragment, %u byte%s]", fragment_length, plurality(fragment_length, "", "s")); } else { col_append_fstr(pinfo->cinfo, COL_INFO, " EOT"); @@ -1058,7 +1058,7 @@ static int ositp_decode_ED(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, tpdu_nr, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -1135,7 +1135,7 @@ static int ositp_decode_RJ(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, tpdu_nr, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); item = proto_tree_add_uint(cotp_tree, hf_cotp_type, tvb, offset + 1, 1, tpdu); @@ -1196,7 +1196,7 @@ static int ositp_decode_CC(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -1279,7 +1279,7 @@ static int ositp_decode_DC(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -1335,7 +1335,7 @@ static int ositp_decode_AK(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, tpdu_nr, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -1377,7 +1377,7 @@ static int ositp_decode_AK(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, tpdu_nr, dst_ref, cdt_in_ak); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -1469,7 +1469,7 @@ static int ositp_decode_EA(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, "EA TPDU (%u) dst-ref: 0x%04x", tpdu_nr, dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); } @@ -1545,7 +1545,7 @@ static int ositp_decode_ER(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, col_append_fstr(pinfo->cinfo, COL_INFO, "ER TPDU dst-ref: 0x%04x", dst_ref); if (tree) { - ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, ENC_NA); cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_uint(cotp_tree, hf_cotp_li, tvb, offset, 1,li); proto_tree_add_uint(cotp_tree, hf_cotp_type, tvb, offset + 1, 1, tpdu); @@ -1571,7 +1571,7 @@ static int ositp_decode_UD(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, col_append_str(pinfo->cinfo, COL_INFO, "UD TPDU"); if (tree) { - ti = proto_tree_add_item(tree, proto_cltp, tvb, offset, li + 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_cltp, tvb, offset, li + 1, ENC_NA); cltp_tree = proto_item_add_subtree(ti, ett_cltp); proto_tree_add_uint(cltp_tree, hf_cltp_li, tvb, offset, 1,li); } diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index ec9835fda4..cc0489f64b 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -978,7 +978,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ospflen = tvb_get_ntohs(tvb, 2); - ti = proto_tree_add_item(tree, proto_ospf, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ospf, tvb, 0, -1, ENC_NA); ospf_tree = proto_item_add_subtree(ti, ett_ospf); ti = proto_tree_add_text(ospf_tree, tvb, 0, ospf_header_length, diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 051d50c392..69964ae59d 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -826,7 +826,7 @@ 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, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, proto_p_mul, tvb, offset, -1, ENC_NA); proto_item_append_text (ti, ", %s", get_type (pdu_type)); p_mul_tree = proto_item_add_subtree (ti, ett_p_mul); diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index c64ff3a9c4..a60ce8c373 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -697,7 +697,7 @@ static void dissect_packetbb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree *packetbb_tree = NULL; guint offset; - ti = proto_tree_add_item(tree, proto_packetbb, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_packetbb, tvb, 0, -1, ENC_NA); packetbb_tree = proto_item_add_subtree(ti, ett_packetbb); offset = dissect_pbb_header(tvb, packetbb_tree); diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index 9b3c8a7cbd..ea5ee9c46c 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -63,18 +63,18 @@ dissect_paltalk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Detect if this TCP session is a Paltalk one */ /* TODO: Optimize detection logic if possible */ - if ((pinfo->net_src.type != AT_IPv4) + if ((pinfo->net_src.type != AT_IPv4) || (pinfo->net_dst.type != AT_IPv4) || (pinfo->net_src.len != 4) || (pinfo->net_dst.len != 4) - || !pinfo->net_src.data + || !pinfo->net_src.data || !pinfo->net_dst.data) return FALSE; memcpy((guint8 *)&src32, pinfo->net_src.data, 4); /* *Network* order */ memcpy((guint8 *)&dst32, pinfo->net_dst.data, 4); /* *Network* order */ - if ( ((src32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS) + if ( ((src32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS) && ((dst32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS)) return FALSE; @@ -102,7 +102,7 @@ dissect_paltalk_desegmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) /* we are being asked for details */ { - ti = proto_tree_add_item(tree, proto_paltalk, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_paltalk, tvb, 0, -1, ENC_NA); pt_tree = proto_item_add_subtree(ti, ett_paltalk); proto_tree_add_item(pt_tree, hf_paltalk_pdu_type, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pt_tree, hf_paltalk_version, tvb, 2, 2, ENC_BIG_ENDIAN); @@ -115,7 +115,7 @@ void proto_register_paltalk(void) { static hf_register_info hf[] = { - { &hf_paltalk_pdu_type, { "Packet Type", "paltalk.type", + { &hf_paltalk_pdu_type, { "Packet Type", "paltalk.type", FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }}, { &hf_paltalk_version, { "Protocol Version", "paltalk.version", FT_INT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 0f66921828..f896486818 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -13214,9 +13214,9 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP"); /* create the pcap protocol tree */ - pcap_item = proto_tree_add_item(tree, proto_pcap, tvb, 0, -1, FALSE); + pcap_item = proto_tree_add_item(tree, proto_pcap, tvb, 0, -1, ENC_NA); pcap_tree = proto_item_add_subtree(pcap_item, ett_pcap); - + dissect_PCAP_PDU_PDU(tvb, pinfo, pcap_tree); } @@ -18255,7 +18255,7 @@ void proto_register_pcap(void) { proto_register_subtree_array(ett, array_length(ett)); pcap_module = prefs_register_protocol(proto_pcap, proto_reg_handoff_pcap); - + /* Register dissector */ register_dissector("pcap", dissect_pcap, proto_pcap); diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 57ebbbf793..3a5a3cffcf 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -2312,7 +2312,7 @@ dissect_pcep_msg_tree(tvbuff_t *tvb, proto_tree *tree, guint tree_mode, packet_i col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(message_type, message_type_vals, "Unknown Message (%u). ")); } - ti = proto_tree_add_item(tree, proto_pcep, tvb, offset, msg_length, FALSE); + ti = proto_tree_add_item(tree, proto_pcep, tvb, offset, msg_length, ENC_NA); pcep_tree = proto_item_add_subtree(ti, tree_mode); ti = proto_tree_add_text(pcep_tree, tvb, offset, 4, "%s Header", val_to_str(message_type, message_type_vals, "Unknown Message (%u). ")); diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c index 51b4f34ec4..d193367465 100644 --- a/epan/dissectors/packet-pcli.c +++ b/epan/dissectors/packet-pcli.c @@ -61,7 +61,7 @@ static int hf_pcli_cccid = -1; static int ett_pcli = -1; -/* +/* * Here are the global variables associated with the preferences * for pcli */ @@ -71,9 +71,9 @@ static guint global_udp_port_pcli = UDP_PORT_PCLI; /* A static handle for the ip dissector */ static dissector_handle_t ip_handle; -static void +static void dissect_pcli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - + guint32 cccid; proto_tree *ti,*pcli_tree; tvbuff_t * next_tvb; @@ -89,13 +89,13 @@ dissect_pcli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_add_fstr(pinfo->cinfo, COL_INFO, "CCCID: %u",cccid); } - /* + /* *If we have a non-null tree (ie we are building the proto_tree * instead of just filling out the columns ), then add a PLCI * tree node and put a CCCID header element under it. */ if(tree) { - ti = proto_tree_add_item(tree,proto_pcli,tvb,0,0,FALSE); + ti = proto_tree_add_item(tree,proto_pcli,tvb,0,0,ENC_NA); pcli_tree = proto_item_add_subtree(ti,ett_pcli); proto_tree_add_uint(pcli_tree,hf_pcli_cccid,tvb, 0,4,cccid); @@ -108,7 +108,7 @@ dissect_pcli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { call_dissector(ip_handle,next_tvb,pinfo,tree); } -void +void proto_register_pcli(void) { static hf_register_info hf[] = { { &hf_pcli_cccid, @@ -155,6 +155,6 @@ proto_reg_handoff_pcli(void) { } udp_port_pcli = global_udp_port_pcli; - + dissector_add_uint("udp.port",global_udp_port_pcli,pcli_handle); } diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index f2700c6b56..13ccebd875 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -1914,7 +1914,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Create pdcp tree. */ if (tree) { - root_ti = proto_tree_add_item(tree, proto_pdcp_lte, tvb, offset, -1, FALSE); + root_ti = proto_tree_add_item(tree, proto_pdcp_lte, tvb, offset, -1, ENC_NA); pdcp_tree = proto_item_add_subtree(root_ti, ett_pdcp); } diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 81daaeef23..7eab6c5ee9 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -169,7 +169,7 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PFLOG"); if (tree) { - ti = proto_tree_add_item(tree, proto_pflog, tvb, offset, 0, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_pflog, tvb, offset, 0, ENC_NA); pflog_tree = proto_item_add_subtree(ti, ett_pflog); } @@ -416,7 +416,7 @@ dissect_old_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PFLOG-OLD"); if (tree) { - ti = proto_tree_add_item(tree, proto_old_pflog, tvb, 0, 0, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_old_pflog, tvb, 0, 0, ENC_NA); pflog_tree = proto_item_add_subtree(ti, ett_pflog); diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index cb8605a3d3..f63c48ac40 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -150,7 +150,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIMv1"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, ENC_NA); pim_tree = proto_item_add_subtree(ti, ett_pim); /* Put IGMP type, 0x14, into the tree */ @@ -654,7 +654,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, typestr); - ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, ENC_NA); pim_tree = proto_item_add_subtree(ti, ett_pim); proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index 8cc8e1cdfa..8623f2289b 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.c @@ -157,7 +157,7 @@ dissect_pingpongprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree * necessary to generate protocol tree items. */ if (tree) { /* create the pingpongprotocol protocol tree */ - pingpongprotocol_item = proto_tree_add_item(tree, proto_pingpongprotocol, message_tvb, 0, -1, FALSE); + pingpongprotocol_item = proto_tree_add_item(tree, proto_pingpongprotocol, message_tvb, 0, -1, ENC_NA); pingpongprotocol_tree = proto_item_add_subtree(pingpongprotocol_item, ett_pingpongprotocol); } else { pingpongprotocol_tree = NULL; diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 36a29a1f7e..7bef3a117e 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -378,7 +378,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr if(parent_tree){ - item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, FALSE); + item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_pkixtsp); } @@ -399,7 +399,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr if(parent_tree){ - item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, FALSE); + item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_pkixtsp); } diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 7367fd78cb..33b5875a46 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -554,7 +554,7 @@ dissect_pktc_mtafqdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC"); if (tree) { - item = proto_tree_add_item(tree, proto_pktc, tvb, 0, 0, FALSE); + item = proto_tree_add_item(tree, proto_pktc, tvb, 0, 0, ENC_NA); pktc_mtafqdn_tree = proto_item_add_subtree(item, ett_pktc_mtafqdn); } @@ -587,7 +587,7 @@ dissect_pktc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC"); if (tree) { - item = proto_tree_add_item(tree, proto_pktc, tvb, 0, 3, FALSE); + item = proto_tree_add_item(tree, proto_pktc, tvb, 0, 3, ENC_NA); pktc_tree = proto_item_add_subtree(item, ett_pktc); } diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index e90f2fe878..6f65874046 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -91,7 +91,7 @@ static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_pktgen, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pktgen, tvb, 0, -1, ENC_NA); pktgen_tree = proto_item_add_subtree(ti, ett_pktgen); diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 97e56c1cfc..63e7518e8f 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -405,7 +405,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Lets add a subtree to our dissection to display the info */ - ti = proto_tree_add_item(tree, proto_pnrp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pnrp, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Message Type %s", val_to_str(message_type, messageType, "Unknown (0x%02x)")); /* Get a main tree for the whole protocol */ diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index a4b795b8c9..1e5c5e7cf5 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -194,7 +194,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) format_text(line, linelen)); } - ti = proto_tree_add_item(tree, proto_pop, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pop, tvb, offset, -1, ENC_NA); pop_tree = proto_item_add_subtree(ti, ett_pop); if (is_continuation) { diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 79e1e88b2c..3415c6a0d9 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3313,7 +3313,7 @@ dissect_vsncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) { - ti = proto_tree_add_item(tree, proto_vsncp, tvb, 0, length, FALSE); + ti = proto_tree_add_item(tree, proto_vsncp, tvb, 0, length, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_vsncp); proto_tree_add_text(fh_tree, tvb, 0, 1, "Code: %s (0x%02x)", val_to_str_const(code, cp_vals, "Unknown"), code); proto_tree_add_text(fh_tree, tvb, 1, 1, "Identifier: 0x%02x", id); @@ -3363,7 +3363,7 @@ dissect_vsnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) /* we are being asked for details */ { - vsnp_item = proto_tree_add_item(tree, proto_vsnp, tvb, 0, -1, FALSE); + vsnp_item = proto_tree_add_item(tree, proto_vsnp, tvb, 0, -1, ENC_NA); vsnp_tree = proto_item_add_subtree(vsnp_item, ett_vsnp); proto_tree_add_item(vsnp_tree, hf_vsnp_pdnid, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3432,7 +3432,7 @@ dissect_bcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_bcp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_bcp, tvb, 0, -1, ENC_NA); bcp_tree = proto_item_add_subtree(ti, ett_bcp); } @@ -3573,7 +3573,7 @@ dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str_const(type, bap_vals, "Unknown")); if(tree) { - ti = proto_tree_add_item(tree, proto_bap, tvb, 0, length, FALSE); + ti = proto_tree_add_item(tree, proto_bap, tvb, 0, length, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_bap_options); proto_tree_add_text(fh_tree, tvb, 0, 1, "Type: %s (0x%02x)", val_to_str_const(type, bap_vals, "Unknown"), type); @@ -3617,7 +3617,7 @@ dissect_comp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Compressed data"); if (tree) { - ti = proto_tree_add_item(tree, proto_comp_data, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_comp_data, tvb, 0, -1, ENC_NA); comp_data_tree = proto_item_add_subtree(ti, ett_comp_data); } } @@ -3630,7 +3630,7 @@ dissect_comp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Compressed data"); if (tree) { - proto_tree_add_item(tree, proto_comp_data, tvb, 0, -1, FALSE); + proto_tree_add_item(tree, proto_comp_data, tvb, 0, -1, ENC_NA); } } #endif @@ -3669,7 +3669,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length_remaining = tvb_reported_length(tvb); if (tree) { - ti = proto_tree_add_item(tree, proto_pppmux, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pppmux, tvb, 0, -1, ENC_NA); mux_tree = proto_item_add_subtree(ti,ett_pppmux); while (length_remaining > 0) { @@ -4058,7 +4058,7 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "PPP Multilink"); if (tree) { - ti = proto_tree_add_item(tree, proto_mp, tvb, 0, mp_short_seqno ? 2 : 4, FALSE); + ti = proto_tree_add_item(tree, proto_mp, tvb, 0, mp_short_seqno ? 2 : 4, ENC_NA); mp_tree = proto_item_add_subtree(ti, ett_mp); } @@ -4113,7 +4113,7 @@ dissect_ppp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { proto_tree *fh_tree = NULL; if(tree) { - ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, -1, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_ppp); } @@ -4142,7 +4142,7 @@ dissect_ppp_hdlc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* load the top pane info. This should be overwritten by the next protocol in the stack */ if(tree) { - ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, -1, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_ppp); if (byte0 == 0xff) { proto_tree_add_item(fh_tree, hf_ppp_address, tvb, 0, 1, ENC_BIG_ENDIAN); @@ -4257,7 +4257,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP"); if (tree) { - ti = proto_tree_add_item(tree, proto_ppp_hdlc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ppp_hdlc, tvb, 0, -1, ENC_NA); bs_tree = proto_item_add_subtree(ti, ett_ppp_hdlc_data); } @@ -4470,7 +4470,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(code, pap_vals, "Unknown")); if(tree) { - ti = proto_tree_add_item(tree, proto_pap, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_pap, tvb, 0, -1, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_pap); /* Code */ proto_tree_add_item(fh_tree, hf_pap_code, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4552,7 +4552,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { if(tree) { /* Create CHAP protocol tree */ - ti = proto_tree_add_item(tree, proto_chap, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_chap, tvb, 0, -1, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_chap); /* Code */ diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index d6a5936070..22edaa90b0 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -708,7 +708,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_pppoed, tvb, 0, reported_payload_length+6, FALSE); + ti = proto_tree_add_item(tree, proto_pppoed, tvb, 0, reported_payload_length+6, ENC_NA); pppoe_tree = proto_item_add_subtree(ti, ett_pppoed); /* Dissect fixed fields */ @@ -1072,7 +1072,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_pppoes, tvb, 0, 6, FALSE); + ti = proto_tree_add_item(tree, proto_pppoes, tvb, 0, 6, ENC_NA); pppoe_tree = proto_item_add_subtree(ti, ett_pppoe); proto_tree_add_item(pppoe_tree, hf_pppoe_version, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index c77e00b030..49cd3f8fd7 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -583,7 +583,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti, *item; proto_tree *pptp_tree; - ti = proto_tree_add_item(tree, proto_pptp, tvb, offset, len, FALSE); + ti = proto_tree_add_item(tree, proto_pptp, tvb, offset, len, ENC_NA); pptp_tree = proto_item_add_subtree(ti, ett_pptp); proto_tree_add_item(pptp_tree, hf_pptp_length, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 89f7c22aca..bf24f5a125 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -141,7 +141,7 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_prp, tvb, 0, PRP_TOTAL_LENGTH, - FALSE); + ENC_NA); prp_tree = proto_item_add_subtree(ti, ett_prp_supervision_frame); @@ -246,7 +246,7 @@ dissect_prp_redundancy_control_trailer(tvbuff_t *tvb, packet_info *pinfo _U_, pr { /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_prp, tvb, trailer_offset - 4, - trailer_offset, FALSE); + trailer_offset, ENC_NA); prp_tree = proto_item_add_subtree(ti, ett_prp_redundancy_control_trailer); diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 8811502edd..63e17d8158 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1602,7 +1602,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_ptp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ptp, tvb, 0, -1, ENC_NA); ptp_tree = proto_item_add_subtree(ti, ett_ptp); @@ -2327,7 +2327,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_ptp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ptp, tvb, 0, -1, ENC_NA); ptp_tree = proto_item_add_subtree(ti, ett_ptp_v2); diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index ff04b5e5fa..9642c92749 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -888,7 +888,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, } } else { if (string_data) { - string_buffer_print = + string_buffer_print = ep_strdup(format_text((guint8 *) string_buffer, (int)strlen(string_buffer))); } else { @@ -3117,7 +3117,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_pvfs, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_pvfs, tvb, 0, -1, ENC_NA); if (item) pvfs_tree = proto_item_add_subtree(item, ett_pvfs); diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 7268e36e0b..7fa572cce7 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -617,7 +617,7 @@ void dissect_11_or_aal5_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr if (tree) { proto_item* item; - item = proto_tree_add_item(tree, proto_11_or_aal5_pdu, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_11_or_aal5_pdu, tvb, 0, -1, ENC_NA); /*overwrite heading line*/ proto_item_set_text(item, proto_name_tree, 0/*-warn gcc 3.4.4*/); pwc_item_append_text_n_items(item,cells,"good ATM cell"); @@ -855,7 +855,7 @@ void dissect_aal5_sdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { proto_item* item; - item = proto_tree_add_item(tree, proto_aal5_sdu, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_aal5_sdu, tvb, 0, -1, ENC_NA); { proto_tree* tree2; tree2 = proto_item_add_subtree(item, ett_encaps); @@ -1030,7 +1030,7 @@ void dissect_n1_cw(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { proto_item* item; - item = proto_tree_add_item(tree, proto_n1_cw, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_n1_cw, tvb, 0, -1, ENC_NA); pwc_item_append_text_n_items(item,cells,"good ATM cell"); { proto_tree* tree2; @@ -1110,7 +1110,7 @@ void dissect_n1_nocw(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { proto_item* item; - item = proto_tree_add_item(tree, proto_n1_nocw, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_n1_nocw, tvb, 0, -1, ENC_NA); pwc_item_append_text_n_items(item,cells,"ATM cell"); { proto_tree* tree2; @@ -1194,7 +1194,7 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree if (tree) { proto_item *item; - item = proto_tree_add_item(tree, proto_control_word, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_control_word, tvb, 0, -1, ENC_NA); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Packet (size: %d) is too small to carry MPLS PW Control Word" ,(int)size); @@ -1206,7 +1206,7 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree if (tree) { proto_item* item_top; - item_top = proto_tree_add_item(tree, proto_control_word, tvb, 0, -1, FALSE); + item_top = proto_tree_add_item(tree, proto_control_word, tvb, 0, -1, ENC_NA); pwc_item_append_cw(item_top,tvb_get_ntohl(tvb, 0),FALSE); { @@ -1490,7 +1490,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) item = proto_tree_add_item(tree, proto_cell_header, tvb ,0 ,dissect_size - ,FALSE); + ,ENC_NA); if (PWATM_MODE_AAL5_PDU == pd->mode) { proto_item_set_text(item, "Third byte of Control Word"); /*overwrite heading line*/ @@ -1653,7 +1653,7 @@ int dissect_cell(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { proto_item* item; - item = proto_tree_add_item(tree, proto_cell, tvb, 0, dissect_size, FALSE); + item = proto_tree_add_item(tree, proto_cell, tvb, 0, dissect_size, ENC_NA); { pwatm_private_data_t * pd; pd = pinfo->private_data; diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index 4e3eabef25..85a2c2da07 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -102,7 +102,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original if (tree) { proto_item *item; - item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, ENC_NA); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "PW packet size (%d) is too small to carry sensible information" ,(int)packet_size); @@ -259,7 +259,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original { proto_item* item; - item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, ENC_NA); pwc_item_append_cw(item,tvb_get_ntohl(tvb_original, 0),TRUE); pwc_item_append_text_n_items(item,(int)payload_size,"octet"); { diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index 6144947e13..1c33f99c3b 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.c @@ -38,7 +38,7 @@ pwc_vals_cw_l_bit[] = { { 0x1, "Attachment Circuit Fault" }, { 0, NULL } }; - + const value_string pwc_vals_cw_r_bit[] = { @@ -98,7 +98,7 @@ void dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) gint size; proto_item* item; size = tvb_reported_length_remaining(tvb, 0); - item = proto_tree_add_item(tree, proto_pw_padding, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_pw_padding, tvb, 0, -1, ENC_NA); pwc_item_append_text_n_items(item,size,"byte"); { proto_tree* tree_p; diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 266fa9c973..2c821d40ca 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -75,7 +75,7 @@ dissect_pw_eth_cw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 0, 0, TRUE); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_item(tree, proto_pw_eth_cw, - tvb, 0, 4, FALSE); + tvb, 0, 4, ENC_NA); pw_eth_tree = proto_item_add_subtree(ti, ett_pw_eth); if (pw_eth_tree == NULL) return; diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 58265ca813..dec015da60 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -88,7 +88,7 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) if (tree) { proto_item *item; - item = proto_tree_add_item(tree, proto_encaps, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_encaps, tvb, 0, -1, ENC_NA); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "PW packet (%d) is smaller than PW encapsulation header (%d)" ,(int)packet_size,(int)encaps_size); @@ -186,7 +186,7 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) proto_item* item_headline; proto_item* item; - item_headline = proto_tree_add_item(tree, proto_encaps, tvb, 0, 4, FALSE); + item_headline = proto_tree_add_item(tree, proto_encaps, tvb, 0, 4, ENC_NA); proto_item_append_text(item_headline, ": 0x%.8" G_GINT32_MODIFIER "x", tvb_get_ntohl(tvb, 0)); subtree = proto_item_add_subtree(item_headline, ett_encaps); diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c index 38f543f597..10fd560d59 100644 --- a/epan/dissectors/packet-pw-hdlc.c +++ b/epan/dissectors/packet-pw-hdlc.c @@ -26,7 +26,7 @@ * --------------------------------- * 02.03.2009 Initial implementation, supports: * - HDLC mode (rfc4618 5.1), no CW, payload is PPP (PPP in HDLC-like Framing (rfc1662)). - * - FR port mode (rfc4618 5.2), no CW. + * - FR port mode (rfc4618 5.2), no CW. * * [informative: Not supported yet: * - All kinds of HDLC PW with CW. @@ -88,7 +88,7 @@ static void dissect_pw_hdlc_nocw_hdlc_ppp( tvbuff_t * tvb, packet_info * pinfo, addr = tvb_get_guint8(tvb, 0); control = tvb_get_guint8(tvb, 1); - item = proto_tree_add_item( tree, proto_pw_hdlc_nocw_hdlc_ppp, tvb, 0, 2, FALSE ); + item = proto_tree_add_item( tree, proto_pw_hdlc_nocw_hdlc_ppp, tvb, 0, 2, ENC_NA ); tr = proto_item_add_subtree( item, ett_pw_hdlc ); diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 455129f767..bcff66f71b 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -96,7 +96,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original if (tree) { proto_item *item; - item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, ENC_NA); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "PW packet size (%d) is too small to carry sensible information" ,(int)packet_size); @@ -256,7 +256,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original if (tree) { proto_item* item; - item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto, tvb_original, 0, -1, ENC_NA); pwc_item_append_cw(item,tvb_get_ntohl(tvb_original, 0),TRUE); pwc_item_append_text_n_items(item,(int)payload_size,"octet"); { diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 76876dbf20..814e1d20a7 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -2044,7 +2044,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_q2931, tvb, offset, -1, - FALSE); + ENC_NA); q2931_tree = proto_item_add_subtree(ti, ett_q2931); proto_tree_add_uint(q2931_tree, hf_q2931_discriminator, tvb, offset, 1, tvb_get_guint8(tvb, offset)); diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 6f54fd2313..c5ae68d8a3 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -2593,7 +2593,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot_discr = tvb_get_guint8(tvb, offset); if (tree) { ti = proto_tree_add_item(tree, proto_q931, tvb, offset, -1, - FALSE); + ENC_NA); q931_tree = proto_item_add_subtree(ti, ett_q931); dissect_q931_protocol_discriminator(tvb, offset, q931_tree); diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index ee73a85e49..396766299c 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1906,7 +1906,7 @@ dissect_q933(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_q933, tvb, offset, -1, - FALSE); + ENC_NA); q933_tree = proto_item_add_subtree(ti, ett_q933); dissect_q933_protocol_discriminator(tvb, offset, q933_tree); diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c index a1c4970035..8539ac003b 100644 --- a/epan/dissectors/packet-qllc.c +++ b/epan/dissectors/packet-qllc.c @@ -95,7 +95,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - qllc_ti = proto_tree_add_item(tree, proto_qllc, tvb, 0, -1, FALSE); + qllc_ti = proto_tree_add_item(tree, proto_qllc, tvb, 0, -1, ENC_NA); qllc_tree = proto_item_add_subtree(qllc_ti, ett_qllc); } diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index b298b4d335..59d71a40db 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -12406,7 +12406,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return offset; service = get_service(opcode); - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA); qsig_tree = proto_item_add_subtree(ti, ett_qsig); proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode); @@ -12457,7 +12457,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return offset; service = get_service(opcode); - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA); qsig_tree = proto_item_add_subtree(ti, ett_qsig); proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode); @@ -12507,7 +12507,7 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!err_ptr) return offset; - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA); qsig_tree = proto_item_add_subtree(ti, ett_qsig); proto_tree_add_uint(qsig_tree, hf_qsig_error, tvb, 0, 0, errcode); @@ -12555,7 +12555,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset offset = 0; - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti); ie_type = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index dc92435261..b6c6a912e1 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -446,7 +446,7 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_item *quake_item; quake_item = proto_tree_add_item(tree, proto_quake, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); quake_tree = proto_item_add_subtree(quake_item, ett_quake); } diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 843e42dcc4..13cf0b1780 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -694,7 +694,7 @@ dissect_quake2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_item *quake2_item; quake2_item = proto_tree_add_item(tree, proto_quake2, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); quake2_tree = proto_item_add_subtree(quake2_item, ett_quake2); proto_tree_add_uint_format(quake2_tree, direction == DIR_S2C ? diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index eab35c85c4..cb0505441f 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -466,7 +466,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_item *quake3_item; quake3_item = proto_tree_add_item(tree, proto_quake3, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); quake3_tree = proto_item_add_subtree(quake3_item, ett_quake3); dir_item = proto_tree_add_none_format( diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index b25aa89330..be66eec096 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -690,7 +690,7 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_item *quakeworld_item; quakeworld_item = proto_tree_add_item(tree, proto_quakeworld, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); quakeworld_tree = proto_item_add_subtree(quakeworld_item, ett_quakeworld); proto_tree_add_uint_format(quakeworld_tree, direction == DIR_S2C ? diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 86bfe446cd..4ab236a5b5 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1351,7 +1351,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Forces load of header fields, if not already done so */ DISSECTOR_ASSERT(proto_registrar_get_byname("radius.code")); - ti = proto_tree_add_item(tree,proto_radius, tvb, 0, rh.rh_pktlength, FALSE); + ti = proto_tree_add_item(tree,proto_radius, tvb, 0, rh.rh_pktlength, ENC_NA); radius_tree = proto_item_add_subtree(ti, ett_radius); proto_tree_add_uint(radius_tree,hf_radius_code, tvb, 0, 1, rh.rh_code); proto_tree_add_uint_format(radius_tree,hf_radius_id, tvb, 1, 1, rh.rh_ident, diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 61d775284b..9425078506 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -13120,7 +13120,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); /* create the ranap protocol tree */ - ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE); + ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, ENC_NA); ranap_tree = proto_item_add_subtree(ranap_item, ett_ranap); dissect_RANAP_PDU_PDU(tvb, pinfo, ranap_tree); diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 9eca3cd9c7..3095c76f7d 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -114,7 +114,7 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* populate a tree in the second pane with the status of the link layer (ie none) */ if (tree) { - ti = proto_tree_add_item(tree, proto_raw, tvb, 0, 0, FALSE); + ti = proto_tree_add_item(tree, proto_raw, tvb, 0, 0, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_raw); proto_tree_add_text(fh_tree, tvb, 0, 0, "No link information available"); } diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index bbac672b2e..6d698d2da5 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -24,13 +24,13 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301, USA. */ -/* +/* * ANSI E1.20-2006, Entertainment Technology * Remote Device Management over USITT DMX512, describes a method of * bi-directional communications over a USITT DMX512/1990 data link @@ -92,7 +92,7 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *item; proto_tree *ti = proto_tree_add_item(tree, proto_rdm, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); proto_tree *rdm_tree = proto_item_add_subtree(ti, ett_rdm); proto_tree_add_item(rdm_tree, hf_rdm_start_code, tvb, diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 5bb066dd1d..9cdece362e 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -1292,7 +1292,7 @@ dissect_rdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDP"); col_clear(pinfo->cinfo, COL_INFO); - item = proto_tree_add_item(parent_tree, proto_rdp, tvb, 0, tvb_length(tvb), FALSE); + item = proto_tree_add_item(parent_tree, proto_rdp, tvb, 0, tvb_length(tvb), ENC_NA); tree = proto_item_add_subtree(item, ett_rdp); return tree; diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index bd2bd10e34..e6c46790e0 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -306,7 +306,7 @@ static void dissect_rdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create RDT protocol tree */ if (tree) { - ti = proto_tree_add_item(tree, proto_rdt, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rdt, tvb, offset, -1, ENC_NA); rdt_tree = proto_item_add_subtree(ti, ett_rdt); } @@ -560,7 +560,7 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Create subtree for flags fields */ if (tree) { - proto_tree_add_item(tree, proto_rdt, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, proto_rdt, tvb, offset, -1, ENC_NA); ti = proto_tree_add_string_format(tree, hf_rdt_aact_flags, tvb, offset, 1, "", "Length-included=%u, stream_id=%u", diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 5b1c106447..acb87ec9bc 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -69,7 +69,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) l3off = tvb_get_ntohs(tvb, 22); if (tree) { - ti = proto_tree_add_item(tree, proto_redback, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_redback, tvb, 0, -1, ENC_NA); rbtree = proto_item_add_subtree(ti, ett_redback); proto_tree_add_item(rbtree, hf_redback_context, tvb, 0, 4, ENC_BIG_ENDIAN); @@ -105,7 +105,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x02: /* * This is ISIS - Either incoming with ethernet FCS - * and CLNP - passed to the eth dissector or in case + * and CLNP - passed to the eth dissector or in case * of outgoing its pure ISIS and the linecard attaches * the ethernet and CLNP headers ... * diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index 72fd7ded12..1433da6414 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -91,10 +91,10 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset, /* XXX: ToDo: Validate the length (avplen) of the fixed length fields before calling proto_tree_add_item(). - Note that the field lengths have been validated when + Note that the field lengths have been validated when dissect_avp() is called from redbackli_dissect_heur(). */ - + switch(avptype) { case(RB_AVP_SEQNO): proto_tree_add_item(st, hf_redbackli_seqno, tvb, @@ -146,7 +146,7 @@ redbackli_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_redbackli, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); redbackli_tree = proto_item_add_subtree(ti, ett_redbackli); } @@ -249,7 +249,7 @@ void proto_register_redbackli(void) { "Session Identifier", HFILL }}, { &hf_redbackli_dir, #if 0 /* XXX: If one goes by the heuristic then this field can be variable length ?? - In the absence of any documentation We'll assume that's the case + In the absence of any documentation We'll assume that's the case (even though 'direction' sounds like a fixed length field */ { "Direction", "redbackli.dir", FT_UINT8, BASE_DEC, NULL, 0x0, #endif diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index 9bf54a573f..5608b1944c 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -247,7 +247,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr reload_frame->req_time = pinfo->fd->abs_ts; } - ti = proto_tree_add_item(tree, proto_reload_framing, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_reload_framing, tvb, 0, -1, ENC_NA); reload_framing_tree = proto_item_add_subtree(ti, ett_reload_framing); diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 238efa2d5d..9a0ad4bbd8 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -3956,7 +3956,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_add_proto_data(conversation, proto_reload, reload_info); } - ti = proto_tree_add_item(tree, proto_reload, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_reload, tvb, 0, -1, ENC_NA); reload_tree = proto_item_add_subtree(ti, ett_reload); diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index d42418d032..2aebcf5f64 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -72,7 +72,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) retix_bpdu_tree = NULL; if (tree) { - ti = proto_tree_add_item(tree, proto_retix_bpdu, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_retix_bpdu, tvb, 0, -1, ENC_NA); retix_bpdu_tree = proto_item_add_subtree(ti, ett_retix_bpdu); } diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index ed65c7c9d9..df4b60691a 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -55,7 +55,7 @@ static int hf_rfc2190_pbframes = -1; static int hf_rfc2190_sbit = -1; static int hf_rfc2190_ebit = -1; static int hf_rfc2190_srcformat = -1; -static int hf_rfc2190_picture_coding_type = -1; +static int hf_rfc2190_picture_coding_type = -1; static int hf_rfc2190_unrestricted_motion_vector = -1; static int hf_rfc2190_syntax_based_arithmetic = -1; static int hf_rfc2190_advanced_prediction = -1; @@ -101,9 +101,9 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) } if ( tree ) { - ti = proto_tree_add_item( tree, proto_rfc2190, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_rfc2190, tvb, offset, -1, ENC_NA ); rfc2190_tree = proto_item_add_subtree( ti, ett_rfc2190 ); - + /* FBIT 1st octet, 1 bit */ proto_tree_add_boolean( rfc2190_tree, hf_rfc2190_ftype, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x80 ); /* PBIT 1st octet, 1 bit */ @@ -127,7 +127,7 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_boolean( rfc2190_tree, hf_rfc2190_syntax_based_arithmetic, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x04 ); /* A flag, 1 bit */ proto_tree_add_boolean( rfc2190_tree, hf_rfc2190_advanced_prediction, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x02 ); - + /* Reserved 2nd octect, 1 bit + 3rd octect 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_r, tvb, offset, 2, ( ( tvb_get_guint8( tvb, offset ) & 0x1 ) << 3 ) + ( ( tvb_get_guint8( tvb, offset + 1 ) & 0xe0 ) >> 5 ) ); @@ -137,12 +137,12 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint( rfc2190_tree, hf_rfc2190_dbq, tvb, offset, 1, ( tvb_get_guint8( tvb, offset ) & 0x18 ) >> 3 ); /* TRB 3 octect, 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_trb, tvb, offset, 1, ( tvb_get_guint8( tvb, offset ) & 0x07 ) ); - + offset++; - + /* TR 4 octect, 8 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_tr, tvb, offset, 1, tvb_get_guint8( tvb, offset ) ); - + offset++; } else { /* MODE B or MODE C */ @@ -155,7 +155,7 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint( rfc2190_tree, hf_rfc2190_gobn, tvb, offset, 1, ( tvb_get_guint8( tvb, offset ) & 0xf8 ) >> 3); /* MBA 3 octect, 3 bits + 4 octect 6 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_mba, tvb, offset, 2, ( ( tvb_get_guint8( tvb, offset ) & 0x7 ) << 6 ) + ( ( tvb_get_guint8( tvb, offset + 1 ) & 0xfc ) >> 2 ) ); - + offset++; /* Reserved 4th octect, 2 bits */ @@ -171,43 +171,43 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_boolean( rfc2190_tree, hf_rfc2190_syntax_based_arithmetic, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x20 ); /* A flag, 1 bit */ proto_tree_add_boolean( rfc2190_tree, hf_rfc2190_advanced_prediction, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x10 ); - + /* HMV1 5th octect, 4 bits + 6th octect 3 bits*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_hmv1, tvb, offset, 2,( ( tvb_get_guint8( tvb, offset ) & 0xf ) << 3 ) + ( ( tvb_get_guint8( tvb, offset+1 ) & 0xe0 ) >> 5) ); - + offset++; - + /* VMV1 6th octect, 5 bits + 7th octect 2 bits*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_vmv1, tvb, offset, 2,( ( tvb_get_guint8( tvb, offset ) & 0x1f ) << 2 ) + ( ( tvb_get_guint8( tvb, offset+1 ) & 0xc0 ) >> 6) ); - + offset++; /* HMV2 7th octect, 6 bits + 8th octect 1 bit*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_hmv2, tvb, offset, 2,( ( tvb_get_guint8( tvb, offset ) & 0x3f ) << 1 ) + ( ( tvb_get_guint8( tvb, offset+1 ) & 0xf0 ) >> 7) ); - + offset++; /* VMV2 8th octect, 7 bits*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_vmv2, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x7f ); - + offset++; if(rfc2190_version == 0x03) { /* MODE C */ /* Reserved 9th to 11th octect, 8 + 8 + 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_rr, tvb, offset, 3, ( tvb_get_guint8( tvb, offset ) << 11 ) + ( tvb_get_guint8( tvb, offset + 1 ) << 3 ) + ( ( tvb_get_guint8( tvb, offset + 2 ) & 0xe0 ) >> 5 ) ); - + offset+=2; /* DBQ 11th octect, 2 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_dbq, tvb, offset, 1, ( tvb_get_guint8( tvb, offset ) & 0x18 ) >>3 ); /* TRB 11th octect, 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_trb, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x07 ); - + offset++; - + /* TR 12th octect, 8 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_tr, tvb, offset, 1, tvb_get_guint8( tvb, offset ) ); - + offset++; } /* end mode c */ } /* end not mode a */ @@ -224,8 +224,8 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) break; } } - - + + /* The rest of the packet is the H.263 stream */ next_tvb = tvb_new_subset( tvb, offset, tvb_length(tvb) - offset, tvb_reported_length(tvb) - offset); call_dissector(h263_handle,next_tvb,pinfo,tree); diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index 5fad192a4c..38c723e4a6 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - Based on RFC3488 +/* + Based on RFC3488 This is a setup for RGMP dissection, a simple protocol bolted on IGMP. The trick is to have IGMP dissector call this function (which by itself is not @@ -74,7 +74,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off return offset + tvb_length_remaining(tvb, offset); } - item = proto_tree_add_item(parent_tree, proto_rgmp, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_rgmp, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_rgmp); col_set_str(pinfo->cinfo, COL_PROTOCOL, "RGMP"); @@ -82,7 +82,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off type = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, rgmp_types, "Unknown Type: 0x%02x")); } proto_tree_add_uint(tree, hf_type, tvb, offset, 1, type); diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 50fdcd9c4c..e9b5bb5ad4 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -132,7 +132,7 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(command, command_vals, "Unknown command (%u)")); if (tree) { - ti = proto_tree_add_item(tree, proto_rip, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rip, tvb, 0, -1, ENC_NA); rip_tree = proto_item_add_subtree(ti, ett_rip); proto_tree_add_uint(rip_tree, hf_rip_command, tvb, 0, 1, command); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index a7cca25d39..9c77aef6bf 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -74,7 +74,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } if (tree) { - ti = proto_tree_add_item(tree, proto_ripng, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ripng, tvb, offset, -1, ENC_NA); ripng_tree = proto_item_add_subtree(ti, ett_ripng); /* Command */ diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 0c500934d5..f606d1c877 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -1393,7 +1393,7 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, if (!createdChannel) { /* Ahead of expected SN. Assume frames have been missed */ p_report_in_frame->state = SN_Missing; - + p_report_in_frame->firstSN = expectedSequenceNumber; p_report_in_frame->lastSN = (1024 + sequenceNumber-1) % 1024; } @@ -2416,7 +2416,7 @@ static void dissect_rlc_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC-LTE"); /* Create protocol tree. */ - top_ti = proto_tree_add_item(tree, proto_rlc_lte, tvb, offset, -1, FALSE); + top_ti = proto_tree_add_item(tree, proto_rlc_lte, tvb, offset, -1, ENC_NA); rlc_lte_tree = proto_item_add_subtree(top_ti, ett_rlc_lte); diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index c6f21a980b..ca8135f720 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -1599,7 +1599,7 @@ dissect_rlc_pcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* PCCH is always RLC TM */ if (tree) { proto_item *ti; - ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_rlc); proto_item_append_text(ti, " TM (PCCH)"); } @@ -1620,7 +1620,7 @@ dissect_rlc_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!fpi) return; /* dissection failure */ if (tree) { - ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_rlc); } @@ -1650,7 +1650,7 @@ dissect_rlc_ctch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!fpi) return; /* dissection failure */ if (tree) { - ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_rlc); } @@ -1682,7 +1682,7 @@ dissect_rlc_dcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_rlc); } @@ -1717,7 +1717,7 @@ dissect_rlc_ps_dtch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!fpi || !rlci) return; if (tree) { - ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_rlc); } @@ -1860,7 +1860,7 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_rlc, rlc_tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rlc, rlc_tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_rlc); } diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c index 3641208f43..d1d7f17a8a 100644 --- a/epan/dissectors/packet-rlm.c +++ b/epan/dissectors/packet-rlm.c @@ -12,39 +12,39 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + /* * RLM is a proprietary Cisco protocol used for centralling managing * many redundant NASes. I don't know much about the format, but you * can read about the feature here: - * + * * http://www.cisco.com/en/US/docs/ios/12_0t/12_0t3/feature/guide/rlm_123.html * * RLM runs on a UDP port (default 3000) between the MGC and the NAS. * On port N+1 (default 3001), a Q.931/LAPD/UDP connection is maintained. * Both sides use the same local port number for the connection, so source * and dest port are always the same. - * + * * In large networks, the links are typically split onto higher ports, * so anything up to 3015 (or higher) could either be RLM or Q.931 traffic, * although always the RLM has the one lower port number for that RLM group. * * Multiple RLM groups are possible on a single NAS. - * + * * I haven't been able to find the protocol documented, so I've * guessed some of the fields based on the output of debug commands on * cisco NASes. - * + * */ #ifdef HAVE_CONFIG_H @@ -81,7 +81,7 @@ static gint ett_rlm = -1; /* #define ??? ?? */ -/* +/* Maybe this isn't the best place for it, but RLM goes hand in hand with Q.931 traffic on a higher port. */ @@ -164,7 +164,7 @@ dissect_rlm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* proto_tree_add_protocol_format(tree, proto_rlm, tvb, 0, 16, "Cisco Session Management"); */ - ti = proto_tree_add_item(tree, proto_rlm, tvb, 0, 8, FALSE); + ti = proto_tree_add_item(tree, proto_rlm, tvb, 0, 8, ENC_NA); rlm_tree = proto_item_add_subtree(ti, ett_rlm); proto_tree_add_item(rlm_tree, hf_rlm_version, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(rlm_tree, hf_rlm_type, tvb, 1, 1, rlm_type, "Type: %u (%s)", rlm_type, type_str); @@ -203,27 +203,27 @@ proto_register_rlm(void) static hf_register_info hf[] = { { &hf_rlm_version, { "Version", "rlm.version", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_rlm_type, { "Type", "rlm.type", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_rlm_unknown, { "Unknown", "rlm.unknown", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_rlm_tid, { "Transaction ID", "rlm.tid", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_rlm_unknown2, { "Unknown", "rlm.unknown2", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 928c91fcc1..af3f4a83cb 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -194,7 +194,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, proto_item *user_info_item, *window_info_item; /* Create rlogin subtree */ - ti = proto_tree_add_item(tree, proto_rlogin, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rlogin, tvb, 0, -1, ENC_NA); rlogin_tree = proto_item_add_subtree(ti, ett_rlogin); /* Return if data empty */ diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index af87f046fe..5840c39f7c 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -176,7 +176,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_rmi, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rmi, tvb, 0, -1, ENC_NA); rmi_tree = proto_item_add_subtree(ti, ett_rmi); switch(rmitype) { case RMI_OUTPUTSTREAM: @@ -255,7 +255,7 @@ dissect_ser(tvbuff_t *tvb, proto_tree *tree) offset = 0; if(tree) { - ti = proto_tree_add_item(tree, proto_ser, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ser, tvb, 0, -1, ENC_NA); ser_tree = proto_item_add_subtree(ti, ett_ser); proto_tree_add_item(ser_tree, hf_ser_magic, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 760608b429..8cf52f4419 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -118,7 +118,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_rmp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rmp, tvb, 0, -1, ENC_NA); rmp_tree = proto_item_add_subtree(ti, ett_rmp); proto_tree_add_uint(rmp_tree, hf_rmp_type, tvb, 0, 1, type); diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c index 3bc4ba3d9f..dea922909d 100644 --- a/epan/dissectors/packet-rmt-alc.c +++ b/epan/dissectors/packet-rmt-alc.c @@ -140,7 +140,7 @@ static void dissect_alc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Create subtree for the ALC protocol */ - ti = proto_tree_add_item(tree, proto, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto, tvb, offset, -1, ENC_NA); alc_tree = proto_item_add_subtree(ti, ett.main); /* Fill the ALC subtree */ diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 0645829846..bbd212d71c 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -568,7 +568,7 @@ static void dissect_norm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Create subtree for the NORM protocol */ - ti = proto_tree_add_item(tree, proto, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto, tvb, offset, -1, ENC_NA); norm_tree = proto_item_add_subtree(ti, ett.main); /* Fill the NORM subtree */ diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index d41cfd18aa..ad9fba8240 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -609,7 +609,7 @@ dissect_rohc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, " "); } /*if (tree) {*/ - ti = proto_tree_add_item(tree, proto_rohc, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rohc, tvb, 0, -1, ENC_NA); rohc_tree = proto_item_add_subtree(ti, ett_rohc); /* 1) If the first octet is a Padding Octet (11100000), * strip away all initial Padding Octets and goto next step. diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index ecc4d09ac6..4cb9306c66 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -217,7 +217,7 @@ static void dissect_roofnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - it = proto_tree_add_item(tree, proto_roofnet, tvb, offset, -1, FALSE); + it = proto_tree_add_item(tree, proto_roofnet, tvb, offset, -1, ENC_NA); roofnet_tree = proto_item_add_subtree(it, ett_roofnet); } diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 3895923263..c347911734 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1631,7 +1631,7 @@ dissect_rpc_continuation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { rpc_item = proto_tree_add_item(tree, proto_rpc, tvb, 0, -1, - FALSE); + ENC_NA); rpc_tree = proto_item_add_subtree(rpc_item, ett_rpc); proto_tree_add_text(rpc_tree, tvb, 0, -1, "Continuation data"); } @@ -1924,7 +1924,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { rpc_item = proto_tree_add_item(tree, proto_rpc, tvb, 0, -1, - FALSE); + ENC_NA); rpc_tree = proto_item_add_subtree(rpc_item, ett_rpc); if (is_tcp) { diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 2eb81764f9..4168e75db8 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -281,7 +281,7 @@ dissect_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { ti = proto_tree_add_item(tree, proto_rpl, tvb, 0, - rpl_len, FALSE); + rpl_len, ENC_NA); rpl_tree = proto_item_add_subtree(ti, ett_rpl); hidden_item = proto_tree_add_uint(rpl_tree, hf_rpl_type, tvb, 2, 2, rpl_type); diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 7c14e43d73..fbc67e3df6 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -122715,7 +122715,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC"); /* create the rrc protocol tree */ - rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, FALSE); + rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA); rrc_tree = proto_item_add_subtree(rrc_item, ett_rrc); if (rrcinf) { diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index 22a3d7712b..6e64524e11 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.c @@ -67,7 +67,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { ti = proto_tree_add_item(tree, proto_rsh, tvb, offset, -1, - FALSE); + ENC_NA); rsh_tree = proto_item_add_subtree(ti, ett_rsh); /* diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 4cf0701f17..a0a79c04df 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -997,7 +997,7 @@ dissect_rsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Unknown Message Type (0x%0x)")); if (tree) { - ti = proto_tree_add_item(tree, proto_rsip, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rsip, tvb, 0, -1, ENC_NA); rsip_tree = proto_item_add_subtree(ti, ett_rsip); diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 85185e1e7c..17cd0d07f8 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -785,8 +785,8 @@ dissect_rsl_ie_ch_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, in ie_offset = offset; - /* 3GPP TS 44.018 "Channel Description" - * the whole of the 3GPP TS 44.018 element including the element identifier and + /* 3GPP TS 44.018 "Channel Description" + * the whole of the 3GPP TS 44.018 element including the element identifier and * length should be included. * XXX Hmm a type 3 IE (TV). */ @@ -3517,7 +3517,7 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) top_tree = tree; if (tree) { - ti = proto_tree_add_item(tree, proto_rsl, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_rsl, tvb, 0, -1, ENC_NA); rsl_tree = proto_item_add_subtree(ti, ett_rsl); /* 9.1 Message discriminator */ diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index cfc4f49519..8e785d5bbf 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -6272,7 +6272,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, message_type = tvb_get_guint8(tvb, 1); ti = proto_tree_add_item(tree, proto_rsvp, tvb, offset, msg_length, - FALSE); + ENC_NA); rsvp_tree = proto_item_add_subtree(ti, tree_mode); if (pinfo->ipproto == IP_PROTO_RSVPE2EI) proto_item_append_text(rsvp_tree, " (E2E-IGNORE)"); diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index b8e8a2aedc..7e44e0cee6 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -116,7 +116,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, conversation_set_dissector(conversation, rsync_handle); - ti = proto_tree_add_item(tree, proto_rsync, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rsync, tvb, 0, -1, ENC_NA); rsync_tree = proto_item_add_subtree(ti, ett_rsync); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 99c441aaae..a197f7058d 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -53,12 +53,12 @@ */ /* - * The part of this dissector for IDMS XR blocks was written by + * The part of this dissector for IDMS XR blocks was written by * Torsten Loebner (loebnert@googlemail.com) in the context of a graduation * project with the research organization TNO in Delft, Netherland. - * The extension is based on the RTCP XR block specified in + * The extension is based on the RTCP XR block specified in * ETSI TS 182 063 v3.5.2 Annex W (http://www.etsi.org/deliver/etsi_ts/183000_183099/183063/), - * which was registered by IANA as RTCP XR Block Type 12 + * which was registered by IANA as RTCP XR Block Type 12 * (http://www.iana.org/assignments/rtcp-xr-block-types/rtcp-xr-block-types.xml). */ @@ -1806,13 +1806,13 @@ static gboolean validate_xr_block_length(tvbuff_t *tvb, packet_info *pinfo, int expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_WARN, "Invalid block length, should be 8"); return FALSE; - + case RTCP_XR_IDMS: if (block_len != 7) expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_WARN, "Invalid block length, should be 7"); return FALSE; - + default: break; } @@ -2191,32 +2191,32 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree, } case RTCP_XR_IDMS: offset -= 3; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_spst, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_spst, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=3; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_pt, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_pt, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_msci, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_msci, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_source_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_source_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_rcv_ts_msw, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_rcv_ts_msw, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_rcv_ts_lsw, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_rcv_ts_lsw, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; item = proto_tree_add_item(content_tree, hf_rtcp_ntp, tvb, offset-8, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(item); - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_rtp_ts, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_rtp_ts, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_pres_ts, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(content_tree, hf_rtcp_xr_idms_ntp_pres_ts, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - + tmp_ts = tvb_get_ntohl(tvb,offset-4); hour = ( (int) ( tmp_ts >> 16 ) ) / 3600; - min = (( (int) ( tmp_ts >> 16 ) ) - hour * 3600) / 60; + min = (( (int) ( tmp_ts >> 16 ) ) - hour * 3600) / 60; sec = (( (int) ( tmp_ts >> 16 ) ) - hour * 3600 - min * 60); msec = ( (int) ( tmp_ts & 0x0000FFFF ) ) / 66; - + item = proto_tree_add_text( content_tree, tvb, offset-4, 4, "short NTP timestamp of presentation: %d:%02d:%02d:%03d [h:m:s:ms] ", hour,min,sec,msec); PROTO_ITEM_SET_GENERATED(item); break; @@ -2787,7 +2787,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) packet_length = ( tvb_get_ntohs( tvb, offset + 2 ) + 1 ) * 4; total_packet_length += packet_length; - ti = proto_tree_add_item(tree, proto_rtcp, tvb, offset, packet_length, FALSE ); + ti = proto_tree_add_item(tree, proto_rtcp, tvb, offset, packet_length, ENC_NA ); proto_item_append_text(ti, " (%s)", val_to_str(packet_type, rtcp_packet_type_vals, diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 060231cade..f9eb5cb4ec 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -1163,7 +1163,7 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t if (tree) { - ti = proto_tree_add_item(tree, proto_rtmpt, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rtmpt, tvb, offset, -1, ENC_NA); if (tp->id>RTMPT_ID_MAX) { /* Dissect handshake */ diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 5975c65734..fa95294e25 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -409,7 +409,7 @@ dissect_rtnet_tdma_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { } if (root) { - ti = proto_tree_add_item(root, proto_tdma, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(root, proto_tdma, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(ti, ett_tdma); proto_item_append_text(ti, ", Version 1, %s", @@ -526,7 +526,7 @@ dissect_rtnet_tdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { } if (root) { - ti = proto_tree_add_item(root, proto_tdma, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(root, proto_tdma, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(ti, ett_tdma); proto_item_append_text(ti, ", %s", val_to_str(msg, tdma_msg_vals, "Unknown (0x%04x)")); @@ -586,7 +586,7 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissector = data_handle; if (tree) { - ti = proto_tree_add_item(tree, proto_rtmac, tvb, offset, 4, FALSE); + ti = proto_tree_add_item(tree, proto_rtmac, tvb, offset, 4, ENC_NA); rtmac_tree = proto_item_add_subtree(ti, ett_rtmac); proto_item_append_text(ti, ", Version %d", ver); } @@ -681,7 +681,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_rtcfg, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rtcfg, tvb, offset, -1, ENC_NA); rtcfg_tree = proto_item_add_subtree(ti, ett_rtcfg); } diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 6584c0cefd..03d5df60b5 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -115,7 +115,7 @@ dissect_rtp_events( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) val_to_str( rtp_evt, rtp_event_type_values, "Unknown (%u)" )); } - ti = proto_tree_add_item( tree, proto_rtp_events, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_rtp_events, tvb, offset, -1, ENC_NA ); rtp_events_tree = proto_item_add_subtree( ti, ett_rtp_events ); proto_tree_add_uint ( rtp_events_tree, hf_rtp_events_event, tvb, offset, 1, rtp_evt); @@ -129,7 +129,7 @@ dissect_rtp_events( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* The duration field indicates the duration of the event or segment * being reported, in timestamp units. */ - rtp_event_info.info_duration = tvb_get_ntohs(tvb, offset); + rtp_event_info.info_duration = tvb_get_ntohs(tvb, offset); proto_tree_add_item ( rtp_events_tree, hf_rtp_events_duration, tvb, offset, 2, ENC_BIG_ENDIAN); /* set the end info for the tap */ diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 8803984722..a8f9fdf21b 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1212,7 +1212,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) "Unknown RTP version %u", version); if ( tree ) { - ti = proto_tree_add_item( tree, proto_rtp, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item( tree, proto_rtp, tvb, offset, -1, ENC_NA ); rtp_tree = proto_item_add_subtree( ti, ett_rtp ); proto_tree_add_uint( rtp_tree, hf_rtp_version, tvb, @@ -1330,7 +1330,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( tree ) { proto_tree *item; /* Create RTP protocol tree */ - ti = proto_tree_add_item(tree, proto_rtp, tvb, offset, -1, FALSE ); + ti = proto_tree_add_item(tree, proto_rtp, tvb, offset, -1, ENC_NA ); rtp_tree = proto_item_add_subtree(ti, ett_rtp ); /* Conversation setup info */ @@ -1621,7 +1621,7 @@ dissect_pkt_ccc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *pkt_ccc_tree = NULL; if ( tree ) { - ti = proto_tree_add_item(tree, proto_pkt_ccc, tvb, 0, 12, FALSE); + ti = proto_tree_add_item(tree, proto_pkt_ccc, tvb, 0, 12, ENC_NA); pkt_ccc_tree = proto_item_add_subtree(ti, ett_pkt_ccc); proto_tree_add_item(pkt_ccc_tree, hf_pkt_ccc_id, tvb, 0, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 0dd688951d..7f888ebc7d 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -5587,7 +5587,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, if (tree) { guint8 nddsPing[8]; /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_rtps, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rtps, tvb, 0, -1, ENC_NA); rtps_tree = proto_item_add_subtree(ti, ett_rtps); /* Protocol Version */ diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index b650cbfc15..9047afe091 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -8517,7 +8517,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_rtps, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_rtps, tvb, 0, -1, ENC_NA); rtps_tree = proto_item_add_subtree(ti, ett_rtps); /* Protocol Version */ diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 6229d13945..7b7c2a4c40 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -829,7 +829,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, orig_offset = offset; if (tree) { ti = proto_tree_add_item(tree, proto_rtsp, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); rtsp_tree = proto_item_add_subtree(ti, ett_rtsp); } @@ -1515,7 +1515,7 @@ proto_reg_handoff_rtsp(void) saved_rtsp_tcp_port = global_rtsp_tcp_port; saved_rtsp_tcp_alternate_port = global_rtsp_tcp_alternate_port; - + stats_tree_register("rtsp","rtsp","RTSP/Packet Counter", 0, rtsp_stats_tree_packet, rtsp_stats_tree_init, NULL ); } diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index 4c718baa15..db60389eb8 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -1396,9 +1396,9 @@ dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RUA"); /* create the rua protocol tree */ - rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, FALSE); + rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, ENC_NA); rua_tree = proto_item_add_subtree(rua_item, ett_rua); - + dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree); } @@ -1739,7 +1739,7 @@ module_t *rua_module; /* Register fields and subtrees */ proto_register_field_array(proto_rua, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector */ register_dissector("rua", dissect_rua, proto_rua); @@ -1749,7 +1749,7 @@ module_t *rua_module; rua_proc_imsg_dissector_table = register_dissector_table("rua.proc.imsg", "RUA-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC); rua_proc_sout_dissector_table = register_dissector_table("rua.proc.sout", "RUA-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC); rua_proc_uout_dissector_table = register_dissector_table("rua.proc.uout", "RUA-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); - + rua_module = prefs_register_protocol(proto_rua, proto_reg_handoff_rua); prefs_register_uint_preference(rua_module, "port", "RUA SCTP Port", "Set the port for RUA messages (Default of 29169)", 10, &global_sctp_port); diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index e4144a27b2..87ff255751 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -35,7 +35,7 @@ * dissector from here. * * Here are some links: - * + * * http://www.watersprings.org/pub/id/draft-ietf-sigtran-reliable-udp-00.txt * http://www.javvin.com/protocolRUDP.html * http://www.cisco.com/univercd/cc/td/doc/product/access/sc/rel7/omts/omts_apb.htm#30052 @@ -52,7 +52,7 @@ /* Disable rudp by default. The previously hardcoded value of * 7000 (used by Cisco) collides with afs and as the draft states: - * "RUDP doesn't place any restrictions on which UDP port numbers are used. + * "RUDP doesn't place any restrictions on which UDP port numbers are used. * Valid port numbers are ports not defined in RFC 1700." */ /* FIXME: The proper solution would be to convert this dissector into @@ -110,7 +110,7 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_rudp, tvb, 0, hlen, FALSE); + ti = proto_tree_add_item(tree, proto_rudp, tvb, 0, hlen, ENC_NA); rudp_tree = proto_item_add_subtree(ti, ett_rudp); ti = proto_tree_add_item(rudp_tree, hf_rudp_flags, tvb, 0, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 460dc923de..f37c2ff3ff 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -8403,9 +8403,9 @@ dissect_s1ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "S1AP"); /* create the s1ap protocol tree */ - s1ap_item = proto_tree_add_item(tree, proto_s1ap, tvb, 0, -1, FALSE); + s1ap_item = proto_tree_add_item(tree, proto_s1ap, tvb, 0, -1, ENC_NA); s1ap_tree = proto_item_add_subtree(s1ap_item, ett_s1ap); - + dissect_S1AP_PDU_PDU(tvb, pinfo, s1ap_tree); } @@ -10634,7 +10634,7 @@ void proto_register_s1ap(void) { /* Register fields and subtrees */ proto_register_field_array(proto_s1ap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector */ register_dissector("s1ap", dissect_s1ap, proto_s1ap); @@ -10646,7 +10646,7 @@ void proto_register_s1ap(void) { s1ap_proc_imsg_dissector_table = register_dissector_table("s1ap.proc.imsg", "S1AP-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC); s1ap_proc_sout_dissector_table = register_dissector_table("s1ap.proc.sout", "S1AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC); s1ap_proc_uout_dissector_table = register_dissector_table("s1ap.proc.uout", "S1AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); - + /* Register configuration options for ports */ s1ap_module = prefs_register_protocol(proto_s1ap, proto_reg_handoff_s1ap); diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index 23bc512357..f62032c1f6 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -1311,7 +1311,7 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pdu_size = tvb_get_ntohs(tvb, s5066_size_offset) + s5066_header_size; - ti_s5066 = proto_tree_add_item(tree, proto_s5066, tvb, 0, -1, FALSE); + ti_s5066 = proto_tree_add_item(tree, proto_s5066, tvb, 0, -1, ENC_NA); proto_item_append_text(ti_s5066, ", PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)")); s5066_tree = proto_item_add_subtree(ti_s5066, ett_s5066); proto_tree_add_item(s5066_tree, hf_s5066_sync_word, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 24a4a99fb5..3bba145e57 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -1747,7 +1747,7 @@ dissect_sabp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); /* create the sbap protocol tree */ - sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, FALSE); + sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, ENC_NA); sabp_tree = proto_item_add_subtree(sabp_item, ett_sabp); dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree); diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 06a8a10220..eee6c403a1 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -145,7 +145,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - si = proto_tree_add_item(tree, proto_sap, tvb, offset, -1, FALSE); + si = proto_tree_add_item(tree, proto_sap, tvb, offset, -1, ENC_NA); sap_tree = proto_item_add_subtree(si, ett_sap); sif = proto_tree_add_uint(sap_tree, hf_sap_flags, tvb, offset, 1, vers_flags); diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 23331b164e..8707f62413 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -381,7 +381,7 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SASP"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree,proto_sasp,tvb,offset,-1,FALSE); + ti = proto_tree_add_item(tree,proto_sasp,tvb,offset,-1,ENC_NA); sasp_tree = proto_item_add_subtree(ti,ett_sasp_header); hdr_type = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index fb01ba36e8..36e565bf6c 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -884,7 +884,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ if (tree) { - ti = proto_tree_add_item(tree, proto_sbus, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sbus, tvb, offset, -1, ENC_NA); sbus_tree = proto_item_add_subtree(ti, ett_sbus); /*Add subtree for Ether-S-Bus header*/ diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 373ec0afd0..09dfec9ad7 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -2885,7 +2885,7 @@ dissect_sccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the sccp protocol tree */ - sccp_item = proto_tree_add_item(tree, proto_sccp, tvb, 0, -1, ENC_BIG_ENDIAN); + sccp_item = proto_tree_add_item(tree, proto_sccp, tvb, 0, -1, ENC_NA); sccp_tree = proto_item_add_subtree(sccp_item, ett_sccp); } diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index a95b15b29f..049205a92b 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -281,7 +281,7 @@ dissect_sccpmg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create the sccpmg protocol tree */ sccpmg_item = proto_tree_add_item(tree, proto_sccpmg, tvb, 0, - -1, FALSE); + -1, ENC_NA); sccpmg_tree = proto_item_add_subtree(sccpmg_item, ett_sccpmg); } diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index e8a9f18447..8d72f901f3 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -190,7 +190,7 @@ dissect_ssprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the ssprotocol protocol tree */ - ssprotocol_item = proto_tree_add_item(tree, proto_ssprotocol, message_tvb, 0, -1, FALSE); + ssprotocol_item = proto_tree_add_item(tree, proto_ssprotocol, message_tvb, 0, -1, ENC_NA); ssprotocol_tree = proto_item_add_subtree(ssprotocol_item, ett_ssprotocol); } else { ssprotocol_tree = NULL; diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index aab902093d..fabd7ec70c 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -103,7 +103,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { sdlc_ti = proto_tree_add_item(tree, proto_sdlc, tvb, 0, -1, - FALSE); + ENC_NA); sdlc_tree = proto_item_add_subtree(sdlc_ti, ett_sdlc); proto_tree_add_uint(sdlc_tree, hf_sdlc_address, tvb, 0, 1, diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 32bb6fbebe..4568248225 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -337,7 +337,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* XXX: Needs description. */ col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); - ti = proto_tree_add_item(tree, proto_sdp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sdp, tvb, offset, -1, ENC_NA); sdp_tree = proto_item_add_subtree(ti, ett_sdp); /* diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index 8d31389f43..413e88a3bb 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -162,7 +162,7 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Adding Sebek item and subtree */ - ti = proto_tree_add_item(tree, proto_sebek, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sebek, tvb, 0, -1, ENC_NA); sebek_tree = proto_item_add_subtree(ti, ett_sebek); /* check for minimum length before deciding where to go*/ diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 9f400f8633..97fdf9b59d 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -11,7 +11,7 @@ * Michael Mann * Copyright 2011 * * $Id$ - * + * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs @@ -920,7 +920,7 @@ static void dissect_siii_mdt_cp3_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree * this data could be extracted from svc communication during CP2 */ proto_tree_add_text(tree, tvb, 0, 0, "Service Channels"); - + proto_tree_add_text(tree, tvb, 0, 0, "Device Controls"); } @@ -1111,7 +1111,7 @@ static void dissect_siii_at_cp3_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* offsets of service channel, device status and connections are unknown * this data could be extracted from svc communication during CP2 */ - proto_tree_add_text(tree, tvb, 0, 0, "Service Channels"); + proto_tree_add_text(tree, tvb, 0, 0, "Service Channels"); proto_tree_add_text(tree, tvb, 0, 0, "Device Status"); } @@ -1210,7 +1210,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, "%s%u Channel=%s", tel_type, tel_no, tel_ch); - ti = proto_tree_add_item(tree, proto_siii, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_siii, tvb, 0, -1, ENC_NA); siii_tree = proto_item_add_subtree(ti, ett_siii); diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 47d0c3590e..6176fc0e02 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1048,7 +1048,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, val_to_str(type, ses_vals, "Unknown SPDU type (0x%02x)")); if (tree) { ti = proto_tree_add_item(tree, proto_clses, tvb, offset, - -1, FALSE); + -1, ENC_NA); ses_tree = proto_item_add_subtree(ti, ett_ses); proto_tree_add_uint(ses_tree, hf_ses_type, tvb, offset, 1, type); @@ -1060,7 +1060,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, val_to_str(type, ses_category0_vals, "Unknown SPDU type (0x%02x)")); if (tree) { ti = proto_tree_add_item(tree, proto_ses, tvb, offset, - -1, FALSE); + -1, ENC_NA); ses_tree = proto_item_add_subtree(ti, ett_ses); proto_tree_add_uint(ses_tree, hf_ses_type_0, tvb, offset, 1, type); @@ -1070,7 +1070,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, val_to_str(type, ses_vals, "Unknown SPDU type (0x%02x)")); if (tree) { ti = proto_tree_add_item(tree, proto_ses, tvb, offset, - -1, FALSE); + -1, ENC_NA); ses_tree = proto_item_add_subtree(ti, ett_ses); proto_tree_add_uint(ses_tree, hf_ses_type, tvb, offset, 1, type); diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 09a17e79bd..17797969af 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -884,7 +884,7 @@ dissect_sflow_245_address_type(tvbuff_t *tvb, proto_tree *tree, gint offset, break; default: /* acferen: November 10, 2010 - * + * * We should never get here, but if we do we don't know * the length for this address type. Not knowing the * length this default case is doomed to failure. Might @@ -2672,7 +2672,7 @@ dissect_sflow_245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_sflow, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sflow, tvb, 0, -1, ENC_NA); sflow_245_tree = proto_item_add_subtree(ti, ett_sflow_245); diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index baa91f4177..1c3e981340 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -1397,7 +1397,7 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entry in the Protocol column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - item = proto_tree_add_item(tree, proto_sgsap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_sgsap, tvb, 0, -1, ENC_NA); sgsap_tree = proto_item_add_subtree(item, ett_sgsap); /* Messge type IE*/ diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index a60bf31f52..6356be2c5a 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -415,7 +415,7 @@ dissect_sigcomp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) try_again: /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_sigcomp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_sigcomp, tvb, 0, -1, ENC_NA); sigcomp_tree = proto_item_add_subtree(ti, ett_sigcomp); i=0; end_off_message = FALSE; @@ -531,7 +531,7 @@ dissect_sigcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) top_tree = tree; /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_sigcomp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_sigcomp, tvb, 0, -1, ENC_NA); sigcomp_tree = proto_item_add_subtree(ti, ett_sigcomp); return dissect_sigcomp_common(tvb, pinfo, sigcomp_tree); @@ -2228,7 +2228,7 @@ tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree) int offset, next_offset, linelen; if(tree) { - ti = proto_tree_add_item(tree, proto_raw_sigcomp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_raw_sigcomp, tvb, 0, -1, ENC_NA); raw_tree = proto_item_add_subtree(ti, ett_raw_text); } diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 85f0b2254d..3b6bec7278 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -1223,7 +1223,7 @@ dissect_simulcrypt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 offset = 0; guint32 msg_length; - simulcrypt_item = proto_tree_add_item(tree, proto_simulcrypt, tvb, 0, -1, FALSE); + simulcrypt_item = proto_tree_add_item(tree, proto_simulcrypt, tvb, 0, -1, ENC_NA); simulcrypt_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt); proto_item_append_text(simulcrypt_item, ", Interface: %s", val_to_str(iftype, interfacenames, "Unknown (0x%02x)")); diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 16d80058cf..e37380ba31 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -1879,7 +1879,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr } if (tree) { - ts = proto_tree_add_item(tree, proto_sip, tvb, offset, -1, FALSE); + ts = proto_tree_add_item(tree, proto_sip, tvb, offset, -1, ENC_NA); sip_tree = proto_item_add_subtree(ts, ett_sip); } @@ -3103,7 +3103,7 @@ tvb_raw_text_add(tvbuff_t *tvb, int offset, int length, proto_tree *tree) char *str; if (tree) { - ti = proto_tree_add_item(tree, proto_raw_sip, tvb, offset, length, FALSE); + ti = proto_tree_add_item(tree, proto_raw_sip, tvb, offset, length, ENC_NA); raw_tree = proto_item_add_subtree(ti, ett_raw_text); } diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index 2df8d37939..a6452c2d31 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.c @@ -64,7 +64,7 @@ static void dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, ", with Sipfrag"); /* Create sipfrag tree. */ - ti = proto_tree_add_item(tree, proto_sipfrag, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sipfrag, tvb, offset, -1, ENC_NA); sipfrag_tree = proto_item_add_subtree(ti, ett_sipfrag); /* Show the sipfrag message a line at a time. */ diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 6d1846cb12..d16b362d1c 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -1324,7 +1324,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* In the interest of speed, if "tree" is NULL, don't do any work not * necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_skinny, tvb, offset, hdr_data_length+8, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_skinny, tvb, offset, hdr_data_length+8, ENC_NA); skinny_tree = proto_item_add_subtree(ti, ett_skinny); proto_tree_add_uint(skinny_tree, hf_skinny_data_length, tvb, offset, 4, hdr_data_length); proto_tree_add_uint(skinny_tree, hf_skinny_hdr_version, tvb, offset+4, 4, hdr_version); diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 9d2c4d023c..4105207464 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -260,7 +260,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_slimp3, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_slimp3, tvb, offset, -1, ENC_NA); slimp3_tree = proto_item_add_subtree(ti, ett_slimp3); proto_tree_add_uint(slimp3_tree, hf_slimp3_opcode, tvb, diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 9ced942d5c..014390c50f 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1076,7 +1076,7 @@ dissect_slow_protocols(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { pdu_item = proto_tree_add_item(tree, proto_slow, tvb, - 0, -1, FALSE); + 0, -1, ENC_NA); pdu_tree = proto_item_add_subtree(pdu_item, ett_pdu); /* Subtype */ diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 89e19cdc7e..17591844ea 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -341,7 +341,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_slsk, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_slsk, tvb, 0, -1, ENC_NA); slsk_tree = proto_item_add_subtree(ti, ett_slsk); /* Continue adding tree items to process the packet here */ diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 1a002224fa..cfff9bb59e 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -603,7 +603,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_smb_browse, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, proto_smb_browse, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_browse); } @@ -861,7 +861,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_smb_browse, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, proto_smb_browse, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_browse); } diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 0c0e479b7f..e2ea25a55e 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -933,7 +933,7 @@ dissect_smb_logon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { item = proto_tree_add_item(tree, proto_smb_logon, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); smb_logon_tree = proto_item_add_subtree(item, ett_smb_logon); } diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 5ba6fc5607..018194a7e5 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -147,7 +147,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, if(mshdr_tvb && setup_tvb){ if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_smb_msp, - mshdr_tvb, 0, -1, FALSE); + mshdr_tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_smb_msp); } diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 59818e69cc..e7f69aa8ac 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -2659,7 +2659,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_smb_lanman, - pd_tvb, 0, -1, FALSE); + pd_tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_lanman); } @@ -3559,7 +3559,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, sp_len = 0; if (tree) { pipe_item = proto_tree_add_item(tree, proto_smb_pipe, - sp_tvb, 0, sp_len, FALSE); + sp_tvb, 0, sp_len, ENC_NA); pipe_tree = proto_item_add_subtree(pipe_item, ett_smb_pipe); } offset = 0; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 3c62b11a2f..5f9ab1d83c 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -17366,7 +17366,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_smb, tvb, offset, - -1, FALSE); + -1, ENC_NA); tree = proto_item_add_subtree(item, ett_smb); hitem = proto_tree_add_text(tree, tvb, offset, 32, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 49b457b63a..f71d0f070e 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4216,7 +4216,7 @@ dissect_smb2_FSCTL_SET_COMPRESSION(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ return offset; } -static int +static int dissect_smb2_FSCTL_SET_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean data_in) { @@ -6263,7 +6263,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_smb2, tvb, offset, - -1, FALSE); + -1, ENC_NA); tree = proto_item_add_subtree(item, ett_smb2); } diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index c22ca73962..2790fe4ab5 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -2443,7 +2443,7 @@ dissect_smpp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Create display subtree for the protocol */ if (tree) { - ti = proto_tree_add_item (tree, proto_smpp, tvb, 0, tvb_length(tvb), FALSE); + ti = proto_tree_add_item (tree, proto_smpp, tvb, 0, tvb_length(tvb), ENC_NA); smpp_tree = proto_item_add_subtree (ti, ett_smpp); } diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 0cbc56e903..afddef5666 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -519,7 +519,7 @@ dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) return 0; if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_smrse, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_smrse, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_smrse); } diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 0c021be3af..83c37df743 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -631,7 +631,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { /* Build the tree info ... */ - ti = proto_tree_add_item(tree, proto_smtp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_smtp, tvb, offset, -1, ENC_NA); smtp_tree = proto_item_add_subtree(ti, ett_smtp); } diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index ae1592e6af..5fadf18df0 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -2572,7 +2572,7 @@ dissect_sna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Don't bother setting length. We'll set it later after we find * the lengths of TH/RH/RU */ sna_ti = proto_tree_add_item(tree, proto_sna, tvb, 0, -1, - FALSE); + ENC_NA); sna_tree = proto_item_add_subtree(sna_ti, ett_sna); } @@ -2607,7 +2607,7 @@ dissect_sna_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Don't bother setting length. We'll set it later after we find * the lengths of XID */ sna_ti = proto_tree_add_item(tree, proto_sna_xid, tvb, 0, -1, - FALSE); + ENC_NA); sna_tree = proto_item_add_subtree(sna_ti, ett_sna); } dissect_xid(tvb, pinfo, sna_tree, tree); diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c index 1cea8ba5e6..cf41329c04 100644 --- a/epan/dissectors/packet-snaeth.c +++ b/epan/dissectors/packet-snaeth.c @@ -59,7 +59,7 @@ dissect_snaeth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { snaeth_ti = proto_tree_add_item(tree, proto_snaeth, tvb, 0, 3, - FALSE); + ENC_NA); snaeth_tree = proto_item_add_subtree(snaeth_ti, ett_snaeth); proto_tree_add_uint(snaeth_tree, hf_snaeth_len, tvb, 0, 2, len); proto_tree_add_text(snaeth_tree, tvb, 2, 1, "Padding"); diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c index ffa1610415..2f1f37c1b8 100644 --- a/epan/dissectors/packet-sndcp-xid.c +++ b/epan/dissectors/packet-sndcp-xid.c @@ -485,7 +485,7 @@ dissect_sndcp_xid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_sndcp_xid, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sndcp_xid, tvb, 0, -1, ENC_NA); sndcp_tree = proto_item_add_subtree(ti, ett_sndcp_xid); l3_param_len = tvb_reported_length(tvb); diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index b9ce3d25bc..9685407568 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -214,7 +214,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ if (tree) { - ti = proto_tree_add_item(tree, proto_sndcp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sndcp, tvb, 0, -1, ENC_NA); sndcp_tree = proto_item_add_subtree(ti, ett_sndcp); } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index bdb22f0a0c..e437bb1c3d 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -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, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_NA); smux_tree = proto_item_add_subtree(item, ett_smux); } diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 71ffe9d1e8..070dd842d8 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -103,7 +103,7 @@ dissect_socketcan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree *can_tree = NULL; - proto_item *ti = proto_tree_add_item(tree, proto_can, tvb, 0, 1 , FALSE ); + proto_item *ti = proto_tree_add_item(tree, proto_can, tvb, 0, 1 , ENC_NA ); can_tree = proto_item_add_subtree(ti, ett_can); proto_tree_add_item(can_tree, hf_can_ident, tvb, 0, 4, ENC_BIG_ENDIAN ); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index c943dbbc7e..9fafd4481b 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -1105,7 +1105,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (tree) { ti = proto_tree_add_item( tree, proto_socks, tvb, offset, -1, - FALSE ); + ENC_NA ); socks_tree = proto_item_add_subtree(ti, ett_socks); diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index e84e10c7c6..3763cd1b73 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1726,7 +1726,7 @@ dissect_spnego_wrap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_item(tree, proto_spnego, tvb, offset, - -1, FALSE); + -1, ENC_NA); subtree = proto_item_add_subtree(item, ett_spnego); /* @@ -1779,7 +1779,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } item = proto_tree_add_item(parent_tree, proto_spnego, tvb, offset, - -1, FALSE); + -1, ENC_NA); subtree = proto_item_add_subtree(item, ett_spnego); diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index 05c9bafafe..fbb77d22f9 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -122,7 +122,7 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "SPP"); if (tree) { - ti = proto_tree_add_item(tree, proto_spp, tvb, 0, SPP_HEADER_LEN, FALSE); + ti = proto_tree_add_item(tree, proto_spp, tvb, 0, SPP_HEADER_LEN, ENC_NA); spp_tree = proto_item_add_subtree(ti, ett_spp); } diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c index 4b16d804f8..9bc6b75404 100644 --- a/epan/dissectors/packet-sqloracle.c +++ b/epan/dissectors/packet-sqloracle.c @@ -574,7 +574,7 @@ dissect_sqloracle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( tree ) { - ti = proto_tree_add_item(tree, proto_sqloracle, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_sqloracle, tvb, 0, -1, ENC_NA); sqloracle_tree = proto_item_add_subtree(ti, ett_sqloracle); proto_tree_add_uint(sqloracle_tree, hf_sqloracle_operation, tvb, offset, 1,header_operation); if (func_type && header_operation !=NET8_TYPE_ROWTRANSFER) diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index 9abc066f3e..f1545005fa 100644 --- a/epan/dissectors/packet-srp.c +++ b/epan/dissectors/packet-srp.c @@ -84,13 +84,13 @@ static void dissect_ccsrl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree /* add the 'ccsrl' tree to the main tree */ if (tree) { - ccsrl_item = proto_tree_add_item (tree, proto_ccsrl, tvb, 0, -1, FALSE); + ccsrl_item = proto_tree_add_item (tree, proto_ccsrl, tvb, 0, -1, ENC_NA); ccsrl_tree = proto_item_add_subtree (ccsrl_item, ett_ccsrl); proto_tree_add_uint(ccsrl_tree,hf_ccsrl_ls,tvb,0,1,lastseg); } /* XXX add support for reassembly of fragments */ - + /* XXX currently, we always dissect as H245. It's not necessarily that though. */ @@ -122,10 +122,10 @@ static void dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_item *hidden_item; guint8 header = tvb_get_guint8(tvb,0); - + /* add the 'srp' tree to the main tree */ if (tree) { - srp_item = proto_tree_add_item (tree, proto_srp, tvb, 0, -1, FALSE); + srp_item = proto_tree_add_item (tree, proto_srp, tvb, 0, -1, ENC_NA); srp_tree = proto_item_add_subtree (srp_item, ett_srp); proto_tree_add_uint(srp_tree,hf_srp_header,tvb,0,1,header); } @@ -154,7 +154,7 @@ static void dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* crc includes the header */ calc_crc = crc16_ccitt_tvb(tvb,crc_offset); - + if( crc == calc_crc ) { proto_tree_add_uint_format(srp_tree, hf_srp_crc, tvb, crc_offset, 2, crc, diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 569516497c..5af397d1cf 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -833,7 +833,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(function, srvloc_functions, "Unknown Function (%u)")); - ti = proto_tree_add_item(tree, proto_srvloc, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_srvloc, tvb, offset, -1, ENC_NA); srvloc_tree = proto_item_add_subtree(ti, ett_srvloc); proto_tree_add_uint(srvloc_tree, hf_srvloc_version, tvb, offset, 1, @@ -1422,7 +1422,7 @@ dissect_srvloc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_srvloc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_srvloc, tvb, 0, -1, ENC_NA); srvloc_tree = proto_item_add_subtree(ti, ett_srvloc); } dissect_srvloc(tvb, pinfo, srvloc_tree); diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index 8b84301d3f..97e72ae40e 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.c @@ -81,7 +81,7 @@ dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reported_length = tvb_reported_length(tvb); /* frame length */ if (tree) { - sscf_item = proto_tree_add_item(tree, proto_sscf, tvb, 0, -1, FALSE); + sscf_item = proto_tree_add_item(tree, proto_sscf, tvb, 0, -1, ENC_NA); sscf_tree = proto_item_add_subtree(sscf_item, ett_sscf); } diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index e3a96ecc67..2c42827dfa 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -334,7 +334,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } if(tree) { - ti = proto_tree_add_item(tree, proto_ssh, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ssh, tvb, offset, -1, ENC_NA); ssh_tree = proto_item_add_subtree(ti, ett_ssh); } number = 0; diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 1165becb47..d95f62d9c5 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -648,7 +648,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create display subtree for SSL as a whole */ if (tree) { - ti = proto_tree_add_item(tree, proto_ssl, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_ssl, tvb, 0, -1, ENC_NA); ssl_tree = proto_item_add_subtree(ti, ett_ssl); } /* iterate through the records in this tvbuff */ diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 3324f2a51c..6e6e8b548a 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -527,7 +527,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *starteamroot_tree; proto_item *ti; - ti = proto_tree_add_item(tree, proto_starteam, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_starteam, tvb, offset, -1, ENC_NA); if (bRequest) proto_item_append_text(ti, " (%s)", val_to_str_ext(iCommand, &starteam_opcode_vals_ext, "Unknown (0x%02x)")); starteamroot_tree = proto_item_add_subtree(ti, ett_starteam); diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index f74878024f..7d4d0cf866 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -360,7 +360,7 @@ dissect_stun_message_channel_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree ti = proto_tree_add_item( tree, proto_stun, tvb, 0, CHANNEL_DATA_HDR_LEN, - ENC_BIG_ENDIAN); + ENC_NA); proto_item_append_text(ti, ", TURN ChannelData Message"); stun_tree = proto_item_add_subtree(ti, ett_stun); proto_tree_add_item(stun_tree, hf_stun_channel, tvb, 0, 2, ENC_BIG_ENDIAN); @@ -511,7 +511,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", msg_method_str, msg_class_str); - ti = proto_tree_add_item(tree, proto_stun, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_stun, tvb, 0, -1, ENC_NA); stun_tree = proto_item_add_subtree(ti, ett_stun); diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index 5111b2f648..8bb49ffc08 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -378,7 +378,7 @@ dissect_sv(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_sv, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_sv, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_sv); } col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 1fec09f260..c668696096 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -569,7 +569,7 @@ static void dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 framesize; tvbuff_t *sub_tvb; - temp_item = proto_tree_add_item(tree, proto_synphasor, tvb, 0, -1, FALSE); + temp_item = proto_tree_add_item(tree, proto_synphasor, tvb, 0, -1, ENC_NA); proto_item_append_text(temp_item, ", %s", val_to_str(frame_type, typenames, ", invalid packet type")); diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index 462045ddba..e15ebc239c 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -5760,7 +5760,7 @@ register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto) void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId, dissector_t dissector, int proto) { /* XXX: we should keep the sub-dissectors list per conversation - as the same channels may be used. + as the same channels may be used. While we are just using RDP over T.124, then we can get away with it. */ @@ -5803,7 +5803,7 @@ dissect_t124_new(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); col_clear(pinfo->cinfo, COL_INFO); - item = proto_tree_add_item(parent_tree, proto_t124, tvb, 0, tvb_length(tvb), FALSE); + item = proto_tree_add_item(parent_tree, proto_t124, tvb, 0, tvb_length(tvb), ENC_NA); tree = proto_item_add_subtree(item, ett_t124); asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); @@ -5829,7 +5829,7 @@ dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree (void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, -1, -1, t124Heur_sequence); - if((t124Identifier != NULL) && + if((t124Identifier != NULL) && (strcmp(t124Identifier, "0.0.20.124.0.1") == 0)) { dissect_t124(tvb, pinfo, parent_tree); @@ -7967,7 +7967,7 @@ void proto_register_t124(void) { /* suppress some warnings */ warning_suppressor = dissect_t124_GCCPDU; warning_suppressor = dissect_t124_ConnectMCSPDU; - + } void diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index b6ba5d11c8..9becf81eff 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -2178,7 +2178,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); col_clear(pinfo->cinfo, COL_INFO); - item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE); + item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), ENC_NA); tree = proto_item_add_subtree(item, ett_t125); get_ber_identifier(tvb, 0, &class, &pc, &tag); @@ -2209,7 +2209,7 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree /* or PER */ dissect_per_constrained_integer(tvb, 0, &asn1_ctx, NULL, hf_t125_heur, 0, 42, - &choice_index, FALSE); + &choice_index, FALSE); /* is this strong enough ? */ if ( ((class==BER_CLASS_APP) && ((tag>=101) && (tag<=104))) || diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c index 8fc5115230..a5e6cb2a18 100644 --- a/epan/dissectors/packet-tali.c +++ b/epan/dissectors/packet-tali.c @@ -95,18 +95,18 @@ dissect_tali_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char opcode[TALI_OPCODE_LENGTH+1]; /* TALI opcode */ guint16 length; /* TALI length */ tvbuff_t *payload_tvb = NULL; - + /* Set up structures needed to add the protocol subtree and manage it */ proto_item *tali_item = NULL; proto_tree *tali_tree = NULL; - + tvb_memcpy(tvb, (guint8*)opcode, TALI_SYNC_LENGTH, TALI_OPCODE_LENGTH); opcode[TALI_OPCODE_LENGTH] = '\0'; length = tvb_get_letohs(tvb, TALI_SYNC_LENGTH + TALI_OPCODE_LENGTH); /* Make entries in Protocol column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TALI"); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, ""); col_append_fstr(pinfo->cinfo, COL_INFO, "[%s] packet, [%u] bytes in payload", opcode, length); @@ -114,7 +114,7 @@ dissect_tali_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - tali_item = proto_tree_add_item(tree, proto_tali, tvb, 0, TALI_HEADER_LENGTH, TRUE); + tali_item = proto_tree_add_item(tree, proto_tali, tvb, 0, TALI_HEADER_LENGTH, ENC_NA); tali_tree = proto_item_add_subtree(tali_item, ett_tali); proto_tree_add_string(tali_tree, hf_tali_sync_indicator, tvb, 0, TALI_SYNC_LENGTH, TALI_SYNC); proto_tree_add_string(tali_tree, hf_tali_opcode_indicator, tvb, TALI_SYNC_LENGTH, TALI_OPCODE_LENGTH, opcode); @@ -196,7 +196,7 @@ proto_register_tali(void) proto_tali = proto_register_protocol("Transport Adapter Layer Interface v1.0, RFC 3094", "TALI", "tali"); register_dissector("tali", dissect_tali, proto_tali); tali_handle = create_dissector_handle(dissect_tali, proto_tali); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_tali, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 64da967374..874d94a300 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -305,7 +305,7 @@ dissect_tapa_discover(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_tapa, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); tapa_discover_tree = proto_item_add_subtree(ti, ett_tapa_discover); proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_type, tvb, offset, 1, @@ -364,7 +364,7 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_tapa, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); tapa_tunnel_tree = proto_item_add_subtree(ti, ett_tapa_tunnel); proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 6231f052d1..c91fd9ecda 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3761,7 +3761,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) get_tcp_port(tcph->th_dport), tcph->th_dport); } else { - ti = proto_tree_add_item(tree, proto_tcp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_tcp, tvb, 0, -1, ENC_NA); } tcp_tree = proto_item_add_subtree(ti, ett_tcp); pinfo->tcp_tree=tcp_tree; @@ -3982,7 +3982,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } } - + if (tcph->th_flags & TH_ACK) { if (tree) { if (tcp_relative_seq){ diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index bab7776618..5e98cf01f3 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2286,7 +2286,7 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) packet_number = tvb_get_guint8(tvb, offset + 6); /* create display subtree for the protocol */ - tds_item = proto_tree_add_item(tree, proto_tds, tvb, offset, -1, FALSE); + tds_item = proto_tree_add_item(tree, proto_tds, tvb, offset, -1, ENC_NA); tds_tree = proto_item_add_subtree(tds_item, ett_tds); proto_tree_add_item(tds_tree, hf_tds_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); tds_item = proto_tree_add_item(tds_tree, hf_tds_status, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); @@ -2436,7 +2436,7 @@ dissect_tds_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ tds_item = proto_tree_add_item(tree, proto_tds, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); tds_tree = proto_item_add_subtree(tds_item, ett_tds); diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 2e5fd3d20a..bedb57ee4d 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -757,7 +757,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *ts2_tree = NULL; - ti = proto_tree_add_item(tree, proto_ts2, tvb, 0, -1, TRUE); + ti = proto_tree_add_item(tree, proto_ts2, tvb, 0, -1, ENC_NA); ts2_tree = proto_item_add_subtree(ti, ett_ts2); proto_tree_add_item(ts2_tree, hf_ts2_class, tvb, 0, 2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index ed93ad4919..64a4790e89 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.c @@ -73,14 +73,14 @@ dissect_teimanagement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *tei_tree = NULL; proto_item *tei_ti; guint8 message; - + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TEI"); col_clear(pinfo->cinfo, COL_INFO); - + if (tree) { - tei_ti = proto_tree_add_item(tree, proto_tei, tvb, 0, 5, FALSE); + tei_ti = proto_tree_add_item(tree, proto_tei, tvb, 0, 5, ENC_NA); tei_tree = proto_item_add_subtree(tei_ti, lm_subtree); - + proto_tree_add_item(tei_tree, lm_entity_id, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tei_tree, lm_reference, tvb, 1, 2, ENC_BIG_ENDIAN); } @@ -102,7 +102,7 @@ proto_register_teimanagement(void) static gint *subtree[]={ &lm_subtree }; - + static hf_register_info hf[] = { { &lm_entity_id, { "Entity", "tei.entity", FT_UINT8, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 4845d681f9..24b27bf69d 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -74,7 +74,7 @@ dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) telkonet_tree = NULL; - ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, ENC_NA); telkonet_tree = proto_item_add_subtree(ti, ett_telkonet); proto_tree_add_item(telkonet_tree, hf_telkonet_type, tvb, 0, 8, ENC_NA); diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index df9201b6e8..c07e14a41f 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1879,7 +1879,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) is_tn3270 = find_tn3270_conversation(pinfo); is_tn5250 = find_tn5250_conversation(pinfo); - ti = proto_tree_add_item(tree, proto_telnet, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_telnet, tvb, offset, -1, ENC_NA); telnet_tree = proto_item_add_subtree(ti, ett_telnet); /* diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 50d5881016..690cdb06ac 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -67,9 +67,9 @@ typedef struct { guint8 th_cidlen; guint8 th_authdlen; guint8 th_nonce[8]; - guint8 th_conf; + guint8 th_conf; - guint8 th_ip_v_hl; + guint8 th_ip_v_hl; guint16 th_header; guint16 th_orgport; guint32 th_iporgaddr; @@ -109,7 +109,7 @@ parse_teredo_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item(tree, hf_teredo_auth, tvb, offset-4, 13 + idlen + aulen, ENC_NA); tree = proto_item_add_subtree(ti, ett_teredo_auth); - + proto_tree_add_item(tree, hf_teredo_auth_idlen, tvb, offset - 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_teredo_auth_aulen, tvb, @@ -210,7 +210,7 @@ decode_teredo_ports(tvbuff_t *tvb, int offset, packet_info *pinfo,proto_tree *tr if (dissector_try_uint(teredo_dissector_table, th_header, next_tvb, pinfo, tree)) return; - call_dissector(data_handle,next_tvb, pinfo, tree); + call_dissector(data_handle,next_tvb, pinfo, tree); } static void @@ -232,7 +232,7 @@ dissect_teredo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_teredo, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_teredo, tvb, 0, -1, ENC_NA); teredo_tree = proto_item_add_subtree(ti, ett_teredo); } else @@ -256,7 +256,7 @@ dissect_teredo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) teredoh->th_ip_v_hl = tvb_get_guint8(tvb, offset); decode_teredo_ports(tvb, offset, pinfo, tree, teredoh->th_header /* , teredoh->th_orgport*/); - tap_queue_packet(teredo_tap, pinfo, teredoh); + tap_queue_packet(teredo_tap, pinfo, teredoh); } @@ -304,7 +304,7 @@ dissect_teredo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val = tvb_get_ntohs(tvb, offset); } - /* + /* * We have to check upper-layer packet a little bit otherwise we will * match -almost- *ANY* packet. * These checks are in the Teredo specification by the way. @@ -340,7 +340,7 @@ proto_register_teredo(void) { "Teredo Authentication header", "teredo.auth", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - + { &hf_teredo_auth_idlen, { "Client identifier length", "teredo.auth.idlen", FT_UINT8, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c index a72e366cbc..b8d600777d 100644 --- a/epan/dissectors/packet-text-media.c +++ b/epan/dissectors/packet-text-media.c @@ -69,7 +69,7 @@ dissect_text_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 word[6]; int length = tvb_length(tvb); - /* Check if this is actually xml + /* Check if this is actually xml * If there is less than 38 characters this is not XML * <?xml version="1.0" encoding="UTF-8"?> */ @@ -101,7 +101,7 @@ dissect_text_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_text_lines, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); if (data_name) proto_item_append_text(ti, ": %s", data_name); subtree = proto_item_add_subtree(ti, ett_text_lines); diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index d5af2a572d..6ab3aa8c04 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -182,7 +182,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, val_to_str(opcode, tftp_opcode_vals, "Unknown (0x%04x)")); if (tree) { - ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, ENC_NA); tftp_tree = proto_item_add_subtree(ti, ett_tftp); if (tftp_info->source_file) { diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c index 4b37164f15..f9a35daf58 100644 --- a/epan/dissectors/packet-time.c +++ b/epan/dissectors/packet-time.c @@ -64,7 +64,7 @@ dissect_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_time, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_time, tvb, 0, -1, ENC_NA); time_tree = proto_item_add_subtree(ti, ett_time); proto_tree_add_text(time_tree, tvb, 0, 0, diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index d1cbe94037..312a038fda 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2127,7 +2127,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - ti = proto_tree_add_item(tree, proto_tipc, tipc_tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_tipc, tipc_tvb, offset, -1, ENC_NA); tipc_tree = proto_item_add_subtree(ti, ett_tipc); if (version == TIPCv2) { dissect_tipc_v2(tipc_tvb, tipc_tree, pinfo, offset, user, msg_size, hdr_size, datatype_hdr); diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index a7a5e42851..12f1e8f76c 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -14,17 +14,17 @@ * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -87,7 +87,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TiVoConnect"); - + /* make a distinction between UDP and TCP packets */ proto_name = pinfo->ipproto == IP_PROTO_TCP ? "Discovery Connection" : @@ -105,7 +105,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gchar * field = NULL; /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_tivoconnect, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_tivoconnect, tvb, 0, -1, ENC_NA); tivoconnect_tree = proto_item_add_subtree(ti, ett_tivoconnect); @@ -170,7 +170,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Adjust "Info" column and top of tree into more useful info */ if (packet_machine) { proto_item_append_text(ti, ", %s", packet_machine); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", proto_name, packet_machine); } @@ -179,12 +179,12 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) packet_machine ? " (%s)" : ", ID:%s", packet_identity); if (packet_machine) { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s (%s)", proto_name, packet_machine, packet_identity); } else { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s ID:%s", proto_name, packet_identity); } @@ -206,36 +206,36 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_tivoconnect(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_tivoconnect_flavor, { "Flavor", "tivoconnect.flavor", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "Protocol Flavor supported by the originator", HFILL }}, { &hf_tivoconnect_method, { "Method", "tivoconnect.method", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "Packet was delivered via UDP(broadcast) or TCP(connected)", HFILL }}, { &hf_tivoconnect_platform, { "Platform", "tivoconnect.platform", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "System platform, either tcd(TiVo) or pc(Computer)", HFILL }}, { &hf_tivoconnect_machine, { "Machine", "tivoconnect.machine", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "Human-readable system name", HFILL }}, { &hf_tivoconnect_identity, { "Identity", "tivoconnect.identity", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "Unique serial number for the system", HFILL }}, { &hf_tivoconnect_services, { "Services", "tivoconnect.services", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "List of available services on the system", HFILL }}, { &hf_tivoconnect_version, { "Version", "tivoconnect.version", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "System software version", HFILL }}, }; diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 4317af4064..2c95104316 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -511,7 +511,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; if(tree){ - item = proto_tree_add_item(tree, proto_tnef, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_tnef, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_tnef); } diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index dd96940307..b7f336112b 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -894,7 +894,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_tns, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_tns, tvb, 0, -1, ENC_NA); tns_tree = proto_item_add_subtree(ti, ett_tns); if (pinfo->match_uint == pinfo->destport) diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 6f97872aa7..451341894a 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -248,7 +248,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { ti = proto_tree_add_item(tree, proto_tpkt, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); tpkt_tree = proto_item_add_subtree(ti, ett_tpkt); proto_item_set_text(ti, "TPKT"); @@ -296,7 +296,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { ti = proto_tree_add_item(tree, proto_tpkt, tvb, - offset, 8, FALSE); + offset, 8, ENC_NA); tpkt_tree = proto_item_add_subtree(ti, ett_tpkt); proto_item_set_text(ti, "TPKT"); @@ -406,7 +406,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { ti = proto_tree_add_item(tree, proto_tpkt, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); tpkt_tree = proto_item_add_subtree(ti, ett_tpkt); proto_item_set_text(ti, "TPKT"); @@ -492,7 +492,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { ti = proto_tree_add_item(tree, proto_tpkt, tvb, - offset, 4, FALSE); + offset, 4, ENC_NA); tpkt_tree = proto_item_add_subtree(ti, ett_tpkt); proto_item_set_text(ti, "TPKT"); diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 50f88573cb..f3d88fa72a 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -284,7 +284,7 @@ static void dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } if (tree) { - item = proto_tree_add_item(tree, proto_tpncp, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, proto_tpncp, tvb, 0, -1, ENC_NA); tpncp_tree = proto_item_add_subtree(item, ett_tpncp); proto_tree_add_uint(tpncp_tree, hf_tpncp_version, tvb, 0, 2, ver); diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 3648e7df02..04a29bfebe 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -495,7 +495,7 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* protocol analysis tree */ if (tree) { /* Create Token-Ring Tree */ - ti = proto_tree_add_item(tree, proto_tr, tr_tvb, 0, TR_MIN_HEADER_LEN + actual_rif_bytes, FALSE); + ti = proto_tree_add_item(tree, proto_tr, tr_tvb, 0, TR_MIN_HEADER_LEN + actual_rif_bytes, ENC_NA); tr_tree = proto_item_add_subtree(ti, ett_token_ring); /* Create the Access Control bitfield tree */ diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index cfa247a498..0ea57a88fb 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -48,7 +48,7 @@ static int hf_trill_ingress_nick = -1 ; /* TODO For now we will just add all the options into a byte field. Later this should be parsed out into a sub-tree with all the option details. */ -static int hf_trill_options= -1 ; +static int hf_trill_options= -1 ; static dissector_handle_t eth_dissector ; @@ -106,7 +106,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) op_len = tvb_get_bits( tvb, 5, 5, FALSE ) * TRILL_OP_LENGTH_BYTE_UNITS ; if (tree) { - ti = proto_tree_add_item( tree, proto_trill, tvb, 0, -1, FALSE ) ; + ti = proto_tree_add_item( tree, proto_trill, tvb, 0, -1, ENC_NA ) ; trill_tree = proto_item_add_subtree( ti, ett_trill ) ; /* Parse the bit fields, i.e. V, R, M, Op-Length, Hop Count. */ @@ -117,7 +117,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_item( trill_tree, hf_trill_multi_dst, tvb, offset, TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_op_len, tvb, offset, - TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; + TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_hop_cnt, tvb, offset, TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; @@ -133,7 +133,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Parse the options field. */ offset += TRILL_NICKNAME_LEN ; - if( op_len != 0 ) { + if( op_len != 0 ) { proto_tree_add_item( trill_tree, hf_trill_options, tvb, offset, op_len, ENC_NA ) ; } @@ -149,7 +149,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Register the protocol with Wireshark */ void proto_register_trill(void) -{ +{ static hf_register_info hf[] = { { &hf_trill_version, { "Version", "trill.version", diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 698b20f637..e73a15e78e 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -299,7 +299,7 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { mv_length = tvb_get_ntohs(tvb, 0); - ti = proto_tree_add_item(tree, proto_trmac, tvb, 0, mv_length, FALSE); + ti = proto_tree_add_item(tree, proto_trmac, tvb, 0, mv_length, ENC_NA); mac_tree = proto_item_add_subtree(ti, ett_tr_mac); proto_tree_add_uint(mac_tree, hf_trmac_mv, tvb, 3, 1, mv_val); diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 628ca31f4b..2c51d909fc 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -126,7 +126,7 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { tsp_item = proto_tree_add_item(tree, proto_tsp, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); if (tsp_item) tsp_tree = proto_item_add_subtree(tsp_item, ett_tsp); } diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index fb44e6a72b..9a15357630 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -57,7 +57,7 @@ static int hf_tte_pcf_tc = -1; /* Initialize the subtree pointers */ static gint ett_tte_pcf = -1; -static const value_string pcf_type_str_vals[] = +static const value_string pcf_type_str_vals[] = { {2, "integration frame"} , {4, "coldstart frame"} , {8, "coldstart ack frame"} @@ -100,7 +100,7 @@ dissect_tte_pcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ tte_pcf_root_item = proto_tree_add_item(tree, proto_tte_pcf, tvb, 0, - TTE_PCF_LENGTH, FALSE); + TTE_PCF_LENGTH, ENC_NA); tte_pcf_tree = proto_item_add_subtree(tte_pcf_root_item, ett_tte_pcf); diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index 2bec53e756..17075e9f94 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -93,7 +93,7 @@ dissect_tte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ tte_root_item = proto_tree_add_item(tree, proto_tte, tvb, 0, - TTE_HEADER_LENGTH, FALSE); + TTE_HEADER_LENGTH, ENC_NA); tte_tree = proto_item_add_subtree(tte_root_item, ett_tte); diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 38ffd9de57..ffc7c73b9f 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -145,7 +145,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } if (tree) { - ti = proto_tree_add_item(tree, proto_turbocell, tvb, 0, 20, FALSE); + ti = proto_tree_add_item(tree, proto_turbocell, tvb, 0, 20, ENC_NA); turbocell_tree = proto_item_add_subtree(ti, ett_turbocell); diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index d49f544236..3e4f8709cf 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -54,14 +54,14 @@ static int proto_turnchannel = -1; static int hf_turnchannel_id = -1; static int hf_turnchannel_len = -1; -#define TURNCHANNEL_HDR_LEN ((guint)4) +#define TURNCHANNEL_HDR_LEN ((guint)4) /* Initialize the subtree pointers */ static gint ett_turnchannel = -1; static int -dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, +dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint len; @@ -93,29 +93,29 @@ dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Channel Id 0x%x", channel_id); - ti = proto_tree_add_item(tree, proto_turnchannel, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_turnchannel, tvb, 0, -1, ENC_NA); turnchannel_tree = proto_item_add_subtree(ti, ett_turnchannel); proto_tree_add_uint(turnchannel_tree, hf_turnchannel_id, tvb, 0, 2, channel_id); proto_tree_add_uint(turnchannel_tree, hf_turnchannel_len, tvb, 2, 2, data_len); - + if (len > TURNCHANNEL_HDR_LEN) { tvbuff_t *next_tvb; guint reported_len, new_len; new_len = tvb_length_remaining(tvb, TURNCHANNEL_HDR_LEN); - reported_len = tvb_reported_length_remaining(tvb, + reported_len = tvb_reported_length_remaining(tvb, TURNCHANNEL_HDR_LEN); if (data_len < reported_len) { reported_len = data_len; } - next_tvb = tvb_new_subset(tvb, TURNCHANNEL_HDR_LEN, new_len, + next_tvb = tvb_new_subset(tvb, TURNCHANNEL_HDR_LEN, new_len, reported_len); - if (!dissector_try_heuristic(heur_subdissector_list, + if (!dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree)) { call_dissector(data_handle,next_tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 4bcd15d6fc..fe989919c3 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -124,7 +124,7 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_tuxedo, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_tuxedo, tvb, 0, -1, ENC_NA); tuxedoroot_tree = proto_item_add_subtree(ti, ett_tuxedo); proto_tree_add_item(tuxedoroot_tree, hf_tuxedo_magic, tvb, 0, 4, ENC_BIG_ENDIAN); @@ -137,7 +137,7 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { - proto_tree_add_item(tree, proto_tuxedo, tvb, 0, -1, FALSE); + proto_tree_add_item(tree, proto_tuxedo, tvb, 0, -1, ENC_NA); } } } diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index 910aa07035..f50c2cde27 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -286,7 +286,7 @@ static int DissectUA(tvbuff_t *pTvb, packet_info *pInfo, proto_tree *pTree) if(pTree) { /* root element "UA Protocol, ..." */ - pRootUA = proto_tree_add_item(pTree, proto_ua, pTvb, 0, -1, FALSE); + pRootUA = proto_tree_add_item(pTree, proto_ua, pTvb, 0, -1, ENC_NA); pSubTreeUA = proto_item_add_subtree(pRootUA, ett_ua); /* NOE items */ diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index cf12257189..dd5356f7eb 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/epan/dissectors/packet-uaudp.c @@ -97,7 +97,7 @@ static int dissect_uaudp(tvbuff_t *pTvb, packet_info *pInfo, proto_tree *pTree) col_set_str(pInfo->cinfo, COL_INFO, val_to_str_const(u8Opcode, szUaOpcode, "Unknown")); /* opcode "UA/UDP Protocol, ..." */ - pUAUDP = proto_tree_add_item(pTree, proto_uaudp, pTvb, 0, -1, ENC_BIG_ENDIAN); + pUAUDP = proto_tree_add_item(pTree, proto_uaudp, pTvb, 0, -1, ENC_NA); proto_item_append_text(pUAUDP, ", %s (%d)", val_to_str_const(u8Opcode, szUaOpcode, "Unknown"), u8Opcode); pHeaderSubTree = proto_item_add_subtree(pUAUDP, ett_uaudp_header); diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index a16a16a6d7..739c8c1966 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -1826,7 +1826,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_ucp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ucp, tvb, 0, -1, ENC_NA); ucp_tree = proto_item_add_subtree(ti, ett_ucp); /* diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 68bedc501d..bb08f43c3d 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -116,7 +116,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *flags_ti; proto_tree *flags_tree; - ti = proto_tree_add_item(tree, proto_udld, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_udld, tvb, offset, -1, ENC_NA); udld_tree = proto_item_add_subtree(ti, ett_udld); /* UDLD header */ @@ -196,7 +196,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Port ID: %s ", tvb_format_stringzpad(tvb, offset + 4, length - 4)); - if (tree) { + if (tree) { tlvi = proto_tree_add_text(udld_tree, tvb, offset, real_length, "Port ID: %s", tvb_format_text(tvb, offset + 4, real_length - 4)); diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index db965192ab..6f4495b31a 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1694,7 +1694,7 @@ dissect_uma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "UMA"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_uma, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_uma, tvb, 0, -1, ENC_NA); uma_tree = proto_item_add_subtree(ti, ett_uma); /* add an item to the subtree, see section 1.6 for more information */ @@ -1772,7 +1772,7 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "UMA"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_uma, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_uma, tvb, 0, -1, ENC_NA); uma_tree = proto_item_add_subtree(ti, ett_uma); octet = tvb_get_guint8(tvb,offset); diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index d6a412c6e4..230ed444e0 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -386,7 +386,7 @@ static const value_string dch_control_frame_type_vals[] = { #define COMMON_TIMING_ADJUSTMENT 2 #define COMMON_DL_SYNCHRONISATION 3 #define COMMON_UL_SYNCHRONISATION 4 - + #define COMMON_DL_NODE_SYNCHRONISATION 6 #define COMMON_UL_NODE_SYNCHRONISATION 7 #define COMMON_DYNAMIC_PUSCH_ASSIGNMENT 8 @@ -1394,7 +1394,7 @@ static void dissect_rach_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_t ext_rx_sync_ul_timing_deviation_present = TRUE; proto_tree_add_item(new_ie_flags_tree, hf_fp_rach_ext_rx_sync_ul_timing_deviation_present, tvb, offset, 1, ENC_BIG_ENDIAN); - + break; default: /* Not defined */ @@ -1466,7 +1466,7 @@ static void dissect_rach_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_t case Division_TDD_768: bits_to_extend = 2; break; - + default: /* TODO: report unexpected division type */ bits_to_extend = 1; @@ -2569,7 +2569,7 @@ static void dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_ maces_tree = proto_item_add_subtree(ti, ett_fp_edch_maces); } for (macd_idx = 0; macd_idx < subframes[n].number_of_mac_d_pdus[i]; macd_idx++) { - + if (preferences_call_mac_dissectors) { tvbuff_t *next_tvb; pinfo->fd->subnum = macd_idx; /* set subframe number to current TB */ @@ -2802,7 +2802,7 @@ static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info * proto_item *macis_pdu_ti; proto_tree *macis_pdu_tree; - + /* Add subframe header subtree */ macis_pdu_ti = proto_tree_add_string_format(tree, hf_fp_edch_subframe_header, tvb, offset, 0, "", "MAC-is PDU (SFN=%u PDU %u)", @@ -3199,7 +3199,7 @@ static gboolean heur_dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t if (!p_fp_info->srcport || !p_fp_info->destport) { p_fp_info->srcport = pinfo->srcport; p_fp_info->destport = pinfo->destport; - } + } /* discriminate 'lower' UDP layer from 'user data' UDP layer * (i.e. if an FP over UDP packet contains a user UDP packet */ @@ -3226,7 +3226,7 @@ void dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "FP"); /* Create fp tree. */ - ti = proto_tree_add_item(tree, proto_fp, tvb, offset, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_fp, tvb, offset, -1, ENC_NA); fp_tree = proto_item_add_subtree(ti, ett_fp); top_level_tree = tree; diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 5c719f78ba..1c350dd727 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -166,10 +166,10 @@ static void dissect_mac_fdd_pch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_item *channel_type; col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC"); col_set_str(pinfo->cinfo, COL_INFO, "PCCH"); - + if (tree) { proto_item *ti; - ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); pch_tree = proto_item_add_subtree(ti, ett_mac_pch); proto_item_append_text(ti, " (PCCH)"); channel_type = proto_tree_add_uint(pch_tree, hf_mac_channel, tvb, 0, 0, MAC_PCCH); @@ -199,7 +199,7 @@ static void dissect_mac_fdd_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tctf, rach_fdd_tctf_vals, "Unknown TCTF")); - ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); rach_tree = proto_item_add_subtree(ti, ett_mac_rach); macinf = p_get_proto_data(pinfo->fd, proto_umts_mac); @@ -280,7 +280,7 @@ static void dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tctf, fach_fdd_tctf_vals, "Unknown TCTF")); - ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); fach_tree = proto_item_add_subtree(ti, ett_mac_fach); macinf = p_get_proto_data(pinfo->fd, proto_umts_mac); @@ -360,7 +360,7 @@ static void dissect_mac_fdd_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC"); - ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); dch_tree = proto_item_add_subtree(ti, ett_mac_dch); macinf = p_get_proto_data(pinfo->fd, proto_umts_mac); @@ -415,10 +415,10 @@ static void dissect_mac_fdd_edch(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC"); - ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); edch_tree = proto_item_add_subtree(ti, ett_mac_edch); - fpinf = p_get_proto_data(pinfo->fd, proto_fp); + fpinf = p_get_proto_data(pinfo->fd, proto_fp); macinf = p_get_proto_data(pinfo->fd, proto_umts_mac); pos = fpinf->cur_tb; if (!macinf) { @@ -468,7 +468,7 @@ static void dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC"); - ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); hsdsch_tree = proto_item_add_subtree(ti, ett_mac_hsdsch); fpinf = p_get_proto_data(pinfo->fd, proto_fp); diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index 8d73bf3d57..3f4316aa8b 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.c @@ -92,7 +92,7 @@ static void dissect_user(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) { } } - item = proto_tree_add_item(tree,proto_user_encap,tvb,0,-1,FALSE); + item = proto_tree_add_item(tree,proto_user_encap,tvb,0,-1,ENC_NA); if (!encap) { char* msg = ep_strdup_printf("User encapsulation not handled: DLT=%d, " "check your Preferences->Protocols->DLT_USER", diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 2fbf95ffe5..1fb1f03679 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -2136,7 +2136,7 @@ dissect_v52_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "V52"); if (tree) { - ti = proto_tree_add_item(tree, proto_v52, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_v52, tvb, offset, -1, ENC_NA); v52_tree = proto_item_add_subtree(ti, ett_v52); dissect_v52_protocol_discriminator(tvb, offset, v52_tree); diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index ecfc89f379..9c0423fdf3 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -1421,7 +1421,7 @@ dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_v5ua, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_v5ua, tvb, 0, -1, ENC_NA); v5ua_tree = proto_item_add_subtree(ti, ett_v5ua); } else { diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index c0e7d11bb3..674c497c85 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -62,7 +62,7 @@ static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_vicp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_vicp, tvb, 0, -1, ENC_NA); vicp_tree = proto_item_add_subtree(ti, ett_vicp); cursor = ptvcursor_new(vicp_tree, tvb, 0); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index e889f03e8a..529af356e1 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -213,7 +213,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_frp, tvb, 0, 2, - ENC_BIG_ENDIAN); + ENC_NA); vines_frp_tree = proto_item_add_subtree(ti, ett_vines_frp); vines_frp_ctrl = tvb_get_guint8(tvb, 0); @@ -315,7 +315,7 @@ dissect_vines_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Unknown protocol 0x%02x")); if (tree) { ti = proto_tree_add_item(tree, proto_vines_llc, tvb, 0, 1, - ENC_BIG_ENDIAN); + ENC_NA); vines_llc_tree = proto_item_add_subtree(ti, ett_vines_llc); proto_tree_add_text(vines_llc_tree, tvb, 0, 1, @@ -429,7 +429,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_ip, tvb, offset, viph.vip_pktlen, - ENC_BIG_ENDIAN); + ENC_NA); vip_tree = proto_item_add_subtree(ti, ett_vines_ip); proto_tree_add_text(vip_tree, tvb, offset, 2, "Packet checksum: 0x%04x", @@ -539,7 +539,7 @@ dissect_vines_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_echo, tvb, 0, -1, - ENC_BIG_ENDIAN); + ENC_NA); vines_echo_tree = proto_item_add_subtree(ti, ett_vines_echo); proto_tree_add_text(vines_echo_tree, tvb, 0, -1, "Data"); } @@ -665,7 +665,7 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_ipc, tvb, offset, - sizeof(viph), ENC_BIG_ENDIAN); + sizeof(viph), ENC_NA); vipc_tree = proto_item_add_subtree(ti, ett_vines_ipc); proto_tree_add_text(vipc_tree, tvb, offset, 2, "Source port: 0x%04x", viph.vipc_sport); @@ -836,7 +836,7 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_spp, tvb, offset, - sizeof(viph), ENC_BIG_ENDIAN); + sizeof(viph), ENC_NA); vspp_tree = proto_item_add_subtree(ti, ett_vines_spp); proto_tree_add_text(vspp_tree, tvb, offset, 2, "Source port: 0x%04x", viph.vspp_sport); @@ -960,7 +960,7 @@ dissect_vines_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_arp, tvb, 0, -1, - ENC_BIG_ENDIAN); + ENC_NA); vines_arp_tree = proto_item_add_subtree(ti, ett_vines_arp); } @@ -1138,7 +1138,7 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_rtp, tvb, 0, -1, - ENC_BIG_ENDIAN); + ENC_NA); vines_rtp_tree = proto_item_add_subtree(ti, ett_vines_rtp); } @@ -1643,7 +1643,7 @@ dissect_vines_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vines_icp, tvb, 0, -1, - ENC_BIG_ENDIAN); + ENC_NA); vines_icp_tree = proto_item_add_subtree(ti, ett_vines_icp); } diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 1b2d7f6ba6..7ffb38cc50 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -111,7 +111,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vlan_tree = NULL; if (tree) { - ti = proto_tree_add_item(tree, proto_vlan, tvb, 0, 4, FALSE); + ti = proto_tree_add_item(tree, proto_vlan, tvb, 0, 4, ENC_NA); if (vlan_summary_in_tree) { proto_item_append_text(ti, ", PRI: %u, CFI: %u, ID: %u", diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c index 017b62f69c..14fdb9aa9e 100644 --- a/epan/dissectors/packet-vmlab.c +++ b/epan/dissectors/packet-vmlab.c @@ -90,7 +90,7 @@ dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "VMLAB"); col_clear(pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_vmlab, tvb, 0, 24, FALSE); + ti = proto_tree_add_item(tree, proto_vmlab, tvb, 0, 24, ENC_NA); vmlab_tree = proto_item_add_subtree(ti, ett_vmlab); /* Flags*/ diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 2fdb10a34d..f2a0da8c04 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -654,7 +654,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ if(tree) { - ti = proto_tree_add_item(tree, proto_vnc, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_vnc, tvb, 0, -1, ENC_NA); vnc_tree = proto_item_add_subtree(ti, ett_vnc); } diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index bdfc458387..9eb60dfdf2 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -113,7 +113,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 cksum, computed_cksum; guint8 auth_buf[VRRP_AUTH_DATA_LEN + 1]; - ti = proto_tree_add_item(tree, proto_vrrp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_vrrp, tvb, 0, -1, ENC_NA); vrrp_tree = proto_item_add_subtree(ti, ett_vrrp); tv = proto_tree_add_uint_format(vrrp_tree, hf_vrrp_ver_type, diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index cadb8136ce..912f716716 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -144,7 +144,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_vtp, tvb, offset, -1, - FALSE); + ENC_NA); vtp_tree = proto_item_add_subtree(ti, ett_vtp); proto_tree_add_item(vtp_tree, hf_vtp_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 9d121ad0c1..0b7d7df242 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -1029,7 +1029,7 @@ dissect_vuze_dht(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* clear the info column */ col_clear( pinfo->cinfo, COL_INFO); - ti = proto_tree_add_item(tree, proto_vuze_dht, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_vuze_dht, tvb, 0, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht); /* diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index be875db6a1..400d8b96be 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -915,7 +915,7 @@ dissect_wassp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Header dissection */ ti = proto_tree_add_item(tree, proto_wassp, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); wassp_tree = proto_item_add_subtree(ti, ett_wassp); proto_tree_add_item(wassp_tree, hf_wassp_version, tvb, offset, 1, diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index fdee29eb97..12f51637cc 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -6745,7 +6745,7 @@ dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Add summary to INFO column if it is enabled */ if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " (Unknown WBXML version 0x%02x)", version); - ti = proto_tree_add_item (tree, proto_wbxml, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_wbxml, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Unknown version 0x%02x", version); return; } @@ -6805,7 +6805,7 @@ dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, " (WBXML %s)", summary); /* create display subtree for the protocol */ - ti = proto_tree_add_item (tree, proto_wbxml, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_wbxml, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Version: %s", summary); g_free(summary); /* diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 815b454f57..a22438f71d 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -221,7 +221,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree != NULL) { wccp_tree_item = proto_tree_add_item(tree, proto_wccp, tvb, offset, - -1, FALSE); + -1, ENC_NA); wccp_tree = proto_item_add_subtree(wccp_tree_item, ett_wccp); proto_tree_add_uint(wccp_tree, hf_wccp_message_type, tvb, offset, diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 727bf9eeab..46534e0271 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -326,7 +326,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } if (tree) { - ti = proto_tree_add_item(tree, proto_wcp, tvb, 0, wcp_header_len, FALSE); + ti = proto_tree_add_item(tree, proto_wcp, tvb, 0, wcp_header_len, ENC_NA); wcp_tree = proto_item_add_subtree(ti, ett_wcp); diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index a94e6dfdee..861f4cb454 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -65,7 +65,7 @@ dissect_wfleet_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cmd = tvb_get_guint8(tvb, 1); if (tree) { - ti = proto_tree_add_item(tree, proto_wfleet_hdlc, tvb, 0, 2, FALSE); + ti = proto_tree_add_item(tree, proto_wfleet_hdlc, tvb, 0, 2, ENC_NA); fh_tree = proto_item_add_subtree(ti, ett_wfleet_hdlc); proto_tree_add_uint(fh_tree, hf_wfleet_hdlc_addr, tvb, 0, 1, addr); @@ -74,7 +74,7 @@ dissect_wfleet_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* - * Build a tvb of the piece past the first two bytes and call the + * Build a tvb of the piece past the first two bytes and call the * ethernet dissector */ @@ -115,7 +115,7 @@ proto_reg_handoff_wfleet_hdlc(void) wfleet_hdlc_handle = find_dissector("wfleet_hdlc"); dissector_add_uint("wtap_encap", WTAP_ENCAP_WFLEET_HDLC, wfleet_hdlc_handle); - /* + /* * Find the eth dissector and save a ref to it */ diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index a04b7a231d..a93e3570d8 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -106,7 +106,7 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { who_ti = proto_tree_add_item(tree, proto_who, tvb, offset, -1, - FALSE); + ENC_NA); who_tree = proto_item_add_subtree(who_ti, ett_who); } diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 814d0e6dd9..6f4d272d2d 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -646,7 +646,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); if (parent_tree) { - winsrepl_item = proto_tree_add_item(parent_tree, proto_winsrepl, tvb, offset, -1, FALSE); + winsrepl_item = proto_tree_add_item(parent_tree, proto_winsrepl, tvb, offset, -1, ENC_NA); winsrepl_tree = proto_item_add_subtree(winsrepl_item, ett_winsrepl); } diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 625c93c1c9..2022878abb 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -801,7 +801,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_wlccp, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, proto_wlccp, tvb, 0, -1, ENC_NA); wlccp_tree = proto_item_add_subtree(ti, ett_wlccp); proto_tree_add_item(wlccp_tree, hf_wlccp_version, diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 1392c70ea2..54aef37072 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -245,7 +245,7 @@ dissect_wol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset to the end of the packet. */ /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_wol, tvb, 0, len, FALSE); + ti = proto_tree_add_item(tree, proto_wol, tvb, 0, len, ENC_NA); proto_item_append_text(ti, ", MAC: %s (%s)", get_ether_name(mac), ether_to_str(mac)); if ( passwd ) diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 0b2b8ffa2a..3751c4765f 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -216,7 +216,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if(tree) { - ti = proto_tree_add_item(tree, proto_wow, tvb, 0, -1, TRUE); + ti = proto_tree_add_item(tree, proto_wow, tvb, 0, -1, ENC_NA); wow_tree = proto_item_add_subtree(ti, ett_wow); proto_tree_add_item(wow_tree, hf_wow_command, tvb, offset, 1, diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index 999698b8c5..95db12ca2d 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -71,7 +71,7 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_wsmp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_wsmp, tvb, 0, -1, ENC_NA); wsmp_tree = proto_item_add_subtree(ti, ett_wsmp); @@ -104,20 +104,20 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wsmp_tree, hf_wsmp_acmlength, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; - + proto_tree_add_item(wsmp_tree, hf_wsmp_acm, tvb, offset, acmlength, ENC_ASCII|ENC_NA); offset +=acmlength; wsmlength = tvb_get_letohs( tvb, offset); proto_tree_add_item(wsmp_tree, hf_wsmp_wsmlength, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; - + offset += 2; + wsmdata_item = proto_tree_add_text (wsmp_tree, tvb, offset, wsmlength, "Wave Short Message"); wsmdata_tree = proto_item_add_subtree(wsmdata_item, ett_wsmdata); - /* TODO: Branch on the application context and display accordingly + /* TODO: Branch on the application context and display accordingly * Default call the data dissector */ wsmdata_tvb = tvb_new_subset(tvb, offset,wsmlength, wsmlength); @@ -135,42 +135,42 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_wsmp(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_wsmp_version, - { "Version", "wsmp.version", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Version", "wsmp.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_security, - { "Security", "wsmp.security", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Security", "wsmp.security", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_channel, - { "Channel", "wsmp.channel", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Channel", "wsmp.channel", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_rate, - { "Rate", "wsmp.rate", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Rate", "wsmp.rate", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_txpower, - { "Transmit power", "wsmp.txpower", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Transmit power", "wsmp.txpower", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_appclass, - { "App class", "wsmp.appclass", FT_UINT8, BASE_DEC, NULL, 0x0, + { "App class", "wsmp.appclass", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_acmlength, - { "Acm Length", "wsmp.acmlength", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Acm Length", "wsmp.acmlength", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_wsmp_acm, { "Application Context Data", "wsmp.acm", FT_STRING, BASE_NONE, NULL, 0x0, "Acm", HFILL }}, { &hf_wsmp_wsmlength, - { "WSM Length", "wsmp.wsmlength", FT_UINT16, BASE_DEC, NULL, 0x0, + { "WSM Length", "wsmp.wsmlength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; @@ -180,7 +180,7 @@ proto_register_wsmp(void) &ett_wsmdata, }; - /* Register the protocol name and description */ + /* Register the protocol name and description */ proto_wsmp = proto_register_protocol("Wave Short Message Protocol(IEEE P1609.3)", "WSMP", "wsmp"); @@ -191,7 +191,7 @@ proto_register_wsmp(void) } /* If this dissector uses sub-dissector registration add a registration routine. - This exact format is required because a script is used to find these routines + This exact format is required because a script is used to find these routines and create the code that calls these routines. */ diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index b2b7599457..d16fbc6e77 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -352,7 +352,7 @@ dissect_wtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_wtls, tvb, offset_wtls, - -1, ENC_LITTLE_ENDIAN); + -1, ENC_NA); wtls_tree = proto_item_add_subtree(ti, ett_wtls); for (offset_wtls=0; offset_wtls < (tvb_reported_length(tvb)-1);) { @@ -456,7 +456,7 @@ add_session_id(proto_tree *tree, int hf, int hf_str, tvbuff_t *tvb, int offset) guint count; guint i; guint64 session_id; - header_field_info *hfinfo; + header_field_info *hfinfo; count = tvb_get_guint8(tvb, offset); if (count == 0) diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 8354897d2c..7370f63cbf 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -350,7 +350,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_wtp, - tvb, offCur, 1, ENC_LITTLE_ENDIAN); + tvb, offCur, 1, ENC_NA); wtp_tree = proto_item_add_subtree(ti, ett_wtp_sub_pdu_tree); proto_item_append_text(ti, ", PDU concatenation"); } @@ -467,7 +467,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fprintf(stderr, "dissect_wtp: cbHeader = %d\n", cbHeader); #endif /* NOTE - Length will be set when we process the TPI */ - ti = proto_tree_add_item(tree, proto_wtp, tvb, offCur, 0, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(tree, proto_wtp, tvb, offCur, 0, ENC_NA); #ifdef DEBUG fprintf(stderr, "dissect_wtp: (7) Returned from proto_tree_add_item\n"); #endif diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 18f61c4513..218fee2bca 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -2930,7 +2930,7 @@ static void dissect_x11_initial_conn(tvbuff_t *tvb, packet_info *pinfo, guint16 auth_proto_name_length, auth_proto_data_length; gint left; - ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Request, Initial connection request"); t = proto_item_add_subtree(ti, ett_x11); @@ -2980,7 +2980,7 @@ static void dissect_x11_initial_reply(tvbuff_t *tvb, packet_info *pinfo, proto_item *ti; proto_tree *t; - ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); proto_item_append_text(ti, ", Reply, Initial connection reply"); t = proto_item_add_subtree(ti, ett_x11); @@ -3183,7 +3183,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, next_offset = offset + length; - ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); t = proto_item_add_subtree(ti, ett_x11); if (PACKET_IS_NEW(pinfo)) @@ -4382,7 +4382,7 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, * Give up. */ ti = proto_tree_add_item(tree, proto_x11, tvb, offset, -1, - FALSE); + ENC_NA); t = proto_item_add_subtree(ti, ett_x11); proto_tree_add_text(t, tvb, offset, -1, "Bogus request length (0)"); @@ -4798,7 +4798,7 @@ dissect_x11_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti; proto_tree *t; - ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); t = proto_item_add_subtree(ti, ett_x11); @@ -5196,7 +5196,7 @@ dissect_x11_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti; proto_tree *t; - ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); t = proto_item_add_subtree(ti, ett_x11); eventcode = tvb_get_guint8(tvb, 0); @@ -5541,7 +5541,7 @@ dissect_x11_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti; proto_tree *t; - ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); t = proto_item_add_subtree(ti, ett_x11); CARD8(error); diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index e890ae983c..3fc8f58a42 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -193,7 +193,7 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) length = tvb_get_guint8(tvb, offset); if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_x224, tvb, offset, length+1, FALSE); + item = proto_tree_add_item(parent_tree, proto_x224, tvb, offset, length+1, ENC_NA); tree = proto_item_add_subtree(item, ett_x224); } diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index ba10494c90..cdd4c176bf 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1676,7 +1676,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (tree) { - ti = proto_tree_add_item(tree, proto_x25, tvb, 0, x25_pkt_len, FALSE); + ti = proto_tree_add_item(tree, proto_x25, tvb, 0, x25_pkt_len, ENC_NA); x25_tree = proto_item_add_subtree(ti, ett_x25); ti = proto_tree_add_item(x25_tree, hf_x25_gfi, tvb, 0, 2, ENC_BIG_ENDIAN); gfi_tree = proto_item_add_subtree(ti, ett_x25_gfi); @@ -2320,7 +2320,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ frag_key |= 0x10000; } - fd_head = fragment_add_seq_next(tvb, localoffset, + fd_head = fragment_add_seq_next(tvb, localoffset, pinfo, frag_key, x25_segment_table, x25_reassembled_table, @@ -2338,14 +2338,14 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *frag_tree_item; /* This is the last packet */ - next_tvb = tvb_new_child_real_data(tvb, fd_head->data, + next_tvb = tvb_new_child_real_data(tvb, fd_head->data, fd_head->len, fd_head->len); add_new_data_source(pinfo, next_tvb, "Reassembled X.25"); if (x25_tree) { - show_fragment_seq_tree(fd_head, - &x25_frag_items, - x25_tree, + show_fragment_seq_tree(fd_head, + &x25_frag_items, + x25_tree, pinfo, next_tvb, &frag_tree_item); } } @@ -2622,35 +2622,35 @@ proto_register_x25(void) { &hf_x25_segment_overlap, { "Fragment overlap", "x25.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Fragment overlaps with other fragments", HFILL }}, - + { &hf_x25_segment_overlap_conflict, { "Conflicting data in fragment overlap", "x25.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping fragments contained conflicting data", HFILL }}, - + { &hf_x25_segment_multiple_tails, { "Multiple tail fragments found", "x25.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when defragmenting the packet", HFILL }}, - + { &hf_x25_segment_too_long_segment, { "Fragment too long", "x25.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Fragment contained data past end of packet", HFILL }}, - + { &hf_x25_segment_error, { "Defragmentation error", "x25.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Defragmentation error due to illegal fragments", HFILL }}, - + { &hf_x25_segment_count, { "Fragment count", "x25.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - + { &hf_x25_reassembled_length, { "Reassembled X.25 length", "x25.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, - + { &hf_x25_segment, { "X.25 Fragment", "x25.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "X25 Fragment", HFILL }}, - + { &hf_x25_segments, { "X.25 Fragments", "x25.fragments", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index f355438f67..2a05778f1f 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -93,7 +93,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_x29, tvb, offset, -1, - FALSE); + ENC_NA); x29_tree = proto_item_add_subtree(ti, ett_x29); } diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 9145836d33..e07f2ebc8b 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -32,7 +32,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Ref: + * Ref: * 3GPP TS 36.423 V9.2.0 (2010-03) */ @@ -4611,9 +4611,9 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "X2AP"); /* create the x2ap protocol tree */ - x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, FALSE); + x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, ENC_NA); x2ap_tree = proto_item_add_subtree(x2ap_item, ett_x2ap); - + dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree); } @@ -5843,7 +5843,7 @@ void proto_register_x2ap(void) { /* Register fields and subtrees */ proto_register_field_array(proto_x2ap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector */ register_dissector("x2ap", dissect_x2ap, proto_x2ap); diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index 0330d67ae5..9bdc381ea4 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -132,7 +132,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Create display tree for the xcsl protocol */ if (tree) { proto_item *xcsl_item; - xcsl_item = proto_tree_add_item(tree, proto_xcsl, tvb, offset, -1, FALSE); + xcsl_item = proto_tree_add_item(tree, proto_xcsl, tvb, offset, -1, ENC_NA); xcsl_tree = proto_item_add_subtree(xcsl_item, ett_xcsl); } diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 17f3a6e0af..8238b4157b 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -229,7 +229,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_xdmcp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_xdmcp, tvb, offset, -1, ENC_NA); xdmcp_tree = proto_item_add_subtree(ti, ett_xdmcp); proto_tree_add_uint(xdmcp_tree, hf_xdmcp_version, tvb, diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index d9b1d3c9de..f4d1fe30fd 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -930,7 +930,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - ti = proto_tree_add_item(tree, proto_xmcp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_xmcp, tvb, 0, -1, ENC_NA); xmcp_tree = proto_item_add_subtree(ti, ett_xmcp); ti = proto_tree_add_bitmask(xmcp_tree, tvb, 0, hf_xmcp_type, ett_xmcp_type, diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 6e410887d6..529d31b569 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -1,7 +1,7 @@ /* packet-xmpp.c * Routines for XMPP packet dissection * Copyright 2003, Brad Hards <bradh@frogmouth.net> - * Heavily based in packet-acap.c, which in turn is heavily based on + * Heavily based in packet-acap.c, which in turn is heavily based on * packet-imap.c, Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * * $Id$ @@ -86,7 +86,7 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_xmpp, tvb, offset, -1, - ENC_BIG_ENDIAN) ; + ENC_NA) ; xmpp_tree = proto_item_add_subtree(ti, ett_xmpp); if (is_request) { diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 916a8d626c..9fc0553e9b 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -991,7 +991,7 @@ dissect_xtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } if (tree) { - ti = proto_tree_add_item(tree, proto_xtp, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_xtp, tvb, 0, -1, ENC_NA); /** add summary **/ proto_item_append_text(ti, ", Key: 0x%016" G_GINT64_MODIFIER "X", xtph->key); diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index 20d26e4dd8..d8f1ef2ee3 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -75,7 +75,7 @@ dissect_xyplex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "XYPLEX"); if (tree) { - ti = proto_tree_add_item(tree, proto_xyplex, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_xyplex, tvb, offset, -1, ENC_NA); xyplex_tree = proto_item_add_subtree(ti, ett_xyplex); } diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index 7f12868363..35577d3a6e 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.c @@ -208,7 +208,7 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_yhoo, tvb, offset, -1, - FALSE); + ENC_NA); yhoo_tree = proto_item_add_subtree(ti, ett_yhoo); proto_tree_add_item(yhoo_tree, hf_yhoo_version, tvb, diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 492fc6c59a..2549894013 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -160,7 +160,7 @@ enum yahoo_service { /* these are easier to see in hex */ YAHOO_SERVICE_AUDIBLE = 0xd0, YAHOO_SERVICE_Y7_PHOTO_SHARING = 0xd2, YAHOO_SERVICE_Y7_CONTACT_DETAILS = 0xd3,/* YMSG13 */ - YAHOO_SERVICE_Y7_CHAT_SESSION = 0xd4, + YAHOO_SERVICE_Y7_CHAT_SESSION = 0xd4, YAHOO_SERVICE_Y7_AUTHORIZATION = 0xd6, /* YMSG13 */ YAHOO_SERVICE_Y7_FILETRANSFER = 0xdc, /* YMSG13 */ YAHOO_SERVICE_Y7_FILETRANSFERINFO, /* YMSG13 */ @@ -258,7 +258,7 @@ static const value_string ymsg_service_vals[] = { {YAHOO_SERVICE_VOICECHAT, "Voice Chat"}, {YAHOO_SERVICE_NOTIFY, "Notify"}, {YAHOO_SERVICE_VERIFY, "Verify"}, - {YAHOO_SERVICE_P2PFILEXFER, "P2P File Transfer"}, + {YAHOO_SERVICE_P2PFILEXFER, "P2P File Transfer"}, {YAHOO_SERVICE_PEERTOPEER, "Peer To Peer"}, {YAHOO_SERVICE_WEBCAM, "WebCam"}, {YAHOO_SERVICE_AUTHRESP, "Authentication Response"}, @@ -348,7 +348,7 @@ dissect_ymsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Not a Yahoo Messenger packet. */ return FALSE; } - + tcp_dissect_pdus(tvb, pinfo, tree, ymsg_desegment, 8, get_ymsg_pdu_len, dissect_ymsg_pdu); return TRUE; @@ -398,7 +398,7 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item(tree, proto_ymsg, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_ymsg, tvb, offset, -1, ENC_NA); ymsg_tree = proto_item_add_subtree(ti, ett_ymsg); offset += 4; /* skip the YMSG string */ @@ -443,20 +443,20 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Each entry consists of: <key string> <delimiter> <value string> <delimiter> */ - + /* Parse and show each line of the contents */ for (;;) { proto_item *ti_2; proto_tree *content_line_tree; - + /* Don't continue unless there is room for another whole item. (including 2 2-byte delimiters */ if (offset >= (headersize+content_len-4)) { break; } - + /* Get the length of the key */ keylen = get_content_item_length(tvb, offset); /* Extract the key */ diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 2b485e8dfe..276b5e04e4 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -449,7 +449,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { ti = proto_tree_add_item(tree, proto_zebra, tvb, offset, -1, - FALSE); + ENC_NA); zebra_tree = proto_item_add_subtree(ti, ett_zebra); ti = proto_tree_add_boolean(zebra_tree, hf_zebra_request, tvb, offset, 0, request); diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index f9b963a997..3e75d75914 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -221,7 +221,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { giop_version_major, giop_version_minor); if (tree) { - ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, ENC_NA); ziop_tree = proto_item_add_subtree (ti, ett_ziop); proto_tree_add_text (ziop_tree, tvb, 4, 2, "Version %u.%u not supported", @@ -245,7 +245,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { gboolean little_endian; emem_strbuf_t *flags_strbuf = ep_strbuf_new_label("none"); - ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, FALSE); + ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, ENC_NA); ziop_tree = proto_item_add_subtree (ti, ett_ziop); proto_tree_add_item(ziop_tree, hf_ziop_magic, tvb, offset, 4, ENC_ASCII|ENC_NA); |