Back out a change that slipped into the previous commit for which other

supporting parts have not yet been committed.

Remove pre-mature IP options ignoring option.
This commit is contained in:
Andre Oppermann 2004-05-03 16:07:13 +00:00
parent 987a42cca3
commit 7652802b06
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=128877

View File

@ -292,16 +292,8 @@ ip_fastforward(struct mbuf *m)
/*
* Only IP packets without options
*/
if (ip->ip_hl != (sizeof(struct ip) >> 2)) {
if (ip_doopts == 1)
return 0;
else if (ip_doopts == 2) {
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_FILTER_PROHIB,
0, NULL);
return 1;
}
/* else ignore IP options and continue */
}
if (ip->ip_hl != (sizeof(struct ip) >> 2))
return 0;
/*
* Only unicast IP, not from loopback, no L2 or IP broadcast,