diff options
| author |   provos <provos@openbsd.org> | 2001-04-10 21:52:38 +0000 |
|---|---|---|
| committer | provos <provos@openbsd.org> | 2001-04-10 21:52:38 +0000 |
| commit | a1ac166c8fbf9f97b915e5cecf41ab709a7f0d9a (patch) | |
| tree | 4b570530edc0f44f9ae304894d65b57003de3fba | |
| parent | Disable optimization on sparc; ok deraadt@ (diff) | |
| download | wireguard-openbsd-a1ac166c8fbf9f97b915e5cecf41ab709a7f0d9a.tar.xz wireguard-openbsd-a1ac166c8fbf9f97b915e5cecf41ab709a7f0d9a.zip | |
allow host-to-host negotiations if no gateway has been specified.
from angelos@
| -rw-r--r-- | sys/netinet/ip_spd.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c index c1491449b59..b65b3ec32ae 100644 --- a/sys/netinet/ip_spd.c +++ b/sys/netinet/ip_spd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_spd.c,v 1.15 2001/04/06 04:42:08 csapuntz Exp $ */ +/* $OpenBSD: ip_spd.c,v 1.16 2001/04/10 21:52:38 provos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -1035,7 +1035,8 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw, ipa->ipa_mask.sen_direction = ipo->ipo_mask.sen_direction; if (ipo->ipo_mask.sen_ip_src.s_addr == INADDR_ANY || - ipo->ipo_addr.sen_ip_src.s_addr == INADDR_ANY) + ipo->ipo_addr.sen_ip_src.s_addr == INADDR_ANY || + ipo->ipo_dst.sa.sa_family == 0) { ipa->ipa_info.sen_ip_src = ddst->sen_ip_src; ipa->ipa_mask.sen_ip_src.s_addr = INADDR_BROADCAST; @@ -1047,7 +1048,8 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw, } if (ipo->ipo_mask.sen_ip_dst.s_addr == INADDR_ANY || - ipo->ipo_addr.sen_ip_dst.s_addr == INADDR_ANY) + ipo->ipo_addr.sen_ip_dst.s_addr == INADDR_ANY || + ipo->ipo_dst.sa.sa_family == 0) { ipa->ipa_info.sen_ip_dst = ddst->sen_ip_dst; ipa->ipa_mask.sen_ip_dst.s_addr = INADDR_BROADCAST; @@ -1079,7 +1081,8 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw, ipa->ipa_mask.sen_ip6_direction = ipo->ipo_mask.sen_ip6_direction; if (IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_mask.sen_ip6_src) || - IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_addr.sen_ip6_src)) + IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_addr.sen_ip6_src) || + ipo->ipo_dst.sa.sa_family == 0) { ipa->ipa_info.sen_ip6_src = ddst->sen_ip6_src; for (i = 0; i < 16; i++) @@ -1092,7 +1095,8 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw, } if (IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_mask.sen_ip6_dst) || - IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_addr.sen_ip6_dst)) + IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_addr.sen_ip6_dst) || + ipo->ipo_dst.sa.sa_family == 0) { ipa->ipa_info.sen_ip6_dst = ddst->sen_ip6_dst; for (i = 0; i < 16; i++) |