X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fnetflow.c;h=015208ac9569a559a6731ec84671bff94f87487d;hb=9b35536a145361285d341f83bc6fc19408bb04e5;hp=34d571f08c481282266ed8e9019d1c47dde13ccc;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=sliver-openvswitch.git diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 34d571f08..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. @@ -30,10 +30,10 @@ #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 @@ -94,8 +94,8 @@ struct netflow { uint8_t engine_id; /* Value of engine_id to use. */ long long int boot_time; /* Time when netflow_create() was called. */ struct collectors *collectors; /* NetFlow collectors. */ - bool add_id_to_iface; /* Put the 7 least signficiant bits of - * 'engine_id' into the most signficant + 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. */ @@ -103,32 +103,25 @@ struct netflow { long long int reconfig_time; /* When we reconfigured the timeouts. */ }; -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; @@ -150,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); @@ -170,18 +161,50 @@ 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; + nf_rec->ip_tos = expired->flow.nw_tos; + + /* NetFlow messages are limited to 30 records. */ + if (ntohs(nf_hdr->count) >= 30) { + netflow_run(nf); + } +} + +void +netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow, + struct ofexpired *expired) +{ + uint64_t pkt_delta = expired->packet_count - nf_flow->packet_count_off; + uint64_t byte_delta = expired->byte_count - nf_flow->byte_count_off; + + 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; + } + + /* 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; + } /* 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; - - /* NetFlow messages are limited to 30 records. */ - if (ntohs(nf_hdr->count) >= 30) { - netflow_run(nf); - } } void @@ -271,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; }