summaryrefslogtreecommitdiffstats
path: root/sys/netgraph/netflow
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2006-02-09 11:42:17 +0000
committerglebius <glebius@FreeBSD.org>2006-02-09 11:42:17 +0000
commit1985b120c411c773699eca3c471f46d888b5958c (patch)
tree37cd4f6f44c4b5f36f54fd0576ab3761fe2cc7c7 /sys/netgraph/netflow
parent89626cec4bf5313b5d558ed0ed7642938a9fa3f9 (diff)
downloadFreeBSD-src-1985b120c411c773699eca3c471f46d888b5958c.zip
FreeBSD-src-1985b120c411c773699eca3c471f46d888b5958c.tar.gz
- Increase maximum number of interfaces to 2048.
- Regroup softc so that frequently used elements are grouped in the beginning, while the interfaces array is at the end.
Diffstat (limited to 'sys/netgraph/netflow')
-rw-r--r--sys/netgraph/netflow/ng_netflow.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h
index 90de33d..72b75db 100644
--- a/sys/netgraph/netflow/ng_netflow.h
+++ b/sys/netgraph/netflow/ng_netflow.h
@@ -34,7 +34,7 @@
#define NG_NETFLOW_NODE_TYPE "netflow"
#define NGM_NETFLOW_COOKIE 1137078102
-#define NG_NETFLOW_MAXIFACES 512
+#define NG_NETFLOW_MAXIFACES 2048
/* Hook names */
@@ -219,13 +219,9 @@ typedef struct ng_netflow_ifinfo *ifinfo_p;
/* Structure describing our flow engine */
struct netflow {
node_p node; /* link to the node itself */
-
- struct ng_netflow_iface ifaces[NG_NETFLOW_MAXIFACES]; /* incoming */
hook_p export; /* export data goes there */
struct ng_netflow_info info;
- uint32_t flow_seq; /* current flow sequence */
-
struct callout exp_callout; /* expiry periodic job */
/*
@@ -236,8 +232,8 @@ struct netflow {
#define CACHESIZE (65536*4)
#define CACHELOWAT (CACHESIZE * 3/4)
#define CACHEHIGHWAT (CACHESIZE * 9/10)
- uma_zone_t zone;
- struct flow_hash_entry *hash;
+ uma_zone_t zone;
+ struct flow_hash_entry *hash;
/*
* NetFlow data export
@@ -250,8 +246,11 @@ struct netflow {
* current incomplete datagram is sent.
* export_mtx is used for attaching/detaching.
*/
- item_p export_item;
- struct mtx export_mtx;
+ item_p export_item;
+ struct mtx export_mtx;
+ uint32_t flow_seq; /* current flow sequence */
+
+ struct ng_netflow_iface ifaces[NG_NETFLOW_MAXIFACES];
};
typedef struct netflow *priv_p;
OpenPOWER on IntegriCloud