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

Pass icmp_error() the MTU argument directly instead of

Browse Source 
an interface pointer.  This simplifies a couple of uses
and removes some XXX workarounds.
This commit is contained in:
Andre Oppermann 2005-05-04 13:09:19 +00:00
parent e0408a6edc
commit c773494edd
5 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/contrib/pf/net/pf.c
View File

@ -1798,9 +1798,7 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af,
NTOHS(ip->ip_len);
NTOHS(ip->ip_off);
PF_UNLOCK();
#endif
icmp_error(m0, type, code, 0, (void *)NULL);
#ifdef __FreeBSD__
icmp_error(m0, type, code, 0, 0);
PF_LOCK();
#endif
break;
@ -5789,10 +5787,8 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
NTOHS(ip->ip_len);
NTOHS(ip->ip_off);
PF_UNLOCK();
#endif
icmp_error(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, 0,
ifp);
#ifdef __FreeBSD__
ifp->if_mtu);
PF_LOCK();
#endif
goto done;

12
sys/netinet/ip_fastfwd.c
View File

@ -137,7 +137,7 @@ ip_findroute(struct route *ro, struct in_addr dest, struct mbuf *m)
ipstat.ips_cantforward++;
if (rt)
RTFREE(rt);
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, NULL);
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, 0);
return NULL;
}
return dst;
@ -297,7 +297,7 @@ ip_fastforward(struct mbuf *m)
return 0;
else if (ip_doopts == 2) {
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_FILTER_PROHIB,
0, NULL);
0, 0);
return 1;
}
/* else ignore IP options and continue */
@ -407,7 +407,7 @@ ip_fastforward(struct mbuf *m)
if (!ipstealth) {
#endif
if (ip->ip_ttl <= IPTTLDEC) {
icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, NULL);
icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, 0);
return 1;
}
@ -512,7 +512,7 @@ ip_fastforward(struct mbuf *m)
*/
if ((ro.ro_rt->rt_flags & RTF_REJECT) &&
ro.ro_rt->rt_rmx.rmx_expire >= time_second) {
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, NULL);
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, 0);
goto consumed;
}
@ -532,7 +532,7 @@ ip_fastforward(struct mbuf *m)
* Check if media link state of interface is not down
*/
if (ifp->if_link_state == LINK_STATE_DOWN) {
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, NULL);
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, 0);
goto consumed;
}
@ -563,7 +563,7 @@ ip_fastforward(struct mbuf *m)
if (ip->ip_off & IP_DF) {
ipstat.ips_cantfrag++;
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG,
0, ifp);
0, mtu);
goto consumed;
} else {
/*

8
sys/netinet/ip_icmp.c
View File

@ -133,11 +133,11 @@ extern struct protosw inetsw[];
* in response to bad packet ip.
*/
void
icmp_error(n, type, code, dest, destifp)
icmp_error(n, type, code, dest, mtu)
struct mbuf *n;
int type, code;
n_long dest;
struct ifnet *destifp;
int mtu;
{
register struct ip *oip = mtod(n, struct ip *), *nip;
register unsigned oiplen = oip->ip_hl << 2;
@ -201,8 +201,8 @@ icmp_error(n, type, code, dest, destifp)
icp->icmp_pptr = code;
code = 0;
} else if (type == ICMP_UNREACH &&
code == ICMP_UNREACH_NEEDFRAG && destifp) {
icp->icmp_nextmtu = htons(destifp->if_mtu);
code == ICMP_UNREACH_NEEDFRAG && mtu) {
icp->icmp_nextmtu = htons(mtu);
}
}

2
sys/netinet/ip_icmp.h
View File

@ -202,7 +202,7 @@ struct icmp {
(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
#ifdef _KERNEL
void icmp_error(struct mbuf *, int, int, n_long, struct ifnet *);
void icmp_error(struct mbuf *, int, int, n_long, int);
void icmp_input(struct mbuf *, int);
int ip_next_mtu(int, int);
#endif

26
sys/netinet/ip_input.c
View File

@ -1714,10 +1714,9 @@ ip_forward(struct mbuf *m, int srcrt)
{
struct ip *ip = mtod(m, struct ip *);
struct in_ifaddr *ia = NULL;
int error, type = 0, code = 0;
struct mbuf *mcopy;
struct in_addr dest;
struct ifnet *destifp, dummyifp;
int error, type = 0, code = 0, mtu = 0;
#ifdef DIAGNOSTIC
if (ipprintfs)
@ -1853,7 +1852,6 @@ ip_forward(struct mbuf *m, int srcrt)
}
if (mcopy == NULL)
return;
destifp = NULL;
switch (error) {
@ -1906,24 +1904,17 @@ ip_forward(struct mbuf *m, int srcrt)
/*
* find the correct route for outer IPv4
* header, compute tunnel MTU.
*
* XXX BUG ALERT
* The "dummyifp" code relies upon the fact
* that icmp_error() touches only ifp->if_mtu.
*/
/*XXX*/
destifp = NULL;
if (sp->req != NULL
&& sp->req->sav != NULL
&& sp->req->sav->sah != NULL) {
ro = &sp->req->sav->sah->sa_route;
if (ro->ro_rt && ro->ro_rt->rt_ifp) {
dummyifp.if_mtu =
mtu =
ro->ro_rt->rt_rmx.rmx_mtu ?
ro->ro_rt->rt_rmx.rmx_mtu :
ro->ro_rt->rt_ifp->if_mtu;
dummyifp.if_mtu -= ipsechdr;
destifp = &dummyifp;
mtu -= ipsechdr;
}
}
@ -1941,11 +1932,10 @@ ip_forward(struct mbuf *m, int srcrt)
* to the minimum guaranteed routeable packet size and use
* the same hack as IPSEC to setup a dummyifp for icmp.
*/
if (ia == NULL) {
dummyifp.if_mtu = IP_MSS;
destifp = &dummyifp;
} else
destifp = ia->ia_ifp;
if (ia == NULL)
mtu = IP_MSS;
else
mtu = ia->ia_ifp->if_mtu;
#if defined(IPSEC) || defined(FAST_IPSEC)
}
#endif /*IPSEC || FAST_IPSEC*/
@ -1974,7 +1964,7 @@ ip_forward(struct mbuf *m, int srcrt)
m_freem(mcopy);
return;
}
icmp_error(mcopy, type, code, dest.s_addr, destifp);
icmp_error(mcopy, type, code, dest.s_addr, mtu);
}
void