git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-version-opt: Fix spelling and capitalization.
[sliver-openvswitch.git]
/
tests
/
test-netflow.c
diff --git
a/tests/test-netflow.c
b/tests/test-netflow.c
index
392c6ec
..
a727f53
100644
(file)
--- a/
tests/test-netflow.c
+++ b/
tests/test-netflow.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013
, 2014
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-33,6
+33,7
@@
#include "unixctl.h"
#include "util.h"
#include "vlog.h"
#include "unixctl.h"
#include "util.h"
#include "vlog.h"
+#include "ovstest.h"
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
@@
-161,13
+162,13
@@
print_netflow(struct ofpbuf *buf)
putchar('\n');
}
putchar('\n');
}
- if (
buf->size
) {
- printf("%"PRIu32" extra bytes after last record\n",
buf->size
);
+ if (
ofpbuf_size(buf)
) {
+ printf("%"PRIu32" extra bytes after last record\n",
ofpbuf_size(buf)
);
}
}
}
}
-int
-main(int argc, char *argv[])
+static void
+
test_netflow_
main(int argc, char *argv[])
{
struct unixctl_server *server;
enum { MAX_RECV = 1500 };
{
struct unixctl_server *server;
enum { MAX_RECV = 1500 };
@@
-213,7
+214,7
@@
main(int argc, char *argv[])
ofpbuf_clear(&buf);
do {
ofpbuf_clear(&buf);
do {
- retval = read(sock,
buf.data
, buf.allocated);
+ retval = read(sock,
ofpbuf_data(&buf)
, buf.allocated);
} while (retval < 0 && errno == EINTR);
if (retval > 0) {
ofpbuf_put_uninit(&buf, retval);
} while (retval < 0 && errno == EINTR);
if (retval > 0) {
ofpbuf_put_uninit(&buf, retval);
@@
-232,8
+233,6
@@
main(int argc, char *argv[])
unixctl_server_wait(server);
poll_block();
}
unixctl_server_wait(server);
poll_block();
}
-
- return 0;
}
static void
}
static void
@@
-298,3
+297,5
@@
test_netflow_exit(struct unixctl_conn *conn,
*exiting = true;
unixctl_command_reply(conn, NULL);
}
*exiting = true;
unixctl_command_reply(conn, NULL);
}
+
+OVSTEST_REGISTER("test-netflow", test_netflow_main);