diff options
| author | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
|---|---|---|
| committer | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
| commit | e6fa9b9e922913444c2e6b2b58bf3de5eaed868d (patch) | |
| tree | 9d5f24794525313566896ab89aa860515db344a6 /sys/net/rtsock.c | |
| parent | 1ea6cbb8c29088e04528460633798a6c131ca1ba (diff) | |
| download | FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.zip FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.tar.gz | |
Back out my lats commit of locking down a socket, it conflicts with hsu's work.
Requested by: hsu
Diffstat (limited to 'sys/net/rtsock.c')
| -rw-r--r-- | sys/net/rtsock.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 407d6f3..47031c2 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -147,10 +147,8 @@ rts_attach(struct socket *so, int proto, struct thread *td) } rp->rcb_faddr = &route_src; route_cb.any_count++; - SOCK_LOCK(so); - soisconnected(so); + soisconnected_locked(so); so->so_options |= SO_USELOOPBACK; - SOCK_UNLOCK(so); splx(s); return 0; } @@ -474,9 +472,7 @@ flush: /* * Check to see if we don't want our own messages. */ - SOCK_LOCK(so); if ((so->so_options & SO_USELOOPBACK) == 0) { - SOCK_UNLOCK(so); if (route_cb.any_count <= 1) { if (rtm) Free(rtm); @@ -485,8 +481,7 @@ flush: } /* There is another listener, so construct message */ rp = sotorawcb(so); - } else - SOCK_UNLOCK(so); + } if (rtm) { m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm); if (m->m_pkthdr.len < rtm->rtm_msglen) { |
