ipsec: IPSec protection for multi-point tunnel interfaces

[vpp.git] / src / vnet / pg / output.c

diff --git a/src/vnet/pg/output.c b/src/vnet/pg/output.c
index 410a433..d8059fa 100644 (file)
--- a/src/vnet/pg/output.c
+++ b/src/vnet/pg/output.c
@@ -68,9 +68,10 @@ pg_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
        {
          pg_output_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
          t->buffer_index = bi0;
-         clib_memcpy (&t->buffer, b, sizeof (b[0]) - sizeof (b->pre_data));
-         clib_memcpy (t->buffer.pre_data, b->data + b->current_data,
-                      sizeof (t->buffer.pre_data));
+         clib_memcpy_fast (&t->buffer, b,
+                           sizeof (b[0]) - sizeof (b->pre_data));
+         clib_memcpy_fast (t->buffer.pre_data, b->data + b->current_data,
+                           sizeof (t->buffer.pre_data));
        }
 
       if (pif->pcap_file_name != 0)
@@ -78,7 +79,10 @@ pg_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
     }
   if (pif->pcap_file_name != 0)
     pcap_write (&pif->pcap_main);
-
+  if ((pif->pcap_main.flags & PCAP_MAIN_INIT_DONE)
+      && pif->pcap_main.n_packets_captured >=
+      pif->pcap_main.n_packets_to_capture)
+    pcap_close (&pif->pcap_main);
 
   vlib_buffer_free (vm, vlib_frame_vector_args (frame), n_buffers);
   if (PREDICT_FALSE (pif->lockp != 0))