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
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
tests
/
test-netflow.c
diff --git
a/tests/test-netflow.c
b/tests/test-netflow.c
index
5147a20
..
a727f53
100644
(file)
--- a/
tests/test-netflow.c
+++ b/
tests/test-netflow.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011, 2012 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[]);
@@
-100,6
+101,11
@@
print_netflow(struct ofpbuf *buf)
ntohs(rec->src_port), ntohs(rec->dst_port));
break;
ntohs(rec->src_port), ntohs(rec->dst_port));
break;
+ case IPPROTO_SCTP:
+ printf(", SCTP %"PRIu16" > %"PRIu16,
+ ntohs(rec->src_port), ntohs(rec->dst_port));
+ break;
+
case IPPROTO_ICMP:
printf(", ICMP %"PRIu16":%"PRIu16,
ntohs(rec->dst_port) >> 8,
case IPPROTO_ICMP:
printf(", ICMP %"PRIu16":%"PRIu16,
ntohs(rec->dst_port) >> 8,
@@
-120,6
+126,7
@@
print_netflow(struct ofpbuf *buf)
if (rec->ip_proto != IPPROTO_TCP &&
rec->ip_proto != IPPROTO_UDP &&
if (rec->ip_proto != IPPROTO_TCP &&
rec->ip_proto != IPPROTO_UDP &&
+ rec->ip_proto != IPPROTO_SCTP &&
rec->ip_proto != IPPROTO_ICMP) {
if (rec->src_port != htons(0)) {
printf(", src_port %"PRIu16, ntohs(rec->src_port));
rec->ip_proto != IPPROTO_ICMP) {
if (rec->src_port != htons(0)) {
printf(", src_port %"PRIu16, ntohs(rec->src_port));
@@
-155,13
+162,13
@@
print_netflow(struct ofpbuf *buf)
putchar('\n');
}
putchar('\n');
}
- if (
buf->size
) {
- printf("%
zu 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 };
@@
-184,7
+191,7
@@
main(int argc, char *argv[])
sock = inet_open_passive(SOCK_DGRAM, target, 0, NULL, 0);
if (sock < 0) {
sock = inet_open_passive(SOCK_DGRAM, target, 0, NULL, 0);
if (sock < 0) {
- ovs_fatal(0, "%s: failed to open (%s)", argv[1], strerror(-sock));
+ ovs_fatal(0, "%s: failed to open (%s)", argv[1],
ovs_
strerror(-sock));
}
daemon_save_fd(STDOUT_FILENO);
}
daemon_save_fd(STDOUT_FILENO);
@@
-207,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);
@@
-226,20
+233,19
@@
main(int argc, char *argv[])
unixctl_server_wait(server);
poll_block();
}
unixctl_server_wait(server);
poll_block();
}
-
- return 0;
}
static void
parse_options(int argc, char *argv[])
{
enum {
}
static void
parse_options(int argc, char *argv[])
{
enum {
- DAEMON_OPTION_ENUMS
+ DAEMON_OPTION_ENUMS,
+ VLOG_OPTION_ENUMS
};
};
- static struct option long_options[] = {
- {"verbose", optional_argument, NULL, 'v'},
+ static const struct option long_options[] = {
{"help", no_argument, NULL, 'h'},
DAEMON_LONG_OPTIONS,
{"help", no_argument, NULL, 'h'},
DAEMON_LONG_OPTIONS,
+ VLOG_LONG_OPTIONS,
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
@@
-254,11
+260,8
@@
parse_options(int argc, char *argv[])
case 'h':
usage();
case 'h':
usage();
- case 'v':
- vlog_set_verbosity(optarg);
- break;
-
DAEMON_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
+ VLOG_OPTION_HANDLERS
case '?':
exit(EXIT_FAILURE);
case '?':
exit(EXIT_FAILURE);
@@
-294,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);