diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-08 18:39:11 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-08 18:39:11 +0000 |
commit | 647c5c0b27e834ea4b7972a31b357a078f93243f (patch) | |
tree | 1a4461ad4786db83858b22614f47a4e6d46c7942 /asn1 | |
parent | 6de2561c69e7b4ec2fa50103d69f197dd3a214cf (diff) |
packet_info's in_error_pkt is now a bitfield like in_gre_pkt.
svn path=/trunk/; revision=39764
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/t38/t38.cnf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index ae82680e38..6195f153b8 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -45,7 +45,7 @@ UDPTLPacket val_to_str(Data_value,t38_T30_data_vals,"<unknown>")); } - + /* info for tap */ if (primary_part) t38_info->data_value = Data_value; @@ -55,7 +55,7 @@ UDPTLPacket if (primary_part) Data_Field_item_num++; #.END -#.FN_PARS Data-Field/_item/field-type +#.FN_PARS Data-Field/_item/field-type EXT=(use_pre_corrigendum_asn1_specification)?FALSE:TRUE EXT_NUM=(use_pre_corrigendum_asn1_specification)?0:4 VAL_PTR=&Data_Field_field_type_value @@ -88,7 +88,7 @@ VAL_PTR=&Data_Field_field_type_value FALSE); /* More fragments */ if ( Data_Field_field_type_value == 7 ) { /* if there was packet lost or other errors during the defrag then frag_msg is NULL. This could also means - * there are out of order packets (e.g, got the tail frame t4-non-ecm-sig-end before the last fragment), + * there are out of order packets (e.g, got the tail frame t4-non-ecm-sig-end before the last fragment), * but we will assume there was packet lost instead, which is more usual. So, we are going to reassemble the packet * and get some stat, like packet lost and burst number of packet lost */ @@ -98,12 +98,12 @@ VAL_PTR=&Data_Field_field_type_value data_fragment_table /* list of message fragments */ ); } else { - col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); - + col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); + g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost"); } - + if (p_t38_packet_conv_info->packet_lost) { g_snprintf(t38_info->desc_comment, MAX_T38_DESC, " Pack lost: %d, Pack burst lost: %d", p_t38_packet_conv_info->packet_lost, p_t38_packet_conv_info->burst_lost); } else { @@ -116,7 +116,7 @@ VAL_PTR=&Data_Field_field_type_value /* Now reset fragmentation information in pinfo */ actx->pinfo->fragmented = save_fragmented; - t38_info->time_first_t4_data = p_t38_packet_conv_info->time_first_t4_data; + t38_info->time_first_t4_data = p_t38_packet_conv_info->time_first_t4_data; t38_info->frame_num_first_t4_data = p_t38_packet_conv_info->reass_ID; /* The reass_ID is the Frame number of the first t4 fragment */ } else { @@ -174,7 +174,7 @@ VAL_PTR=&Data_Field_field_type_value if (primary_part && (Data_Field_item_num<2)) { tvbuff_t* new_tvb = NULL; fragment_data *frag_msg = NULL; - + /* HDLC Data or t4-non-ecm-data */ if (Data_Field_field_type_value == 0 || Data_Field_field_type_value == 6) { /* 0=HDLC Data or 6=t4-non-ecm-data*/ gboolean save_fragmented = actx->pinfo->fragmented; @@ -235,7 +235,7 @@ VAL_PTR=&Data_Field_field_type_value primary_part = TRUE; #.FN_FTR UDPTLPacket/primary-ifp-packet /* if is a valid t38 packet, add to tap */ - if (p_t38_packet_conv && (!actx->pinfo->in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum)) + if (p_t38_packet_conv && (!actx->pinfo->flags.in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum)) tap_queue_packet(t38_tap, actx->pinfo, t38_info); if (p_t38_conv) p_t38_conv_info->last_seqnum = (gint32) seq_number; |