#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
+#include "byte-order.h"
#include "collectors.h"
#include "flow.h"
#include "netflow.h"
#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
* 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;
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
}
}
+/* Initializes a new 'nf_flow' given that the caller has already cleared it to
+ * all-zero-bits. */
+void
+netflow_flow_init(struct netflow_flow *nf_flow OVS_UNUSED)
+{
+ /* Nothing to do. */
+}
+
void
netflow_flow_clear(struct netflow_flow *nf_flow)
{