d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use m_length() instead of home-rolled versions.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2002-09-18 19:44:14 +00:00
parent a5554bf05b
commit 7ed60de837
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=103554
8 changed files with 30 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/kern/uipc_sockbuf.c
View File

@ -498,11 +498,11 @@ sbappend(sb, m)
#ifdef SOCKBUF_DEBUG
void
sbcheck(sb)
register struct sockbuf *sb;
struct sockbuf *sb;
{
register struct mbuf *m;
register struct mbuf *n = 0;
register u_long len = 0, mbcnt = 0;
struct mbuf *m;
struct mbuf *n = 0;
u_long len = 0, mbcnt = 0;
for (m = sb->sb_mb; m; m = n) {
n = m->m_nextpkt;
@ -610,22 +610,18 @@ sbinsertoob(sb, m0)
*/
int
sbappendaddr(sb, asa, m0, control)
register struct sockbuf *sb;
struct sockbuf *sb;
struct sockaddr *asa;
struct mbuf *m0, *control;
{
register struct mbuf *m, *n;
struct mbuf *m, *n;
int space = asa->sa_len;
if (m0 && (m0->m_flags & M_PKTHDR) == 0)
panic("sbappendaddr");
if (m0)
space += m0->m_pkthdr.len;
for (n = control; n; n = n->m_next) {
space += n->m_len;
if (n->m_next == 0) /* keep pointer to last control buf */
break;
}
space += m_length(control, &n);
if (space > sbspace(sb))
return (0);
if (asa->sa_len > MLEN)
@ -657,19 +653,12 @@ sbappendcontrol(sb, m0, control)
struct sockbuf *sb;
struct mbuf *control, *m0;
{
register struct mbuf *m, *n;
int space = 0;
struct mbuf *m, *n;
int space;
if (control == 0)
panic("sbappendcontrol");
for (m = control; ; m = m->m_next) {
space += m->m_len;
if (m->m_next == 0)
break;
}
n = m; /* save pointer to last control buffer */
for (m = m0; m; m = m->m_next)
space += m->m_len;
space = m_length(control, &n) + m_length(m0, NULL);
if (space > sbspace(sb))
return (0);
n->m_next = m0; /* concatenate data to control */

31
sys/kern/uipc_socket2.c
View File

@ -498,11 +498,11 @@ sbappend(sb, m)
#ifdef SOCKBUF_DEBUG
void
sbcheck(sb)
register struct sockbuf *sb;
struct sockbuf *sb;
{
register struct mbuf *m;
register struct mbuf *n = 0;
register u_long len = 0, mbcnt = 0;
struct mbuf *m;
struct mbuf *n = 0;
u_long len = 0, mbcnt = 0;
for (m = sb->sb_mb; m; m = n) {
n = m->m_nextpkt;
@ -610,22 +610,18 @@ sbinsertoob(sb, m0)
*/
int
sbappendaddr(sb, asa, m0, control)
register struct sockbuf *sb;
struct sockbuf *sb;
struct sockaddr *asa;
struct mbuf *m0, *control;
{
register struct mbuf *m, *n;
struct mbuf *m, *n;
int space = asa->sa_len;
if (m0 && (m0->m_flags & M_PKTHDR) == 0)
panic("sbappendaddr");
if (m0)
space += m0->m_pkthdr.len;
for (n = control; n; n = n->m_next) {
space += n->m_len;
if (n->m_next == 0) /* keep pointer to last control buf */
break;
}
space += m_length(control, &n);
if (space > sbspace(sb))
return (0);
if (asa->sa_len > MLEN)
@ -657,19 +653,12 @@ sbappendcontrol(sb, m0, control)
struct sockbuf *sb;
struct mbuf *control, *m0;
{
register struct mbuf *m, *n;
int space = 0;
struct mbuf *m, *n;
int space;
if (control == 0)
panic("sbappendcontrol");
for (m = control; ; m = m->m_next) {
space += m->m_len;
if (m->m_next == 0)
break;
}
n = m; /* save pointer to last control buffer */
for (m = m0; m; m = m->m_next)
space += m->m_len;
space = m_length(control, &n) + m_length(m0, NULL);
if (space > sbspace(sb))
return (0);
n->m_next = m0; /* concatenate data to control */

17
sys/net/if_ppp.c
View File

@ -758,7 +758,6 @@ pppoutput(ifp, m0, dst, rtp)
struct ifqueue *ifq;
enum NPmode mode;
int len;
struct mbuf *m;
#ifdef MAC
error = mac_check_ifnet_transmit(ifp, m0);
@ -851,9 +850,7 @@ pppoutput(ifp, m0, dst, rtp)
*cp++ = protocol & 0xff;
m0->m_len += PPP_HDRLEN;
len = 0;
for (m = m0; m != 0; m = m->m_next)
len += m->m_len;
len = m_length(m0, NULL);
if (sc->sc_flags & SC_LOG_OUTPKT) {
printf("ppp%d output: ", ifp->if_unit);
@ -1087,9 +1084,7 @@ ppp_dequeue(sc)
struct mbuf *mcomp = NULL;
int slen, clen;
slen = 0;
for (mp = m; mp != NULL; mp = mp->m_next)
slen += mp->m_len;
slen = m_length(m, NULL);
clen = (*sc->sc_xcomp->compress)
(sc->sc_xc_state, &mcomp, m, slen, sc->sc_if.if_mtu + PPP_HDRLEN);
if (mcomp != NULL) {
@ -1324,9 +1319,7 @@ ppp_inproc(sc, m)
sc->sc_stats.ppp_ipackets++;
if (sc->sc_flags & SC_LOG_INPKT) {
ilen = 0;
for (mp = m; mp != NULL; mp = mp->m_next)
ilen += mp->m_len;
ilen = m_length(m, NULL);
printf("ppp%d: got %d bytes\n", ifp->if_unit, ilen);
pppdumpm(m);
}
@ -1389,9 +1382,7 @@ ppp_inproc(sc, m)
}
#endif
ilen = 0;
for (mp = m; mp != NULL; mp = mp->m_next)
ilen += mp->m_len;
ilen = m_length(m, NULL);
#ifdef VJC
if (sc->sc_flags & SC_VJ_RESET) {

10
sys/netns/idp_usrreq.c
View File

@ -144,18 +144,12 @@ idp_output(nsp, m0)
register struct mbuf *m;
register struct idp *idp;
register struct socket *so;
register int len = 0;
register int len;
register struct route *ro;
struct mbuf *mprev;
extern int idpcksum;
/*
* Calculate data length.
*/
for (m = m0; m; m = m->m_next) {
mprev = m;
len += m->m_len;
}
len = m_length(m0, &mprev);
/*
* Make sure packet is actually of even length.
*/

3
sys/netns/spp_usrreq.c
View File

@ -687,8 +687,7 @@ register struct nspcb *nsp;
firstbad = m;
/*for (;;) {*/
/* calculate length */
for (m0 = m, len = 0; m ; m = m->m_next)
len += m->m_len;
len = m_length(m, NULL);
if (len > cb->s_mtu) {
}
/* FINISH THIS

4
sys/netsmb/smb_rq.c
View File

@ -421,9 +421,7 @@ smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count,
m0 = m_split(mtop, offset, M_TRYWAIT);
if (m0 == NULL)
return EBADRPC;
for(len = 0, m = m0; m->m_next; m = m->m_next)
len += m->m_len;
len += m->m_len;
len = m_length(m0, &m);
m->m_len -= len - count;
if (mdp->md_top == NULL) {
md_initm(mdp, m0);

8
sys/nfsclient/nfs_socket.c
View File

@ -869,13 +869,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum,
rep->r_vp = vp;
rep->r_td = td;
rep->r_procnum = procnum;
i = 0;
m = mrest;
while (m) {
i += m->m_len;
m = m->m_next;
}
mrest_len = i;
mrest_len = m_length(mrest, NULL);
/*
* Get the RPC header with authorization.

7
sys/nfsserver/nfs_syscalls.c
View File

@ -451,12 +451,7 @@ nfssvc_nfsd(struct thread *td)
nfsrv_updatecache(nd, TRUE, mreq);
nd->nd_mrep = NULL;
case RC_REPLY:
m = mreq;
siz = 0;
while (m) {
siz += m->m_len;
m = m->m_next;
}
siz = m_length(mreq, NULL);
if (siz <= 0 || siz > NFS_MAXPACKET) {
printf("mbuf siz=%d\n",siz);
panic("Bad nfs svc reply");