From: Motonori Shindo Date: Tue, 4 Nov 2014 16:12:18 +0000 (+0900) Subject: netflow: Fix interpretation of flow_seq. X-Git-Tag: v2.3.1~10 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=1cd8ade3189069d653da4fb27c1d3f680fcca6f3 netflow: Fix interpretation of flow_seq. 'flow_seq" field in NetFlow v5 header should represent a number of NetFlow flow records exported while it is representing the number of NetFlow packets exported in the current code. This patch fixes this problem. Signed-off-by: Motonori Shindo Signed-off-by: Ben Pfaff --- diff --git a/ofproto/netflow.c b/ofproto/netflow.c index c7af01042..39c06b93b 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -121,7 +121,6 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, nf_hdr->sysuptime = htonl(time_msec() - nf->boot_time); nf_hdr->unix_secs = htonl(now.tv_sec); 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; nf_hdr->sampling_interval = htons(0); @@ -129,6 +128,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, nf_hdr = ofpbuf_data(&nf->packet); nf_hdr->count = htons(ntohs(nf_hdr->count) + 1); + nf_hdr->flow_seq = htonl(nf->netflow_cnt++); nf_rec = ofpbuf_put_zeros(&nf->packet, sizeof *nf_rec); nf_rec->src_addr = nf_flow->nw_src;