diff options
Diffstat (limited to 'src/vnet')
-rw-r--r-- | src/vnet/interface_cli.c | 2 | ||||
-rw-r--r-- | src/vnet/interface_output.c | 2 | ||||
-rw-r--r-- | src/vnet/pg/output.c | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c index 437854476b4..8db26391573 100644 --- a/src/vnet/interface_cli.c +++ b/src/vnet/interface_cli.c @@ -1743,6 +1743,8 @@ pcap_trace_command_internal (vlib_main_t * vm, vm->pcap[rx_tx].pcap_main.n_packets_to_capture = vm->pcap[rx_tx].pcap_main.n_packets_captured; error = pcap_write (&vm->pcap[rx_tx].pcap_main); + if (vm->pcap[rx_tx].pcap_main.file_descriptor >= 0) + pcap_close (&vm->pcap[rx_tx].pcap_main); if (error) clib_error_report (error); else diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index 60953b0f35a..c863d444f5a 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -1439,6 +1439,8 @@ pcap_drop_trace_command_fn (vlib_main_t * vm, im->pcap_main.n_packets_to_capture = im->pcap_main.n_packets_captured; error = pcap_write (&im->pcap_main); + if (im->pcap_main.file_descriptor >= 0) + pcap_close (&im->pcap_main); if (error) clib_error_report (error); else diff --git a/src/vnet/pg/output.c b/src/vnet/pg/output.c index a84f30301dc..b5ee157b4c6 100644 --- a/src/vnet/pg/output.c +++ b/src/vnet/pg/output.c @@ -79,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.file_descriptor >= 0 + && 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)) |