diff options
| author | wollman <wollman@FreeBSD.org> | 1997-08-16 19:16:27 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1997-08-16 19:16:27 +0000 |
| commit | 4542c1cf5d7077caf33d6d9468f5e647cd9d19e5 (patch) | |
| tree | 69fd093ef1e8c080592999507b664fe6315c0e10 /sys/nfs/nfs_subs.c | |
| parent | f4edc7fc6748272644fb845fc8636a5c261247d6 (diff) | |
| download | FreeBSD-src-4542c1cf5d7077caf33d6d9468f5e647cd9d19e5.zip FreeBSD-src-4542c1cf5d7077caf33d6d9468f5e647cd9d19e5.tar.gz | |
Fix all areas of the system (or at least all those in LINT) to avoid storing
socket addresses in mbufs. (Socket buffers are the one exception.) A number
of kernel APIs needed to get fixed in order to make this happen. Also,
fix three protocol families which kept PCBs in mbufs to not malloc them
instead. Delete some old compatibility cruft while we're at it, and add
some new routines in the in_cksum family.
Diffstat (limited to 'sys/nfs/nfs_subs.c')
| -rw-r--r-- | sys/nfs/nfs_subs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 4c102c8..69baccb 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.39 1997/07/16 09:06:29 dfr Exp $ + * $Id: nfs_subs.c,v 1.40 1997/07/22 15:35:57 dfr Exp $ */ /* @@ -1429,7 +1429,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, retdirp, p, kerbflag, pubflag) fhandle_t *fhp; int len; struct nfssvc_sock *slp; - struct mbuf *nam; + struct sockaddr *nam; struct mbuf **mdp; caddr_t *dposp; struct vnode **retdirp; @@ -1840,7 +1840,7 @@ nfsrv_fhtovp(fhp, lockflag, vpp, cred, slp, nam, rdonlyp, kerbflag, pubflag) struct vnode **vpp; struct ucred *cred; struct nfssvc_sock *slp; - struct mbuf *nam; + struct sockaddr *nam; int *rdonlyp; int kerbflag; int pubflag; @@ -1925,13 +1925,13 @@ int netaddr_match(family, haddr, nam) int family; union nethostaddr *haddr; - struct mbuf *nam; + struct sockaddr *nam; { register struct sockaddr_in *inetaddr; switch (family) { case AF_INET: - inetaddr = mtod(nam, struct sockaddr_in *); + inetaddr = (struct sockaddr_in *)nam; if (inetaddr->sin_family == AF_INET && inetaddr->sin_addr.s_addr == haddr->had_inetaddr) return (1); @@ -1941,8 +1941,8 @@ netaddr_match(family, haddr, nam) { register struct sockaddr_iso *isoaddr1, *isoaddr2; - isoaddr1 = mtod(nam, struct sockaddr_iso *); - isoaddr2 = mtod(haddr->had_nam, struct sockaddr_iso *); + isoaddr1 = (struct sockaddr_iso *)nam; + isoaddr2 = (struct sockaddr_iso *)haddr->had_nam; if (isoaddr1->siso_family == AF_ISO && isoaddr1->siso_nlen > 0 && isoaddr1->siso_nlen == isoaddr2->siso_nlen && |
