d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'netstat -f netgraph', which I had broken in r163463 ling time

Browse Source 
ago in 2006. This linked list is actually needed for userland.

PR:		kern/140446
Submitted by:	Adrian Steinmann <ast marabu.ch>
This commit is contained in:
Gleb Smirnoff 2010-03-12 14:51:42 +00:00
parent 49a1c30575
commit 60a25b4ba1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=205082
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/netgraph/ng_socket.c
View File

@ -156,6 +156,11 @@ static u_long ngpdg_recvspace = 20 * 1024;
SYSCTL_INT(_net_graph, OID_AUTO, recvspace, CTLFLAG_RW,
&ngpdg_recvspace , 0, "Maximum space for incoming Netgraph datagrams");
/* List of all sockets (for netstat -f netgraph) */
static LIST_HEAD(, ngpcb) ngsocklist;
static struct mtx ngsocketlist_mtx;
#define sotongpcb(so) ((struct ngpcb *)(so)->so_pcb)
/* If getting unexplained errors returned, set this to "kdb_enter("X"); */
@ -584,6 +589,10 @@ ng_attach_common(struct socket *so, int type)
so->so_pcb = (caddr_t)pcbp;
pcbp->ng_socket = so;
/* Add the socket to linked list */
mtx_lock(&ngsocketlist_mtx);
LIST_INSERT_HEAD(&ngsocklist, pcbp, socks);
mtx_unlock(&ngsocketlist_mtx);
return (0);
}
@ -617,6 +626,9 @@ ng_detach_common(struct ngpcb *pcbp, int which)
}
pcbp->ng_socket->so_pcb = NULL;
mtx_lock(&ngsocketlist_mtx);
LIST_REMOVE(pcbp, socks);
mtx_unlock(&ngsocketlist_mtx);
free(pcbp, M_PCB);
}
@ -1115,8 +1127,14 @@ ngs_mod_event(module_t mod, int event, void *data)
switch (event) {
case MOD_LOAD:
mtx_init(&ngsocketlist_mtx, "ng_socketlist", NULL, MTX_DEF);
break;
case MOD_UNLOAD:
/* Ensure there are no open netgraph sockets. */
if (!LIST_EMPTY(&ngsocklist)) {
error = EBUSY;
break;
}
#ifdef NOTYET
/* Unregister protocol domain XXX can't do this yet.. */
#endif