X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fnetflow.h;h=e1a2443b732f539819156f239d67a02ba4a8896a;hb=ac60863f78e412004c5b69f5a64a49bc6f0bc46d;hp=cc7b96057071705c65f170edcd756e3f32b47256;hpb=58fda1dab104041fc693032475ec4662c1a52849;p=sliver-openvswitch.git

diff --git a/ofproto/netflow.h b/ofproto/netflow.h
index cc7b96057..e1a2443b7 100644
--- a/ofproto/netflow.h
+++ b/ofproto/netflow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +14,33 @@
  * 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.
+ *
+ * (The active timeout interval is the interval at which NetFlow records are
+ * sent for flows that do not expire, so that such flows are still
+ * accounted.) */
+#define NF_ACTIVE_TIMEOUT_DEFAULT 600
 
 struct ofexpired;
 
 struct netflow_options {
-    struct svec collectors;
+    struct sset collectors;
     uint8_t engine_type;
     uint8_t engine_id;
     int active_timeout;
     bool add_id_to_iface;
 };
 
-enum netflow_output_ports {
-    NF_OUT_FLOOD = UINT16_MAX,
-    NF_OUT_MULTI = UINT16_MAX - 1,
-    NF_OUT_DROP = UINT16_MAX - 2
-};
+#define NF_OUT_FLOOD OFP_PORT_C(UINT16_MAX)
+#define NF_OUT_MULTI OFP_PORT_C(UINT16_MAX - 1)
+#define NF_OUT_DROP  OFP_PORT_C(UINT16_MAX - 2)
 
 struct netflow_flow {
     long long int last_expired;   /* Time this flow last timed out. */
@@ -43,9 +49,8 @@ struct netflow_flow {
     uint64_t packet_count_off;    /* Packet count at last time out. */
     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. */
+    ofp_port_t output_iface;      /* Output interface index. */
+    uint16_t tcp_flags;           /* Bitwise-OR of all TCP flags seen. */
 };
 
 struct netflow *netflow_create(void);
@@ -53,13 +58,17 @@ void netflow_destroy(struct netflow *);
 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_mask_wc(struct flow *, struct flow_wildcards *);
+
+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 *, uint16_t tcp_flags);
 bool netflow_active_timeout_expired(struct netflow *, struct netflow_flow *);
 
 #endif /* netflow.h */