X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fnetflow.c;h=aec39685af58f0235c56de10821e6c7cbbe56edf;hb=e78b61f6e5068c959b7b2e0903f17f4e77a595f1;hp=bf2e6287197034904875c82fa0826e81ee80329c;hpb=eadef313296eac5c2fa99bc1d7a32e514a7989bf;p=openvswitch

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index bf2e6287..aec39685 100644
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,12 @@
 #include "byte-order.h"
 #include "collectors.h"
 #include "flow.h"
-#include "netflow.h"
+#include "lib/netflow.h"
 #include "ofpbuf.h"
 #include "ofproto.h"
+#include "ofproto/netflow.h"
 #include "packets.h"
+#include "poll-loop.h"
 #include "socket-util.h"
 #include "timeval.h"
 #include "util.h"
@@ -34,60 +36,6 @@
 
 VLOG_DEFINE_THIS_MODULE(netflow);
 
-#define NETFLOW_V5_VERSION 5
-
-/* 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.
- */
-struct netflow_v5_header {
-    ovs_be16 version;              /* NetFlow version is 5. */
-    ovs_be16 count;                /* Number of records in this message. */
-    ovs_be32 sysuptime;            /* System uptime in milliseconds. */
-    ovs_be32 unix_secs;            /* Number of seconds since Unix epoch. */
-    ovs_be32 unix_nsecs;           /* Number of residual nanoseconds
-                                      after epoch seconds. */
-    ovs_be32 flow_seq;             /* Number of flows since sending
-                                      messages began. */
-    uint8_t  engine_type;          /* Engine type. */
-    uint8_t  engine_id;            /* Engine id. */
-    ovs_be16 sampling_interval;    /* Set to zero. */
-};
-BUILD_ASSERT_DECL(sizeof(struct netflow_v5_header) == 24);
-
-/* A NetFlow v5 description of a terminating flow.  It is preceded by a
- * NetFlow v5 header.
- */
-struct netflow_v5_record {
-    ovs_be32 src_addr;             /* Source IP address. */
-    ovs_be32 dst_addr;             /* Destination IP address. */
-    ovs_be32 nexthop;              /* IP address of next hop.  Set to 0. */
-    ovs_be16 input;                /* Input interface index. */
-    ovs_be16 output;               /* Output interface index. */
-    ovs_be32 packet_count;         /* Number of packets. */
-    ovs_be32 byte_count;           /* Number of bytes. */
-    ovs_be32 init_time;            /* Value of sysuptime on first packet. */
-    ovs_be32 used_time;            /* Value of sysuptime on last packet. */
-
-    /* The 'src_port' and 'dst_port' identify the source and destination
-     * port, respectively, for TCP and UDP.  For ICMP, the high-order
-     * byte identifies the type and low-order byte identifies the code
-     * in the 'dst_port' field. */
-    ovs_be16 src_port;
-    ovs_be16 dst_port;
-
-    uint8_t  pad1;
-    uint8_t  tcp_flags;            /* Union of seen TCP flags. */
-    uint8_t  ip_proto;             /* IP protocol. */
-    uint8_t  ip_tos;               /* IP TOS value. */
-    ovs_be16 src_as;               /* Source AS ID.  Set to 0. */
-    ovs_be16 dst_as;               /* Destination AS ID.  Set to 0. */
-    uint8_t  src_mask;             /* Source mask bits.  Set to 0. */
-    uint8_t  dst_mask;             /* Destination mask bits.  Set to 0. */
-    uint8_t  pad[2];
-};
-BUILD_ASSERT_DECL(sizeof(struct netflow_v5_record) == 48);
-
 struct netflow {
     uint8_t engine_type;          /* Value of engine_type to use. */
     uint8_t engine_id;            /* Value of engine_id to use. */
@@ -99,6 +47,7 @@ struct netflow {
     uint32_t netflow_cnt;         /* Flow sequence number for NetFlow. */
     struct ofpbuf packet;         /* NetFlow packet being accumulated. */
     long long int active_timeout; /* Timeout for flows that are still active. */
+    long long int next_timeout;   /* Next scheduled active timeout. */
     long long int reconfig_time;  /* When we reconfigured the timeouts. */
 };
 
@@ -221,13 +170,33 @@ netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
     nf_flow->tcp_flags = 0;
 }
 
-void
+/* Returns true if it's time to send out a round of NetFlow active timeouts,
+ * false otherwise. */
+bool
 netflow_run(struct netflow *nf)
 {
     if (nf->packet.size) {
         collectors_send(nf->collectors, nf->packet.data, nf->packet.size);
         nf->packet.size = 0;
     }
+
+    if (nf->active_timeout && time_msec() >= nf->next_timeout) {
+        nf->next_timeout = time_msec() + 1000;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void
+netflow_wait(struct netflow *nf)
+{
+    if (nf->active_timeout) {
+        poll_timer_wait_until(nf->next_timeout);
+    }
+    if (nf->packet.size) {
+        poll_immediate_wake();
+    }
 }
 
 int
@@ -253,6 +222,7 @@ netflow_set_options(struct netflow *nf,
     nf->active_timeout *= 1000;
     if (old_timeout != nf->active_timeout) {
         nf->reconfig_time = time_msec();
+        nf->next_timeout = time_msec();
     }
 
     return error;
@@ -261,7 +231,7 @@ netflow_set_options(struct netflow *nf,
 struct netflow *
 netflow_create(void)
 {
-    struct netflow *nf = xmalloc(sizeof *nf);
+    struct netflow *nf = xzalloc(sizeof *nf);
     nf->engine_type = 0;
     nf->engine_id = 0;
     nf->boot_time = time_msec();