aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/un.h
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2004-03-31 01:41:30 +0000
committerRobert Watson <rwatson@FreeBSD.org>2004-03-31 01:41:30 +0000
commitdb48c0d2540a87b2f675860d60422b77d708c58f (patch)
treea2166426af7223990afbf9b50fb2719c9e2a1447 /sys/sys/un.h
parent236efae6a954eaf6323f57466bc753fcdfefc9e2 (diff)
downloadsrc-db48c0d2540a87b2f675860d60422b77d708c58f.tar.gz
src-db48c0d2540a87b2f675860d60422b77d708c58f.zip
Export uipc_connect2() from uipc_usrreq.c instead of unp_connect2(),
and consume that interface in portalfs and fifofs instead. In the new world order, unp_connect2() assumes that the unpcb mutex is held, whereas uipc_connect2() validates that the passed sockets are UNIX domain sockets, then grabs the mutex. NB: the portalfs and fifofs code gets down and dirty with UNIX domain sockets. Maybe this is a bad thing.
Notes
Notes: svn path=/head/; revision=127652
Diffstat (limited to 'sys/sys/un.h')
-rw-r--r--sys/sys/un.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 12ca3605fff5..854e0d0040c7 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -64,10 +64,10 @@ struct mbuf;
struct socket;
struct sockopt;
+int uipc_connect2(struct socket *so1, struct socket *so2);
int uipc_ctloutput(struct socket *so, struct sockopt *sopt);
int uipc_usrreq(struct socket *so, int req, struct mbuf *m,
struct mbuf *nam, struct mbuf *control);
-int unp_connect2(struct socket *so, struct socket *so2);
void unp_dispose(struct mbuf *m);
int unp_externalize(struct mbuf *mbuf, struct mbuf **controlp);
void unp_init(void);