#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
-#include "cfg.h"
+#include "collectors.h"
#include "flow.h"
#include "netflow.h"
#include "ofpbuf.h"
uint8_t engine_type; /* Value of engine_type to use. */
uint8_t engine_id; /* Value of engine_id to use. */
long long int boot_time; /* Time when netflow_create() was called. */
- int *fds; /* Sockets for NetFlow collectors. */
- size_t n_fds; /* Number of Netflow collectors. */
+ struct collectors *collectors; /* NetFlow collectors. */
bool add_id_to_iface; /* Put the 7 least signficiant bits of
* 'engine_id' into the most signficant
* bits of the interface fields. */
long long int reconfig_time; /* When we reconfigured the timeouts. */
};
-static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
-
-static int
-open_collector(char *dst)
-{
- char *save_ptr = NULL;
- const char *host_name;
- const char *port_string;
- struct sockaddr_in sin;
- int retval;
- int fd;
-
- /* Glibc 2.7 has a bug in strtok_r when compiling with optimization that
- * can cause segfaults here:
- * http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614.
- * Using "::" instead of the obvious ":" works around it. */
- host_name = strtok_r(dst, ":", &save_ptr);
- port_string = strtok_r(NULL, ":", &save_ptr);
- if (!host_name) {
- ovs_error(0, "%s: bad peer name format", dst);
- return -EAFNOSUPPORT;
- }
- if (!port_string) {
- ovs_error(0, "%s: bad port format", dst);
- return -EAFNOSUPPORT;
- }
-
- memset(&sin, 0, sizeof sin);
- sin.sin_family = AF_INET;
- if (lookup_ip(host_name, &sin.sin_addr)) {
- return -ENOENT;
- }
- sin.sin_port = htons(atoi(port_string));
-
- fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd < 0) {
- VLOG_ERR("%s: socket: %s", dst, strerror(errno));
- return -errno;
- }
-
- retval = set_nonblocking(fd);
- if (retval) {
- close(fd);
- return -retval;
- }
-
- retval = connect(fd, (struct sockaddr *) &sin, sizeof sin);
- if (retval < 0) {
- int error = errno;
- VLOG_ERR("%s: connect: %s", dst, strerror(error));
- close(fd);
- return -error;
- }
-
- return fd;
-}
-
void
netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
struct ofexpired *expired)
void
netflow_run(struct netflow *nf)
{
- size_t i;
-
- if (!nf->packet.size) {
- return;
+ if (nf->packet.size) {
+ collectors_send(nf->collectors, nf->packet.data, nf->packet.size);
+ nf->packet.size = 0;
}
-
- for (i = 0; i < nf->n_fds; i++) {
- if (send(nf->fds[i], nf->packet.data, nf->packet.size, 0) == -1) {
- VLOG_WARN_RL(&rl, "netflow message send failed: %s",
- strerror(errno));
- }
- }
- nf->packet.size = 0;
-}
-
-static void
-clear_collectors(struct netflow *nf)
-{
- size_t i;
-
- for (i = 0; i < nf->n_fds; i++) {
- close(nf->fds[i]);
- }
- free(nf->fds);
- nf->fds = NULL;
- nf->n_fds = 0;
}
int
netflow_set_options(struct netflow *nf,
const struct netflow_options *nf_options)
{
- struct svec collectors;
int error = 0;
- size_t i;
long long int old_timeout;
nf->engine_type = nf_options->engine_type;
nf->engine_id = nf_options->engine_id;
nf->add_id_to_iface = nf_options->add_id_to_iface;
- clear_collectors(nf);
-
- svec_clone(&collectors, &nf_options->collectors);
- svec_sort_unique(&collectors);
-
- nf->fds = xmalloc(sizeof *nf->fds * collectors.n);
- for (i = 0; i < collectors.n; i++) {
- const char *name = collectors.names[i];
- char *tmpname = xstrdup(name);
- int fd = open_collector(tmpname);
- free(tmpname);
- if (fd >= 0) {
- nf->fds[nf->n_fds++] = fd;
- } else {
- VLOG_WARN("couldn't open connection to collector (%s), "
- "ignoring %s\n", strerror(-fd), name);
- if (!error) {
- error = -fd;
- }
- }
- }
-
- svec_destroy(&collectors);
+ collectors_destroy(nf->collectors);
+ collectors_create(&nf_options->collectors, 0, &nf->collectors);
old_timeout = nf->active_timeout;
- if (nf_options->active_timeout != -1) {
+ if (nf_options->active_timeout < 0) {
nf->active_timeout = nf_options->active_timeout;
} else {
nf->active_timeout = ACTIVE_TIMEOUT_DEFAULT;
nf->engine_type = 0;
nf->engine_id = 0;
nf->boot_time = time_msec();
- nf->fds = NULL;
- nf->n_fds = 0;
+ nf->collectors = NULL;
nf->add_id_to_iface = false;
nf->netflow_cnt = 0;
ofpbuf_init(&nf->packet, 1500);
{
if (nf) {
ofpbuf_uninit(&nf->packet);
- clear_collectors(nf);
+ collectors_destroy(nf->collectors);
free(nf);
}
}