diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-04-02 14:38:10 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-04-02 14:38:10 +0000 |
| commit | 5da7c6fb59bf55e2a59128ff22661097db509f85 (patch) | |
| tree | 8837a3ecd00d37aa539da139463d88da5feb808b /sys/netinet | |
| parent | 81f21e50877629cac5393978f7ce3ae4b52d5957 (diff) | |
rmeove the link1 hack, it is in the way, it is only half-baked and doesn't
work as you think it does, and the same can easily be achieved using pf
ok claudio dlg sthen theo
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_input.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 838069e54a6..af86146ed39 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.186 2011/02/11 12:16:30 bluhm Exp $ */ +/* $OpenBSD: ip_input.c,v 1.187 2011/04/02 14:38:09 henning Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -688,10 +688,7 @@ in_iawithaddr(struct in_addr ina, struct mbuf *m, u_int rdomain) TAILQ_FOREACH(ia, &in_ifaddr, ia_list) { if (ia->ia_ifp->if_rdomain != rdomain) continue; - if ((ina.s_addr == ia->ia_addr.sin_addr.s_addr) || - ((ia->ia_ifp->if_flags & (IFF_LOOPBACK|IFF_LINK1)) == - (IFF_LOOPBACK|IFF_LINK1) && - ia->ia_net == (ina.s_addr & ia->ia_netmask))) + if (ina.s_addr == ia->ia_addr.sin_addr.s_addr) return ia; /* check ancient classful too, e. g. for rarp-based netboot */ if (((ip_directedbcast == 0) || (m && ip_directedbcast && |