diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-04-25 15:49:36 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-04-25 15:49:36 +0000 |
| commit | 1115909d3e0d95e041a57dbbaa7b380b5364a4ec (patch) | |
| tree | 8ac1e67e6ea8fd74dce4a836c296437979588b0d /sys/netinet/ip_ipip.c | |
| parent | 462a5b31673474830f69aabd0be0329cb05b4c0a (diff) | |
Remove virtual tunnel support from the mrouting code. The virtual tunnel
code breaks multicast on gif(4) interfaces and it is far better to configure
a real gif(4) tunnel instead of a multicast tunnel as the latter is almost
not manageable. OK norby@, mblamer@
Diffstat (limited to 'sys/netinet/ip_ipip.c')
| -rw-r--r-- | sys/netinet/ip_ipip.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c index f14d2e2d82d..416501730a4 100644 --- a/sys/netinet/ip_ipip.c +++ b/sys/netinet/ip_ipip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipip.c,v 1.36 2006/03/25 22:41:48 djm Exp $ */ +/* $OpenBSD: ip_ipip.c,v 1.37 2006/04/25 15:49:35 claudio Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -185,15 +185,6 @@ ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp) ipo = mtod(m, struct ip *); -#ifdef MROUTING - if (ipo->ip_v == IPVERSION && ipo->ip_p == IPPROTO_IPV4) { - if (IN_MULTICAST(((struct ip *)((char *) ipo + iphlen))->ip_dst.s_addr)) { - ipip_mroute_input (m, iphlen); - return; - } - } -#endif /* MROUTING */ - /* Keep outer ecn field. */ switch (v >> 4) { #ifdef INET |