version 1.140.6.2, 2007/10/02 18:29:06 |
version 1.140.6.3, 2007/10/07 13:25:08 |
Line 894 sosend(struct socket *so, struct mbuf *a |
|
Line 894 sosend(struct socket *so, struct mbuf *a |
|
if (flags & MSG_EOR) |
if (flags & MSG_EOR) |
top->m_flags |= M_EOR; |
top->m_flags |= M_EOR; |
} else do { |
} else do { |
if (top == 0) { |
if (top == NULL) { |
m = m_gethdr(M_WAIT, MT_DATA); |
m = m_gethdr(M_WAIT, MT_DATA); |
mlen = MHLEN; |
mlen = MHLEN; |
m->m_pkthdr.len = 0; |
m->m_pkthdr.len = 0; |
Line 938 sosend(struct socket *so, struct mbuf *a |
|
Line 938 sosend(struct socket *so, struct mbuf *a |
|
if (atomic && top == 0 && len < mlen) |
if (atomic && top == 0 && len < mlen) |
MH_ALIGN(m, len); |
MH_ALIGN(m, len); |
} |
} |
error = uiomove(mtod(m, void *), (int)len, |
error = uiomove(mtod(m, void *), (int)len, uio); |
uio); |
|
have_data: |
have_data: |
resid = uio->uio_resid; |
resid = uio->uio_resid; |
m->m_len = len; |
m->m_len = len; |
*mp = m; |
*mp = m; |
top->m_pkthdr.len += len; |
top->m_pkthdr.len += len; |
if (error) |
if (error != 0) |
goto release; |
goto release; |
mp = &m->m_next; |
mp = &m->m_next; |
if (resid <= 0) { |
if (resid <= 0) { |
Line 974 sosend(struct socket *so, struct mbuf *a |
|
Line 973 sosend(struct socket *so, struct mbuf *a |
|
splx(s); |
splx(s); |
|
|
clen = 0; |
clen = 0; |
control = 0; |
control = NULL; |
top = 0; |
top = NULL; |
mp = ⊤ |
mp = ⊤ |
if (error) |
if (error != 0) |
goto release; |
goto release; |
} while (resid && space > 0); |
} while (resid && space > 0); |
} while (resid); |
} while (resid); |
Line 1024 soreceive(struct socket *so, struct mbuf |
|
Line 1023 soreceive(struct socket *so, struct mbuf |
|
type = 0; |
type = 0; |
orig_resid = uio->uio_resid; |
orig_resid = uio->uio_resid; |
|
|
if (paddr) |
if (paddr != NULL) |
*paddr = 0; |
*paddr = NULL; |
if (controlp) |
if (controlp != NULL) |
*controlp = 0; |
*controlp = NULL; |
if (flagsp) |
if (flagsp != NULL) |
flags = *flagsp &~ MSG_EOR; |
flags = *flagsp &~ MSG_EOR; |
else |
else |
flags = 0; |
flags = 0; |
Line 1046 soreceive(struct socket *so, struct mbuf |
|
Line 1045 soreceive(struct socket *so, struct mbuf |
|
error = uiomove(mtod(m, void *), |
error = uiomove(mtod(m, void *), |
(int) min(uio->uio_resid, m->m_len), uio); |
(int) min(uio->uio_resid, m->m_len), uio); |
m = m_free(m); |
m = m_free(m); |
} while (uio->uio_resid && error == 0 && m); |
} while (uio->uio_resid > 0 && error == 0 && m); |
bad: |
bad: |
if (m) |
if (m != NULL) |
m_freem(m); |
m_freem(m); |
return (error); |
return error; |
} |
} |
if (mp) |
if (mp != NULL) |
*mp = NULL; |
*mp = NULL; |
if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) |
if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) |
(*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, l); |
(*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, l); |
|
|
restart: |
restart: |
if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) |
if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) |
return (error); |
return error; |
s = splsoftnet(); |
s = splsoftnet(); |
|
|
m = so->so_rcv.sb_mb; |
m = so->so_rcv.sb_mb; |
Line 1074 soreceive(struct socket *so, struct mbuf |
|
Line 1073 soreceive(struct socket *so, struct mbuf |
|
* we have to do the receive in sections, and thus risk returning |
* we have to do the receive in sections, and thus risk returning |
* a short count if a timeout or signal occurs after we start. |
* a short count if a timeout or signal occurs after we start. |
*/ |
*/ |
if (m == 0 || (((flags & MSG_DONTWAIT) == 0 && |
if (m == NULL || |
so->so_rcv.sb_cc < uio->uio_resid) && |
((flags & MSG_DONTWAIT) == 0 && |
(so->so_rcv.sb_cc < so->so_rcv.sb_lowat || |
so->so_rcv.sb_cc < uio->uio_resid && |
((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) && |
(so->so_rcv.sb_cc < so->so_rcv.sb_lowat || |
m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) { |
((flags & MSG_WAITALL) && |
|
uio->uio_resid <= so->so_rcv.sb_hiwat)) && |
|
m->m_nextpkt == NULL && |
|
(pr->pr_flags & PR_ATOMIC) == 0)) { |
#ifdef DIAGNOSTIC |
#ifdef DIAGNOSTIC |
if (m == 0 && so->so_rcv.sb_cc) |
if (m == NULL && so->so_rcv.sb_cc) |
panic("receive 1"); |
panic("receive 1"); |
#endif |
#endif |
if (so->so_error) { |
if (so->so_error) { |
if (m) |
if (m != NULL) |
goto dontblock; |
goto dontblock; |
error = so->so_error; |
error = so->so_error; |
if ((flags & MSG_PEEK) == 0) |
if ((flags & MSG_PEEK) == 0) |
Line 1092 soreceive(struct socket *so, struct mbuf |
|
Line 1094 soreceive(struct socket *so, struct mbuf |
|
goto release; |
goto release; |
} |
} |
if (so->so_state & SS_CANTRCVMORE) { |
if (so->so_state & SS_CANTRCVMORE) { |
if (m) |
if (m != NULL) |
goto dontblock; |
goto dontblock; |
else |
else |
goto release; |
goto release; |
} |
} |
for (; m; m = m->m_next) |
for (; m != NULL; m = m->m_next) |
if (m->m_type == MT_OOBDATA || (m->m_flags & M_EOR)) { |
if (m->m_type == MT_OOBDATA || (m->m_flags & M_EOR)) { |
m = so->so_rcv.sb_mb; |
m = so->so_rcv.sb_mb; |
goto dontblock; |
goto dontblock; |
Line 1118 soreceive(struct socket *so, struct mbuf |
|
Line 1120 soreceive(struct socket *so, struct mbuf |
|
sbunlock(&so->so_rcv); |
sbunlock(&so->so_rcv); |
error = sbwait(&so->so_rcv); |
error = sbwait(&so->so_rcv); |
splx(s); |
splx(s); |
if (error) |
if (error != 0) |
return (error); |
return error; |
goto restart; |
goto restart; |
} |
} |
dontblock: |
dontblock: |
Line 1128 soreceive(struct socket *so, struct mbuf |
|
Line 1130 soreceive(struct socket *so, struct mbuf |
|
* While we process the initial mbufs containing address and control |
* While we process the initial mbufs containing address and control |
* info, we save a copy of m->m_nextpkt into nextrecord. |
* info, we save a copy of m->m_nextpkt into nextrecord. |
*/ |
*/ |
if (l) |
if (l != NULL) |
l->l_proc->p_stats->p_ru.ru_msgrcv++; |
l->l_proc->p_stats->p_ru.ru_msgrcv++; |
KASSERT(m == so->so_rcv.sb_mb); |
KASSERT(m == so->so_rcv.sb_mb); |
SBLASTRECORDCHK(&so->so_rcv, "soreceive 1"); |
SBLASTRECORDCHK(&so->so_rcv, "soreceive 1"); |
Line 1147 soreceive(struct socket *so, struct mbuf |
|
Line 1149 soreceive(struct socket *so, struct mbuf |
|
} else { |
} else { |
sbfree(&so->so_rcv, m); |
sbfree(&so->so_rcv, m); |
mbuf_removed = 1; |
mbuf_removed = 1; |
if (paddr) { |
if (paddr != NULL) { |
*paddr = m; |
*paddr = m; |
so->so_rcv.sb_mb = m->m_next; |
so->so_rcv.sb_mb = m->m_next; |
m->m_next = 0; |
m->m_next = NULL; |
m = so->so_rcv.sb_mb; |
m = so->so_rcv.sb_mb; |
} else { |
} else { |
MFREE(m, so->so_rcv.sb_mb); |
MFREE(m, so->so_rcv.sb_mb); |
Line 1158 soreceive(struct socket *so, struct mbuf |
|
Line 1160 soreceive(struct socket *so, struct mbuf |
|
} |
} |
} |
} |
} |
} |
while (m && m->m_type == MT_CONTROL && error == 0) { |
while (m != NULL && m->m_type == MT_CONTROL && error == 0) { |
if (flags & MSG_PEEK) { |
if (flags & MSG_PEEK) { |
if (controlp) |
if (controlp != NULL) |
*controlp = m_copy(m, 0, m->m_len); |
*controlp = m_copy(m, 0, m->m_len); |
m = m->m_next; |
m = m->m_next; |
} else { |
} else { |
sbfree(&so->so_rcv, m); |
sbfree(&so->so_rcv, m); |
mbuf_removed = 1; |
mbuf_removed = 1; |
if (controlp) { |
if (controlp != NULL) { |
struct domain *dom = pr->pr_domain; |
struct domain *dom = pr->pr_domain; |
if (dom->dom_externalize && l && |
if (dom->dom_externalize && l && |
mtod(m, struct cmsghdr *)->cmsg_type == |
mtod(m, struct cmsghdr *)->cmsg_type == |
Line 1174 soreceive(struct socket *so, struct mbuf |
|
Line 1176 soreceive(struct socket *so, struct mbuf |
|
error = (*dom->dom_externalize)(m, l); |
error = (*dom->dom_externalize)(m, l); |
*controlp = m; |
*controlp = m; |
so->so_rcv.sb_mb = m->m_next; |
so->so_rcv.sb_mb = m->m_next; |
m->m_next = 0; |
m->m_next = NULL; |
m = so->so_rcv.sb_mb; |
m = so->so_rcv.sb_mb; |
} else { |
} else { |
/* |
/* |
Line 1188 soreceive(struct socket *so, struct mbuf |
|
Line 1190 soreceive(struct socket *so, struct mbuf |
|
m = so->so_rcv.sb_mb; |
m = so->so_rcv.sb_mb; |
} |
} |
} |
} |
if (controlp) { |
if (controlp != NULL) { |
orig_resid = 0; |
orig_resid = 0; |
controlp = &(*controlp)->m_next; |
controlp = &(*controlp)->m_next; |
} |
} |
Line 1200 soreceive(struct socket *so, struct mbuf |
|
Line 1202 soreceive(struct socket *so, struct mbuf |
|
* the last packet on the chain (nextrecord == NULL) and we |
* the last packet on the chain (nextrecord == NULL) and we |
* change m->m_nextpkt. |
* change m->m_nextpkt. |
*/ |
*/ |
if (m) { |
if (m != NULL) { |
if ((flags & MSG_PEEK) == 0) { |
if ((flags & MSG_PEEK) == 0) { |
m->m_nextpkt = nextrecord; |
m->m_nextpkt = nextrecord; |
/* |
/* |
Line 1228 soreceive(struct socket *so, struct mbuf |
|
Line 1230 soreceive(struct socket *so, struct mbuf |
|
|
|
moff = 0; |
moff = 0; |
offset = 0; |
offset = 0; |
while (m && uio->uio_resid > 0 && error == 0) { |
while (m != NULL && uio->uio_resid > 0 && error == 0) { |
if (m->m_type == MT_OOBDATA) { |
if (m->m_type == MT_OOBDATA) { |
if (type != MT_OOBDATA) |
if (type != MT_OOBDATA) |
break; |
break; |
Line 1252 soreceive(struct socket *so, struct mbuf |
|
Line 1254 soreceive(struct socket *so, struct mbuf |
|
* we must note any additions to the sockbuf when we |
* we must note any additions to the sockbuf when we |
* block interrupts again. |
* block interrupts again. |
*/ |
*/ |
if (mp == 0) { |
if (mp == NULL) { |
SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove"); |
SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove"); |
splx(s); |
splx(s); |
error = uiomove(mtod(m, char *) + moff, (int)len, uio); |
error = uiomove(mtod(m, char *) + moff, (int)len, uio); |
s = splsoftnet(); |
s = splsoftnet(); |
if (error) { |
if (error != 0) { |
/* |
/* |
* If any part of the record has been removed |
* If any part of the record has been removed |
* (such as the MT_SONAME mbuf, which will |
* (such as the MT_SONAME mbuf, which will |
Line 1312 soreceive(struct socket *so, struct mbuf |
|
Line 1314 soreceive(struct socket *so, struct mbuf |
|
SBLASTRECORDCHK(&so->so_rcv, "soreceive 3"); |
SBLASTRECORDCHK(&so->so_rcv, "soreceive 3"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive 3"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive 3"); |
} |
} |
} else { |
} else if (flags & MSG_PEEK) |
if (flags & MSG_PEEK) |
moff += len; |
moff += len; |
else { |
else { |
if (mp != NULL) |
if (mp) |
*mp = m_copym(m, 0, len, M_WAIT); |
*mp = m_copym(m, 0, len, M_WAIT); |
m->m_data += len; |
m->m_data += len; |
m->m_len -= len; |
m->m_len -= len; |
so->so_rcv.sb_cc -= len; |
so->so_rcv.sb_cc -= len; |
|
} |
|
} |
} |
if (so->so_oobmark) { |
if (so->so_oobmark) { |
if ((flags & MSG_PEEK) == 0) { |
if ((flags & MSG_PEEK) == 0) { |
Line 1345 soreceive(struct socket *so, struct mbuf |
|
Line 1345 soreceive(struct socket *so, struct mbuf |
|
* with a short count but without error. |
* with a short count but without error. |
* Keep sockbuf locked against other readers. |
* Keep sockbuf locked against other readers. |
*/ |
*/ |
while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 && |
while (flags & MSG_WAITALL && m == NULL && uio->uio_resid > 0 && |
!sosendallatonce(so) && !nextrecord) { |
!sosendallatonce(so) && !nextrecord) { |
if (so->so_error || so->so_state & SS_CANTRCVMORE) |
if (so->so_error || so->so_state & SS_CANTRCVMORE) |
break; |
break; |
Line 1366 soreceive(struct socket *so, struct mbuf |
|
Line 1366 soreceive(struct socket *so, struct mbuf |
|
SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 2"); |
SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 2"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 2"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 2"); |
error = sbwait(&so->so_rcv); |
error = sbwait(&so->so_rcv); |
if (error) { |
if (error != 0) { |
sbunlock(&so->so_rcv); |
sbunlock(&so->so_rcv); |
splx(s); |
splx(s); |
return (0); |
return 0; |
} |
} |
if ((m = so->so_rcv.sb_mb) != NULL) |
if ((m = so->so_rcv.sb_mb) != NULL) |
nextrecord = m->m_nextpkt; |
nextrecord = m->m_nextpkt; |
Line 1382 soreceive(struct socket *so, struct mbuf |
|
Line 1382 soreceive(struct socket *so, struct mbuf |
|
(void) sbdroprecord(&so->so_rcv); |
(void) sbdroprecord(&so->so_rcv); |
} |
} |
if ((flags & MSG_PEEK) == 0) { |
if ((flags & MSG_PEEK) == 0) { |
if (m == 0) { |
if (m == NULL) { |
/* |
/* |
* First part is an inline SB_EMPTY_FIXUP(). Second |
* First part is an inline SB_EMPTY_FIXUP(). Second |
* part makes sure sb_lastrecord is up-to-date if |
* part makes sure sb_lastrecord is up-to-date if |
Line 1408 soreceive(struct socket *so, struct mbuf |
|
Line 1408 soreceive(struct socket *so, struct mbuf |
|
goto restart; |
goto restart; |
} |
} |
|
|
if (flagsp) |
if (flagsp != NULL) |
*flagsp |= flags; |
*flagsp |= flags; |
release: |
release: |
sbunlock(&so->so_rcv); |
sbunlock(&so->so_rcv); |
splx(s); |
splx(s); |
return (error); |
return error; |
} |
} |
|
|
int |
int |
Line 1430 soshutdown(struct socket *so, int how) |
|
Line 1430 soshutdown(struct socket *so, int how) |
|
if (how == SHUT_WR || how == SHUT_RDWR) |
if (how == SHUT_WR || how == SHUT_RDWR) |
return (*pr->pr_usrreq)(so, PRU_SHUTDOWN, NULL, |
return (*pr->pr_usrreq)(so, PRU_SHUTDOWN, NULL, |
NULL, NULL, NULL); |
NULL, NULL, NULL); |
return (0); |
return 0; |
} |
} |
|
|
void |
void |