pg: set vnet buffer flags in pg streams

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

diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
index c43ff90..b3aaddf 100644 (file)
--- a/src/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
@@ -86,14 +86,17 @@ pg_capture (pg_capture_args_t * a)
   if (a->is_enabled == 1)
     {
       struct stat sb;
-      if (stat ((char *) a->pcap_file_name, &sb) != -1)
+      if (stat (a->pcap_file_name, &sb) != -1)
        return clib_error_return (0, "pcap file '%s' already exists.",
                                  a->pcap_file_name);
     }
 
   pi = pool_elt_at_index (pg->interfaces, a->dev_instance);
   vec_free (pi->pcap_file_name);
+  if ((pi->pcap_main.flags & PCAP_MAIN_INIT_DONE))
+    pcap_close (&pi->pcap_main);
   clib_memset (&pi->pcap_main, 0, sizeof (pi->pcap_main));
+  pi->pcap_main.file_descriptor = -1;
 
   if (a->is_enabled == 0)
     return 0;
@@ -373,6 +376,10 @@ new_stream (vlib_main_t * vm,
       else if (unformat (input, "source pg%u", &s.if_id))
        ;
 
+      else if (unformat (input, "buffer-flags %U",
+                        unformat_vnet_buffer_flags, &s.buffer_flags))
+       ;
+
       else if (unformat (input, "node %U",
                         unformat_vlib_node, vm, &s.node_index))
        ;
@@ -629,7 +636,7 @@ pg_capture_cmd_fn (vlib_main_t * vm,
   a->hw_if_index = hw_if_index;
   a->dev_instance = hi->dev_instance;
   a->is_enabled = !is_disable;
-  a->pcap_file_name = pcap_file_name;
+  a->pcap_file_name = (char *) pcap_file_name;
   a->count = count;
 
   error = pg_capture (a);