packet_info's in_error_pkt is now a bitfield like in_gre_pkt.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39764 f5534014-38df-0310-8fa8-9805f1628bb7

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;