diff options
| author | andre <andre@FreeBSD.org> | 2004-05-03 16:07:13 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2004-05-03 16:07:13 +0000 |
| commit | d18bda0b0d57709736e16b126ea61b5c23d1b83d (patch) | |
| tree | f327e04b14185cf1b0cd73d17e2c0cab3203a6dd /sys/netinet/ip_fastfwd.c | |
| parent | 704879452c44e2be41ff9b51d90f694ac7005219 (diff) | |
| download | FreeBSD-src-d18bda0b0d57709736e16b126ea61b5c23d1b83d.zip FreeBSD-src-d18bda0b0d57709736e16b126ea61b5c23d1b83d.tar.gz | |
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.
Diffstat (limited to 'sys/netinet/ip_fastfwd.c')
| -rw-r--r-- | sys/netinet/ip_fastfwd.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index a73c499..002943a 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -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, |
