Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate use of dtom() in the handing of UNIX domain sockets. Add an

Browse Source 
"unp_addrlen" member to the unpcb, and use it when copying the socket
name.  This eliminates that last uses of dtom() in the system.
This commit is contained in:
thorpej 1997-06-24 19:12:53 +00:00
parent ff21c8f511
commit a149ed59e4
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/kern/uipc_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_usrreq.c,v 1.25 1997/05/15 17:01:04 kleink Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.26 1997/06/24 19:12:55 thorpej Exp $ */
/*
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
@ -391,7 +391,7 @@ unp_detach(unp)
soisdisconnected(unp->unp_socket);
unp->unp_socket->so_pcb = 0;
if (unp->unp_addr)
m_freem(dtom(unp->unp_addr));
free(unp->unp_addr, M_SONAME);
if (unp_rights) {
/*
* Normally the receive buffer is flushed later,
@ -419,6 +419,8 @@ unp_bind(unp, nam, p)
int error;
struct nameidata nd;
if (nam->m_len > sizeof(struct sockaddr_un))
return (EINVAL);
if (unp->unp_vnode != 0)
return (EINVAL);
NDINIT(&nd, CREATE, FOLLOW | LOCKPARENT, UIO_SYSSPACE,
@ -451,8 +453,9 @@ unp_bind(unp, nam, p)
vp = nd.ni_vp;
vp->v_socket = unp->unp_socket;
unp->unp_vnode = vp;
unp->unp_addr =
mtod(m_copy(nam, 0, (int)M_COPYALL), struct sockaddr_un *);
unp->unp_addrlen = nam->m_len;
unp->unp_addr = malloc(unp->unp_addrlen, M_SONAME, M_WAITOK);
m_copydata(nam, 0, unp->unp_addrlen, (caddr_t)unp->unp_addr);
VOP_UNLOCK(vp);
return (0);
}
@ -502,9 +505,13 @@ unp_connect(so, nam, p)
}
unp2 = sotounpcb(so2);
unp3 = sotounpcb(so3);
if (unp2->unp_addr)
unp3->unp_addr = mtod(m_copy(dtom(unp2->unp_addr), 0,
(int)M_COPYALL), struct sockaddr_un *);
if (unp2->unp_addr) {
unp3->unp_addr = malloc(unp2->unp_addrlen,
M_SONAME, M_WAITOK);
bcopy(unp2->unp_addr, unp3->unp_addr,
unp2->unp_addrlen);
unp3->unp_addrlen = unp2->unp_addrlen;
}
so2 = so3;
}
error = unp_connect2(so, so2);
@ -615,7 +622,7 @@ unp_drop(unp, errno)
so->so_pcb = 0;
sofree(so);
if (unp->unp_addr)
m_freem(dtom(unp->unp_addr));
free(unp->unp_addr, M_SONAME);
free(unp, M_PCB);
}
}

12
sys/miscfs/portal/portal_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: portal_vnops.c,v 1.25 1997/05/09 04:05:01 mycroft Exp $ */
/* $NetBSD: portal_vnops.c,v 1.26 1997/06/24 19:12:57 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@ -271,9 +271,13 @@ portal_connect(so, so2)
unp2 = sotounpcb(so2);
unp3 = sotounpcb(so3);
if (unp2->unp_addr)
unp3->unp_addr = mtod(m_copy(dtom(unp2->unp_addr), 0,
(int)M_COPYALL), struct sockaddr_un *);
if (unp2->unp_addr) {
unp3->unp_addr = malloc(unp2->unp_addrlen,
M_SONAME, M_WAITOK);
bcopy(unp2->unp_addr, unp3->unp_addr,
unp2->unp_addrlen);
unp3->unp_addrlen = unp2->unp_addrlen;
}
so2 = so3;

3
sys/sys/unpcb.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: unpcb.h,v 1.9 1997/05/15 17:01:08 kleink Exp $ */
/* $NetBSD: unpcb.h,v 1.10 1997/06/24 19:12:53 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -77,6 +77,7 @@ struct unpcb {
struct unpcb *unp_refs; /* referencing socket linked list */
struct unpcb *unp_nextref; /* link in unp_refs list */
struct sockaddr_un *unp_addr; /* bound address of socket */
size_t unp_addrlen; /* size of socket address */
int unp_cc; /* copy of rcv.sb_cc */
int unp_mbcnt; /* copy of rcv.sb_mbcnt */
struct timespec unp_ctime; /* holds creation time */