version 1.243, 2007/02/17 22:34:11 |
version 1.244, 2007/03/04 06:03:21 |
Line 516 ip_input(struct mbuf *m) |
|
Line 516 ip_input(struct mbuf *m) |
|
* it. Otherwise, if it is aligned, make sure the entire |
* it. Otherwise, if it is aligned, make sure the entire |
* base IP header is in the first mbuf of the chain. |
* base IP header is in the first mbuf of the chain. |
*/ |
*/ |
if (IP_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) { |
if (IP_HDR_ALIGNED_P(mtod(m, void *)) == 0) { |
if ((m = m_copyup(m, sizeof(struct ip), |
if ((m = m_copyup(m, sizeof(struct ip), |
(max_linkhdr + 3) & ~3)) == NULL) { |
(max_linkhdr + 3) & ~3)) == NULL) { |
/* XXXJRT new stat, please */ |
/* XXXJRT new stat, please */ |
Line 1528 ip_dooptions(struct mbuf *m) |
|
Line 1528 ip_dooptions(struct mbuf *m) |
|
/* |
/* |
* locate outgoing interface |
* locate outgoing interface |
*/ |
*/ |
bcopy((caddr_t)(cp + off), (caddr_t)&ipaddr.sin_addr, |
bcopy((void *)(cp + off), (void *)&ipaddr.sin_addr, |
sizeof(ipaddr.sin_addr)); |
sizeof(ipaddr.sin_addr)); |
if (opt == IPOPT_SSRR) |
if (opt == IPOPT_SSRR) |
ia = ifatoia(ifa_ifwithladdr(sintosa(&ipaddr))); |
ia = ifatoia(ifa_ifwithladdr(sintosa(&ipaddr))); |
Line 1540 ip_dooptions(struct mbuf *m) |
|
Line 1540 ip_dooptions(struct mbuf *m) |
|
goto bad; |
goto bad; |
} |
} |
ip->ip_dst = ipaddr.sin_addr; |
ip->ip_dst = ipaddr.sin_addr; |
bcopy((caddr_t)&ia->ia_addr.sin_addr, |
bcopy((void *)&ia->ia_addr.sin_addr, |
(caddr_t)(cp + off), sizeof(struct in_addr)); |
(void *)(cp + off), sizeof(struct in_addr)); |
cp[IPOPT_OFFSET] += sizeof(struct in_addr); |
cp[IPOPT_OFFSET] += sizeof(struct in_addr); |
/* |
/* |
* Let ip_intr's mcast routing check handle mcast pkts |
* Let ip_intr's mcast routing check handle mcast pkts |
Line 1564 ip_dooptions(struct mbuf *m) |
|
Line 1564 ip_dooptions(struct mbuf *m) |
|
off--; /* 0 origin */ |
off--; /* 0 origin */ |
if ((off + sizeof(struct in_addr)) > optlen) |
if ((off + sizeof(struct in_addr)) > optlen) |
break; |
break; |
bcopy((caddr_t)(&ip->ip_dst), (caddr_t)&ipaddr.sin_addr, |
bcopy((void *)(&ip->ip_dst), (void *)&ipaddr.sin_addr, |
sizeof(ipaddr.sin_addr)); |
sizeof(ipaddr.sin_addr)); |
/* |
/* |
* locate outgoing interface; if we're the destination, |
* locate outgoing interface; if we're the destination, |
Line 1577 ip_dooptions(struct mbuf *m) |
|
Line 1577 ip_dooptions(struct mbuf *m) |
|
code = ICMP_UNREACH_HOST; |
code = ICMP_UNREACH_HOST; |
goto bad; |
goto bad; |
} |
} |
bcopy((caddr_t)&ia->ia_addr.sin_addr, |
bcopy((void *)&ia->ia_addr.sin_addr, |
(caddr_t)(cp + off), sizeof(struct in_addr)); |
(void *)(cp + off), sizeof(struct in_addr)); |
cp[IPOPT_OFFSET] += sizeof(struct in_addr); |
cp[IPOPT_OFFSET] += sizeof(struct in_addr); |
break; |
break; |
|
|
Line 1647 ip_dooptions(struct mbuf *m) |
|
Line 1647 ip_dooptions(struct mbuf *m) |
|
} |
} |
ntime = iptime(); |
ntime = iptime(); |
cp0 = (u_char *) &ntime; /* XXX grumble, GCC... */ |
cp0 = (u_char *) &ntime; /* XXX grumble, GCC... */ |
bcopy(cp0, (caddr_t)cp + ipt->ipt_ptr - 1, |
memmove((char *)cp + ipt->ipt_ptr - 1, cp0, |
sizeof(n_time)); |
sizeof(n_time)); |
ipt->ipt_ptr += sizeof(n_time); |
ipt->ipt_ptr += sizeof(n_time); |
} |
} |
Line 1710 save_rte(u_char *option, struct in_addr |
|
Line 1710 save_rte(u_char *option, struct in_addr |
|
#endif /* 0 */ |
#endif /* 0 */ |
if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst))) |
if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst))) |
return; |
return; |
bcopy((caddr_t)option, (caddr_t)ip_srcrt.srcopt, olen); |
bcopy((void *)option, (void *)ip_srcrt.srcopt, olen); |
ip_nhops = (olen - IPOPT_OFFSET - 1) / sizeof(struct in_addr); |
ip_nhops = (olen - IPOPT_OFFSET - 1) / sizeof(struct in_addr); |
ip_srcrt.dst = dst; |
ip_srcrt.dst = dst; |
} |
} |
Line 1758 ip_srcroute(void) |
|
Line 1758 ip_srcroute(void) |
|
*/ |
*/ |
ip_srcrt.nop = IPOPT_NOP; |
ip_srcrt.nop = IPOPT_NOP; |
ip_srcrt.srcopt[IPOPT_OFFSET] = IPOPT_MINOFF; |
ip_srcrt.srcopt[IPOPT_OFFSET] = IPOPT_MINOFF; |
bcopy((caddr_t)&ip_srcrt.nop, |
memmove(mtod(m, char *) + sizeof(struct in_addr), &ip_srcrt.nop, |
mtod(m, caddr_t) + sizeof(struct in_addr), OPTSIZ); |
OPTSIZ); |
q = (struct in_addr *)(mtod(m, caddr_t) + |
q = (struct in_addr *)(mtod(m, char *) + |
sizeof(struct in_addr) + OPTSIZ); |
sizeof(struct in_addr) + OPTSIZ); |
#undef OPTSIZ |
#undef OPTSIZ |
/* |
/* |
Line 1797 ip_stripoptions(struct mbuf *m, struct m |
|
Line 1797 ip_stripoptions(struct mbuf *m, struct m |
|
{ |
{ |
int i; |
int i; |
struct ip *ip = mtod(m, struct ip *); |
struct ip *ip = mtod(m, struct ip *); |
caddr_t opts; |
void *opts; |
int olen; |
int olen; |
|
|
olen = (ip->ip_hl << 2) - sizeof (struct ip); |
olen = (ip->ip_hl << 2) - sizeof (struct ip); |
opts = (caddr_t)(ip + 1); |
opts = (void *)(ip + 1); |
i = m->m_len - (sizeof (struct ip) + olen); |
i = m->m_len - (sizeof (struct ip) + olen); |
bcopy(opts + olen, opts, (unsigned)i); |
memmove(opts, (char *)opts + olen, (unsigned)i); |
m->m_len -= olen; |
m->m_len -= olen; |
if (m->m_flags & M_PKTHDR) |
if (m->m_flags & M_PKTHDR) |
m->m_pkthdr.len -= olen; |
m->m_pkthdr.len -= olen; |
Line 2061 ip_savecontrol(struct inpcb *inp, struct |
|
Line 2061 ip_savecontrol(struct inpcb *inp, struct |
|
struct timeval tv; |
struct timeval tv; |
|
|
microtime(&tv); |
microtime(&tv); |
*mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv), |
*mp = sbcreatecontrol((void *) &tv, sizeof(tv), |
SCM_TIMESTAMP, SOL_SOCKET); |
SCM_TIMESTAMP, SOL_SOCKET); |
if (*mp) |
if (*mp) |
mp = &(*mp)->m_next; |
mp = &(*mp)->m_next; |
} |
} |
if (inp->inp_flags & INP_RECVDSTADDR) { |
if (inp->inp_flags & INP_RECVDSTADDR) { |
*mp = sbcreatecontrol((caddr_t) &ip->ip_dst, |
*mp = sbcreatecontrol((void *) &ip->ip_dst, |
sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP); |
sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP); |
if (*mp) |
if (*mp) |
mp = &(*mp)->m_next; |
mp = &(*mp)->m_next; |
Line 2081 ip_savecontrol(struct inpcb *inp, struct |
|
Line 2081 ip_savecontrol(struct inpcb *inp, struct |
|
*/ |
*/ |
/* options were tossed already */ |
/* options were tossed already */ |
if (inp->inp_flags & INP_RECVOPTS) { |
if (inp->inp_flags & INP_RECVOPTS) { |
*mp = sbcreatecontrol((caddr_t) opts_deleted_above, |
*mp = sbcreatecontrol((void *) opts_deleted_above, |
sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP); |
sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP); |
if (*mp) |
if (*mp) |
mp = &(*mp)->m_next; |
mp = &(*mp)->m_next; |
} |
} |
/* ip_srcroute doesn't do what we want here, need to fix */ |
/* ip_srcroute doesn't do what we want here, need to fix */ |
if (inp->inp_flags & INP_RECVRETOPTS) { |
if (inp->inp_flags & INP_RECVRETOPTS) { |
*mp = sbcreatecontrol((caddr_t) ip_srcroute(), |
*mp = sbcreatecontrol((void *) ip_srcroute(), |
sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP); |
sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP); |
if (*mp) |
if (*mp) |
mp = &(*mp)->m_next; |
mp = &(*mp)->m_next; |
Line 2102 ip_savecontrol(struct inpcb *inp, struct |
|
Line 2102 ip_savecontrol(struct inpcb *inp, struct |
|
sdl.sdl_index = m->m_pkthdr.rcvif ? |
sdl.sdl_index = m->m_pkthdr.rcvif ? |
m->m_pkthdr.rcvif->if_index : 0; |
m->m_pkthdr.rcvif->if_index : 0; |
sdl.sdl_nlen = sdl.sdl_alen = sdl.sdl_slen = 0; |
sdl.sdl_nlen = sdl.sdl_alen = sdl.sdl_slen = 0; |
*mp = sbcreatecontrol((caddr_t) &sdl, sdl.sdl_len, |
*mp = sbcreatecontrol((void *) &sdl, sdl.sdl_len, |
IP_RECVIF, IPPROTO_IP); |
IP_RECVIF, IPPROTO_IP); |
if (*mp) |
if (*mp) |
mp = &(*mp)->m_next; |
mp = &(*mp)->m_next; |