datapath-windows: Rename OvsGetVportNo into OvsComputeVportNo and make public

[cascardo/ovs.git] / tests / test-netflow.c

diff --git a/tests/test-netflow.c b/tests/test-netflow.c
index 1243f83..284d7ab 100644 (file)
--- a/tests/test-netflow.c
+++ b/tests/test-netflow.c
@@ -35,7 +35,7 @@
 #include "vlog.h"
 #include "ovstest.h"
 
-static void usage(void) NO_RETURN;
+NO_RETURN static void usage(void);
 static void parse_options(int argc, char *argv[]);
 
 static unixctl_cb_func test_netflow_exit;
@@ -181,6 +181,7 @@ test_netflow_main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
+    service_start(&argc, &argv);
     parse_options(argc, argv);
 
     if (argc - optind != 1) {
@@ -214,7 +215,7 @@ test_netflow_main(int argc, char *argv[])
 
         ofpbuf_clear(&buf);
         do {
-            retval = read(sock, ofpbuf_data(&buf), buf.allocated);
+            retval = recv(sock, ofpbuf_data(&buf), buf.allocated, 0);
         } while (retval < 0 && errno == EINTR);
         if (retval > 0) {
             ofpbuf_put_uninit(&buf, retval);