/*
- * Copyright (c) 2008, 2009, 2010 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.
* limitations under the License.
*/
-#ifndef NETFLOW_H
-#define NETFLOW_H 1
+#ifndef OFPROTO_NETFLOW_H
+#define OFPROTO_NETFLOW_H 1
#include <stdint.h>
#include "flow.h"
-#include "svec.h"
+#include "sset.h"
/* Default active timeout interval, in seconds.
*
struct ofexpired;
struct netflow_options {
- struct svec collectors;
+ struct sset collectors;
uint8_t engine_type;
uint8_t engine_id;
int active_timeout;
uint64_t byte_count_off; /* Byte count at last time out. */
uint16_t output_iface; /* Output interface index. */
- uint8_t ip_tos; /* Last-seen IP type-of-service. */
uint8_t tcp_flags; /* Bitwise-OR of all TCP flags seen. */
};
int netflow_set_options(struct netflow *, const struct netflow_options *);
void netflow_expire(struct netflow *, struct netflow_flow *,
struct ofexpired *);
-void netflow_run(struct netflow *);
+bool netflow_run(struct netflow *);
+void netflow_wait(struct netflow *);
+
+void netflow_flow_init(struct netflow_flow *);
void netflow_flow_clear(struct netflow_flow *);
void netflow_flow_update_time(struct netflow *, struct netflow_flow *,
long long int used);
-void netflow_flow_update_flags(struct netflow_flow *, uint8_t ip_tos,
- uint8_t tcp_flags);
+void netflow_flow_update_flags(struct netflow_flow *, uint8_t tcp_flags);
bool netflow_active_timeout_expired(struct netflow *, struct netflow_flow *);
#endif /* netflow.h */