/*
- * Copyright (c) 2011, 2012 Nicira Networks.
+ * 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.
#include "command-line.h"
#include "daemon.h"
+#include "dynamic-string.h"
#include "netflow.h"
#include "ofpbuf.h"
#include "packets.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[]);
return;
}
- printf("rec: "IP_FMT" > "IP_FMT,
- IP_ARGS(&rec->src_addr), IP_ARGS(&rec->dst_addr));
+ printf("seq %"PRIu32": "IP_FMT" > "IP_FMT, ntohl(hdr->flow_seq),
+ IP_ARGS(rec->src_addr), IP_ARGS(rec->dst_addr));
printf(", if %"PRIu16" > %"PRIu16,
ntohs(rec->input), ntohs(rec->output));
printf(", TCP %"PRIu16" > %"PRIu16,
ntohs(rec->src_port), ntohs(rec->dst_port));
if (rec->tcp_flags) {
- putchar(' ');
- if (rec->tcp_flags & TCP_SYN) {
- putchar('S');
- }
- if (rec->tcp_flags & TCP_FIN) {
- putchar('F');
- }
- if (rec->tcp_flags & TCP_PSH) {
- putchar('P');
- }
- if (rec->tcp_flags & TCP_RST) {
- putchar('R');
- }
- if (rec->tcp_flags & TCP_URG) {
- putchar('U');
- }
- if (rec->tcp_flags & TCP_ACK) {
- putchar('.');
- }
- if (rec->tcp_flags & 0x40) {
- printf("[40]");
- }
- if (rec->tcp_flags & 0x80) {
- printf("[80]");
- }
+ struct ds s = DS_EMPTY_INITIALIZER;
+ packet_format_tcp_flags(&s, rec->tcp_flags);
+ printf(" %s", ds_cstr(&s));
+ ds_destroy(&s);
}
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,
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));
ntohl(rec->init_time), ntohl(rec->used_time));
if (rec->nexthop != htonl(0)) {
- printf(", nexthop "IP_FMT, IP_ARGS(&rec->nexthop));
+ printf(", nexthop "IP_FMT, IP_ARGS(rec->nexthop));
}
if (rec->src_as != htons(0) || rec->dst_as != htons(0)) {
printf(", AS %"PRIu16" > %"PRIu16,
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 };
}
target = argv[optind];
- sock = inet_open_passive(SOCK_DGRAM, target, 0, NULL);
+ 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);
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);
unixctl_server_wait(server);
poll_block();
}
-
- return 0;
}
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,
+ VLOG_LONG_OPTIONS,
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
case 'h':
usage();
- case 'v':
- vlog_set_verbosity(optarg);
- break;
-
DAEMON_OPTION_HANDLERS
+ VLOG_OPTION_HANDLERS
case '?':
exit(EXIT_FAILURE);
*exiting = true;
unixctl_command_reply(conn, NULL);
}
+
+OVSTEST_REGISTER("test-netflow", test_netflow_main);