path: root/sys/netgraph/ng_bridge.c
diff options
authorLutz Donnerhacke <donner@FreeBSD.org>2021-01-13 22:18:55 +0000
committerLutz Donnerhacke <donner@FreeBSD.org>2021-02-07 19:31:33 +0000
commit6117aa58fa4f5891badf58b13c759976983f4f04 (patch)
treeec64323e7cb982d9e18868e2440164d04bf7ed1e /sys/netgraph/ng_bridge.c
parentcef689f45b9d5785ede463bcd23fea51bc1143ed (diff)
netgraph/ng_bridge: Make simple internal functions read-only
The data path in netgraph is designed to work on an read only state of the whole netgraph network. Currently this is achived by convention, there is no technical enforcment. In the case of NETGRAPH_DEBUG all nodes can be annotated for debugging purposes, so the strict enforcment needs to be lifted for this purpose. This patch is part of a series to make ng_bridge multithreaded, which is done by rewrite the data path to operate on const. Reviewed By: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D28141
Diffstat (limited to 'sys/netgraph/ng_bridge.c')
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index 4898a55f1463..d5b3b520a497 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -115,6 +115,7 @@ struct ng_bridge_link {
sendUnknown : 1;/* send unknown macs out */
struct ng_bridge_link_kernel_stats stats; /* link stats */
+typedef struct ng_bridge_link const *link_cp; /* read only access */
/* Per-node private data */
struct ng_bridge_private {
@@ -130,6 +131,7 @@ struct ng_bridge_private {
struct callout timer; /* one second periodic timer */
typedef struct ng_bridge_private *priv_p;
+typedef struct ng_bridge_private const *priv_cp; /* read only access */
/* Information about a host, stored in a hash table entry */
struct ng_bridge_hent {
@@ -149,12 +151,12 @@ static ng_rcvdata_t ng_bridge_rcvdata;
static ng_disconnect_t ng_bridge_disconnect;
/* Other internal functions */
-static struct ng_bridge_host *ng_bridge_get(priv_p priv, const u_char *addr);
+static struct ng_bridge_host *ng_bridge_get(priv_cp priv, const u_char *addr);
static int ng_bridge_put(priv_p priv, const u_char *addr, link_p link);
static void ng_bridge_rehash(priv_p priv);
static void ng_bridge_remove_hosts(priv_p priv, link_p link);
static void ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int arg2);
-static const char *ng_bridge_nodename(node_p node);
+static const char *ng_bridge_nodename(node_cp node);
/* Ethernet broadcast */
static const u_char ng_bridge_bcast_addr[ETHER_ADDR_LEN] =
@@ -920,7 +922,7 @@ ng_bridge_disconnect(hook_p hook)
* Find a host entry in the table.
static struct ng_bridge_host *
-ng_bridge_get(priv_p priv, const u_char *addr)
+ng_bridge_get(priv_cp priv, const u_char *addr)
const int bucket = HASH(addr, priv->hashMask);
struct ng_bridge_hent *hent;
@@ -1131,7 +1133,7 @@ ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int arg2)
* Return node's "name", even if it doesn't have one.
static const char *
-ng_bridge_nodename(node_p node)
+ng_bridge_nodename(node_cp node)
static char name[NG_NODESIZ];