X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fnetflow.c;h=015208ac9569a559a6731ec84671bff94f87487d;hb=9884eaad2b8386aefa036f370891fd1159598994;hp=0505cd33ca3bf441b15cfb7e8f44718a979172f5;hpb=d17ee8689bff22541dccaa792b70a848641f3646;p=sliver-openvswitch.git diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 0505cd33c..015208ac9 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ #include #include #include -#include "cfg.h" +#include "collectors.h" #include "flow.h" #include "netflow.h" #include "ofpbuf.h" @@ -30,15 +30,13 @@ #include "svec.h" #include "timeval.h" #include "util.h" +#include "vlog.h" #include "xtoxll.h" -#define THIS_MODULE VLM_netflow -#include "vlog.h" +VLOG_DEFINE_THIS_MODULE(netflow) #define NETFLOW_V5_VERSION 5 -static const int ACTIVE_TIMEOUT_DEFAULT = 600; - /* Every NetFlow v5 message contains the header that follows. This is * followed by up to thirty records that describe a terminating flow. * We only send a single record per NetFlow message. @@ -95,10 +93,9 @@ struct netflow { 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. */ - bool add_id_to_iface; /* Put the 7 least signficiant bits of - * 'engine_id' into the most signficant + 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. */ uint32_t netflow_cnt; /* Flow sequence number for NetFlow. */ struct ofpbuf packet; /* NetFlow packet being accumulated. */ @@ -106,89 +103,25 @@ struct netflow { 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) +static void +gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, + struct ofexpired *expired, + uint32_t packet_count, uint32_t byte_count) { struct netflow_v5_header *nf_hdr; struct netflow_v5_record *nf_rec; - struct timeval now; - - nf_flow->last_expired += nf->active_timeout; - /* NetFlow only reports on IP packets and we should only report flows - * that actually have traffic. */ - if (expired->flow.dl_type != htons(ETH_TYPE_IP) || - expired->packet_count - nf_flow->packet_count_off == 0) { - return; - } + if (!nf->packet.size) { + struct timespec now; - time_timeval(&now); + time_wall_timespec(&now); - if (!nf->packet.size) { nf_hdr = ofpbuf_put_zeros(&nf->packet, sizeof *nf_hdr); nf_hdr->version = htons(NETFLOW_V5_VERSION); nf_hdr->count = htons(0); nf_hdr->sysuptime = htonl(time_msec() - nf->boot_time); nf_hdr->unix_secs = htonl(now.tv_sec); - nf_hdr->unix_nsecs = htonl(now.tv_usec * 1000); + nf_hdr->unix_nsecs = htonl(now.tv_nsec); nf_hdr->flow_seq = htonl(nf->netflow_cnt++); nf_hdr->engine_type = nf->engine_type; nf_hdr->engine_id = nf->engine_id; @@ -210,10 +143,8 @@ netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow, nf_rec->input = htons(expired->flow.in_port); nf_rec->output = htons(nf_flow->output_iface); } - nf_rec->packet_count = htonl(MIN(expired->packet_count - - nf_flow->packet_count_off, UINT32_MAX)); - nf_rec->byte_count = htonl(MIN(expired->byte_count - - nf_flow->byte_count_off, UINT32_MAX)); + nf_rec->packet_count = htonl(packet_count); + nf_rec->byte_count = htonl(byte_count); nf_rec->init_time = htonl(nf_flow->created - nf->boot_time); nf_rec->used_time = htonl(MAX(nf_flow->created, expired->used) - nf->boot_time); @@ -230,13 +161,7 @@ netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow, } nf_rec->tcp_flags = nf_flow->tcp_flags; nf_rec->ip_proto = expired->flow.nw_proto; - nf_rec->ip_tos = nf_flow->ip_tos; - - /* Update flow tracking data. */ - nf_flow->created = 0; - nf_flow->packet_count_off = expired->packet_count; - nf_flow->byte_count_off = expired->byte_count; - nf_flow->tcp_flags = 0; + nf_rec->ip_tos = expired->flow.nw_tos; /* NetFlow messages are limited to 30 records. */ if (ntohs(nf_hdr->count) >= 30) { @@ -245,78 +170,71 @@ netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow, } void -netflow_run(struct netflow *nf) +netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow, + struct ofexpired *expired) { - size_t i; + uint64_t pkt_delta = expired->packet_count - nf_flow->packet_count_off; + uint64_t byte_delta = expired->byte_count - nf_flow->byte_count_off; - if (!nf->packet.size) { + nf_flow->last_expired += nf->active_timeout; + + /* NetFlow only reports on IP packets and we should only report flows + * that actually have traffic. */ + if (expired->flow.dl_type != htons(ETH_TYPE_IP) || pkt_delta == 0) { return; } - 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)); - } + /* NetFlow v5 records are limited to 32-bit counters. If we've + * wrapped a counter, send as multiple records so we don't lose + * track of any traffic. We try to evenly distribute the packet and + * byte counters, so that the bytes-per-packet lengths don't look + * wonky across the records. */ + while (byte_delta) { + int n_recs = (byte_delta + UINT32_MAX - 1) / UINT32_MAX; + uint32_t pkt_count = pkt_delta / n_recs; + uint32_t byte_count = byte_delta / n_recs; + + gen_netflow_rec(nf, nf_flow, expired, pkt_count, byte_count); + + pkt_delta -= pkt_count; + byte_delta -= byte_count; } - nf->packet.size = 0; + + /* Update flow tracking data. */ + nf_flow->created = 0; + nf_flow->packet_count_off = expired->packet_count; + nf_flow->byte_count_off = expired->byte_count; + nf_flow->tcp_flags = 0; } -static void -clear_collectors(struct netflow *nf) +void +netflow_run(struct netflow *nf) { - size_t i; - - for (i = 0; i < nf->n_fds; i++) { - close(nf->fds[i]); + if (nf->packet.size) { + collectors_send(nf->collectors, nf->packet.data, nf->packet.size); + nf->packet.size = 0; } - 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->active_timeout = NF_ACTIVE_TIMEOUT_DEFAULT; } nf->active_timeout *= 1000; if (old_timeout != nf->active_timeout) { @@ -333,8 +251,7 @@ netflow_create(void) 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); @@ -346,7 +263,7 @@ netflow_destroy(struct netflow *nf) { if (nf) { ofpbuf_uninit(&nf->packet); - clear_collectors(nf); + collectors_destroy(nf->collectors); free(nf); } } @@ -377,10 +294,8 @@ netflow_flow_update_time(struct netflow *nf, struct netflow_flow *nf_flow, } void -netflow_flow_update_flags(struct netflow_flow *nf_flow, uint8_t ip_tos, - uint8_t tcp_flags) +netflow_flow_update_flags(struct netflow_flow *nf_flow, uint8_t tcp_flags) { - nf_flow->ip_tos = ip_tos; nf_flow->tcp_flags |= tcp_flags; }