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

Slightly rearrange a code in rev. 1.164:

Browse Source 
o Move len initialization closer to place of its first usage.
o Compare len with 0 to improve readability.
o Explicitly zero out phlen in ip_insertoptions() in failure case.

Suggested by:   jhb
Reviewed by:    jhb
MFC after:      2 weeks
This commit is contained in:
Maxim Konovalov 2002-09-23 08:56:24 +00:00
parent d10fbbff27
commit cb7641e85b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/ip_output.c
View File

@ -141,7 +141,6 @@ ip_output(m0, opt, ro, flags, imo)
int rv; int rv;
#endif /* PFIL_HOOKS */ #endif /* PFIL_HOOKS */
len = 0;
args.eh = NULL; args.eh = NULL;
args.rule = NULL; args.rule = NULL;
args.next_hop = NULL; args.next_hop = NULL;
@ -199,8 +198,9 @@ ip_output(m0, opt, ro, flags, imo)
} }
if (opt) { if (opt) {
len = 0;
m = ip_insertoptions(m, opt, &len); m = ip_insertoptions(m, opt, &len);
if (len >= sizeof(struct ip)) if (len != 0)
hlen = len; hlen = len;
} }
ip = mtod(m, struct ip *); ip = mtod(m, struct ip *);
@ -1136,14 +1136,18 @@ ip_insertoptions(m, opt, phlen)
unsigned optlen; unsigned optlen;
optlen = opt->m_len - sizeof(p->ipopt_dst); optlen = opt->m_len - sizeof(p->ipopt_dst);
if (optlen + (u_short)ip->ip_len > IP_MAXPACKET) if (optlen + (u_short)ip->ip_len > IP_MAXPACKET) {
*phlen = 0;
return (m); /* XXX should fail */ return (m); /* XXX should fail */
}
if (p->ipopt_dst.s_addr) if (p->ipopt_dst.s_addr)
ip->ip_dst = p->ipopt_dst; ip->ip_dst = p->ipopt_dst;
if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) { if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
MGETHDR(n, M_DONTWAIT, MT_HEADER); MGETHDR(n, M_DONTWAIT, MT_HEADER);
if (n == 0) if (n == 0) {
*phlen = 0;
return (m); return (m);
}
n->m_pkthdr.rcvif = (struct ifnet *)0; n->m_pkthdr.rcvif = (struct ifnet *)0;
#ifdef MAC #ifdef MAC
mac_create_mbuf_from_mbuf(m, n); mac_create_mbuf_from_mbuf(m, n);