git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
ofproto
/
netflow.c
diff --git
a/ofproto/netflow.c
b/ofproto/netflow.c
index
a093749
..
e9382af
100644
(file)
--- a/
ofproto/netflow.c
+++ b/
ofproto/netflow.c
@@
-110,7
+110,7
@@
gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
struct netflow_v5_header *nf_hdr;
struct netflow_v5_record *nf_rec;
struct netflow_v5_header *nf_hdr;
struct netflow_v5_record *nf_rec;
- if (!
nf->packet.size
) {
+ if (!
ofpbuf_size(&nf->packet)
) {
struct timespec now;
time_wall_timespec(&now);
struct timespec now;
time_wall_timespec(&now);
@@
-127,7
+127,7
@@
gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
nf_hdr->sampling_interval = htons(0);
}
nf_hdr->sampling_interval = htons(0);
}
- nf_hdr =
nf->packet.data
;
+ nf_hdr =
ofpbuf_data(&nf->packet)
;
nf_hdr->count = htons(ntohs(nf_hdr->count) + 1);
nf_rec = ofpbuf_put_zeros(&nf->packet, sizeof *nf_rec);
nf_hdr->count = htons(ntohs(nf_hdr->count) + 1);
nf_rec = ofpbuf_put_zeros(&nf->packet, sizeof *nf_rec);
@@
-270,7
+270,6
@@
netflow_expire__(struct netflow *nf, struct netflow_flow *nf_flow)
}
/* Update flow tracking data. */
}
/* Update flow tracking data. */
- nf_flow->created = 0;
nf_flow->packet_count = 0;
nf_flow->byte_count = 0;
nf_flow->tcp_flags = 0;
nf_flow->packet_count = 0;
nf_flow->byte_count = 0;
nf_flow->tcp_flags = 0;
@@
-313,9
+312,9
@@
netflow_run__(struct netflow *nf) OVS_REQUIRES(mutex)
long long int now = time_msec();
struct netflow_flow *nf_flow, *next;
long long int now = time_msec();
struct netflow_flow *nf_flow, *next;
- if (
nf->packet.size
) {
- collectors_send(nf->collectors,
nf->packet.data, nf->packet.size
);
-
nf->packet.size = 0
;
+ if (
ofpbuf_size(&nf->packet)
) {
+ collectors_send(nf->collectors,
ofpbuf_data(&nf->packet), ofpbuf_size(&nf->packet)
);
+
ofpbuf_set_size(&nf->packet, 0)
;
}
if (!nf->active_timeout || now < nf->next_timeout) {
}
if (!nf->active_timeout || now < nf->next_timeout) {
@@
-354,7
+353,7
@@
netflow_wait(struct netflow *nf) OVS_EXCLUDED(mutex)
if (nf->active_timeout) {
poll_timer_wait_until(nf->next_timeout);
}
if (nf->active_timeout) {
poll_timer_wait_until(nf->next_timeout);
}
- if (
nf->packet.size
) {
+ if (
ofpbuf_size(&nf->packet)
) {
poll_immediate_wake();
}
ovs_mutex_unlock(&mutex);
poll_immediate_wake();
}
ovs_mutex_unlock(&mutex);