diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-09-27 12:05:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-09-27 12:05:32 +0000 |
| commit | 0f2e6c6cc564536c6b7252bdf10d0a6af740afe6 (patch) | |
| tree | ebe659ee68bac8dfe3b2a17f5f0aef8b491af7cc /asn1/t38 | |
| parent | 00e46951ad2d2a4e4f6f703f4e2150478f7df53d (diff) | |
| download | wireshark-0f2e6c6cc564536c6b7252bdf10d0a6af740afe6.tar.gz | |
Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
Diffstat (limited to 'asn1/t38')
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 10 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 18 |
2 files changed, 10 insertions, 18 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 6878a3ec26..ed91180cd4 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -381,8 +381,7 @@ force_reassemble_seq(packet_info *pinfo, guint32 id, fd_head->flags |= FD_DEFRAGMENTED; fd_head->reassembled_in=pinfo->fd->num; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost); + col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost); p_t38_packet_conv_info->packet_lost = packet_lost; p_t38_packet_conv_info->burst_lost = burst_lost; @@ -590,11 +589,8 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); break; - } - else { - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number); - } + }else { + col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number); } } } diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 80f9f4a96a..ae82680e38 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -28,7 +28,7 @@ UDPTLPacket #.FN_PARS Type-of-msg/t30-indicator VAL_PTR=&T30ind_value #.FN_FTR Type-of-msg/t30-indicator - if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){ + if (primary_part){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s", val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>")); } @@ -40,7 +40,7 @@ UDPTLPacket #.FN_PARS Type-of-msg/t30-data VAL_PTR=&Data_value #.FN_FTR Type-of-msg/t30-data - if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){ + if (primary_part){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:", val_to_str(Data_value,t38_T30_data_vals,"<unknown>")); } @@ -60,7 +60,7 @@ EXT=(use_pre_corrigendum_asn1_specification)?FALSE:TRUE EXT_NUM=(use_pre_corrigendum_asn1_specification)?0:4 VAL_PTR=&Data_Field_field_type_value #.FN_FTR Data-Field/_item/field-type - if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){ + if (primary_part){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>")); } @@ -156,7 +156,7 @@ VAL_PTR=&Data_Field_field_type_value value_len = tvb_length(value_tvb); #.FN_FTR Data-Field/_item/field-data - if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){ + if (primary_part){ if(value_len < 8){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]", tvb_bytes_to_str(value_tvb,0,value_len)); @@ -204,11 +204,9 @@ VAL_PTR=&Data_Field_field_type_value if (!frag_msg) { /* Not last packet of reassembled */ if (Data_Field_field_type_value == 0) { - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum); + col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum); } else { - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum); + col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum); } } @@ -230,9 +228,7 @@ VAL_PTR=&Data_Field_field_type_value if (primary_part) t38_info->seq_num = seq_number; - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number); #.END #.FN_HDR UDPTLPacket/primary-ifp-packet |