diff options
author | Bill Meier <wmeier@newsguy.com> | 2009-09-25 00:29:06 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2009-09-25 00:29:06 +0000 |
commit | 8ccb52de00148c7ff9da2e040ed5df393fcf79a0 (patch) | |
tree | f83a86876887f8ce409f87148573d0b15715258a /epan/dissectors/packet-actrace.c | |
parent | 0d22e0acb449dafab964b93a2342432cc45e1fd8 (diff) |
Upon 2nd thought: revert removal of 'if (check_col(...))' around col_add_fstr & etc.
svn path=/trunk/; revision=30133
Diffstat (limited to 'epan/dissectors/packet-actrace.c')
-rw-r--r-- | epan/dissectors/packet-actrace.c | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 9a9fafdc96..27cf361d68 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -534,12 +534,13 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a proto_tree_add_int(actrace_tree, hf_actrace_cas_function, tvb, offset, 4, function); offset += 4; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s|%d|%s|%d|%s|", - val_to_str(source, actrace_cas_source_vals_short, "ukn"), - curr_state, - val_to_str(event, actrace_cas_event_vals, "%d"), - next_state, - val_to_str(function, actrace_cas_function_vals, "%d")); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s|%d|%s|%d|%s|", + val_to_str(source, actrace_cas_source_vals_short, "ukn"), + curr_state, + val_to_str(event, actrace_cas_event_vals, "%d"), + next_state, + val_to_str(function, actrace_cas_function_vals, "%d")); par0 = tvb_get_ntohl(tvb, offset); switch (function) @@ -548,27 +549,31 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a proto_tree_add_text(actrace_tree, tvb, offset, 4, "Parameter 0: %s", val_to_str(par0, actrace_cas_pstn_event_vals, "Unknown (%d)")); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", - val_to_str(par0, actrace_cas_pstn_event_vals, "%d")); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", + val_to_str(par0, actrace_cas_pstn_event_vals, "%d")); break; case CHANGE_COLLECT_TYPE: proto_tree_add_text(actrace_tree, tvb, offset, 4, "Parameter 0: %s", val_to_str(par0, actrace_cas_collect_type_vals, "Unknown (%d)")); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", - val_to_str(par0, actrace_cas_collect_type_vals, "%d")); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", + val_to_str(par0, actrace_cas_collect_type_vals, "%d")); break; case SEND_MF: case SEND_DEST_NUM: proto_tree_add_text(actrace_tree, tvb, offset, 4, "Parameter 0: %s", val_to_str(par0, actrace_cas_send_type_vals, "Unknown (%d)")); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", - val_to_str(par0, actrace_cas_send_type_vals, "%d")); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", + val_to_str(par0, actrace_cas_send_type_vals, "%d")); break; default: proto_tree_add_int(actrace_tree, hf_actrace_cas_par0, tvb, offset, 4, par0); - col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par0); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par0); } offset += 4; @@ -576,17 +581,20 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a if (function == SEND_EVENT) { proto_tree_add_text(actrace_tree, tvb, offset, 4, "Parameter 1: %s", val_to_str(par1, actrace_cas_cause_vals, "Unknown (%d)")); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", - val_to_str(par1, actrace_cas_cause_vals, "%d")); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s|", + val_to_str(par1, actrace_cas_cause_vals, "%d")); } else { proto_tree_add_int(actrace_tree, hf_actrace_cas_par1, tvb, offset, 4, par1); - col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par1); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par1); } offset += 4; par2 = tvb_get_ntohl(tvb, offset); proto_tree_add_int(actrace_tree, hf_actrace_cas_par2, tvb, offset, 4, par2); - col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par2); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par2); offset += 4; trunk = tvb_get_ntohl(tvb, offset); @@ -597,7 +605,8 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a proto_tree_add_int(actrace_tree, hf_actrace_cas_bchannel, tvb, offset, 4, bchannel); offset += 4; - col_prepend_fstr(pinfo->cinfo, COL_INFO, "t%db%d|", trunk, bchannel); + if (check_col(pinfo->cinfo, COL_INFO)) + col_prepend_fstr(pinfo->cinfo, COL_INFO, "t%db%d|", trunk, bchannel); value = tvb_get_ntohl(tvb, offset); proto_tree_add_int(actrace_tree, hf_actrace_cas_connection_id, tvb, offset, 4, value); @@ -696,8 +705,9 @@ static void dissect_actrace_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree * call_dissector(lapd_handle, next_tvb, pinfo, tree); col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_ISDN"); - col_prepend_fstr(pinfo->cinfo, COL_INFO, "Trunk:%d Blade %s PSTN " - , trunk, value==PSTN_TO_BLADE?"<--":"-->"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_prepend_fstr(pinfo->cinfo, COL_INFO, "Trunk:%d Blade %s PSTN " + , trunk, value==PSTN_TO_BLADE?"<--":"-->"); } /* |