X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=ofproto%2Fnetflow.c;h=af6dda78cc1c58060abb45c4dc642127eed9d681;hb=09246b99d1601e2ba7ff85bb26f9b0235632a76d;hp=4881c5fdb5ce6c657db786f074b68d1d51ce90c3;hpb=9ebc44ae8c5940513a8dcc2aab8dcca8aff9d2a2;p=openvswitch

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 4881c5fd..af6dda78 100644
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "byte-order.h"
 #include "collectors.h"
 #include "flow.h"
 #include "netflow.h"
@@ -31,9 +32,8 @@
 #include "timeval.h"
 #include "util.h"
 #include "vlog.h"
-#include "xtoxll.h"
 
-VLOG_DEFINE_THIS_MODULE(netflow)
+VLOG_DEFINE_THIS_MODULE(netflow);
 
 #define NETFLOW_V5_VERSION 5
 
@@ -190,8 +190,8 @@ netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
          * 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 > UINT32_MAX) {
-            uint32_t n_recs = byte_delta >> 32;
+        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;
 
@@ -200,9 +200,6 @@ netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
             pkt_delta -= pkt_count;
             byte_delta -= byte_count;
         }
-        if (byte_delta > 0) {
-            gen_netflow_rec(nf, nf_flow, expired, pkt_delta, byte_delta);
-        }
     } else {
         /* In 600 seconds, a 10GbE link can theoretically transmit 75 * 10**10
          * == 175 * 2**32 bytes.  The byte counter is bigger than that, so it's