X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fnetflow.h;h=f6fad62b092f92eb0d8e6ce7c8e6bd5449b9b887;hb=abfec865566e6cce961cc8660de1ddfdc85dae5f;hp=24505066a3352d963d55ef3ee7901dec3df7a567;hpb=54e05b5f6f7d3504dc74a73dcf9707cbdb28d1d1;p=openvswitch

diff --git a/ofproto/netflow.h b/ofproto/netflow.h
index 24505066..f6fad62b 100644
--- a/ofproto/netflow.h
+++ b/ofproto/netflow.h
@@ -21,6 +21,13 @@
 #include "flow.h"
 #include "svec.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 {
@@ -45,7 +52,6 @@ struct netflow_flow {
     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. */
 };
 
@@ -59,8 +65,7 @@ void netflow_run(struct netflow *);
 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 */