diff options
| author |   hshoexer <hshoexer@openbsd.org> | 2006-06-01 06:46:35 +0000 |
|---|---|---|
| committer | hshoexer <hshoexer@openbsd.org> | 2006-06-01 06:46:35 +0000 |
| commit | b04291095f61ddc96e1751a4ab3053c13f88729a (patch) | |
| tree | 94787e4fdfaaa149c954567589ffae3594505fb1 | |
| parent | better command line usage as suggested by deraadt@ (diff) | |
| download | wireguard-openbsd-b04291095f61ddc96e1751a4ab3053c13f88729a.tar.xz wireguard-openbsd-b04291095f61ddc96e1751a4ab3053c13f88729a.zip | |
knf
| -rw-r--r-- | sbin/ipsecctl/ike.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/sbin/ipsecctl/ike.c b/sbin/ipsecctl/ike.c index fc66935ecbf..7af17d2a43f 100644 --- a/sbin/ipsecctl/ike.c +++ b/sbin/ipsecctl/ike.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike.c,v 1.31 2006/06/01 06:14:05 todd Exp $ */ +/* $OpenBSD: ike.c,v 1.32 2006/06/01 06:46:35 hshoexer Exp $ */ /* * Copyright (c) 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -382,18 +382,21 @@ ike_section_qmids(u_int8_t proto, struct ipsec_addr_wrap *src, switch (src->af) { case AF_INET: sa.sa_len = sizeof(struct sockaddr_in); - bcopy(&src->mask.ipa, &((struct sockaddr_in *)(&sa))->sin_addr, - sizeof(struct in6_addr)); + bcopy(&src->mask.ipa, + &((struct sockaddr_in *)(&sa))->sin_addr, + sizeof(struct in6_addr)); break; case AF_INET6: sa.sa_len = sizeof(struct sockaddr_in6); - bcopy(&src->mask.ipa, &((struct sockaddr_in6 *)(&sa))->sin6_addr, - sizeof(struct in6_addr)); + bcopy(&src->mask.ipa, + &((struct sockaddr_in6 *)(&sa))->sin6_addr, + sizeof(struct in6_addr)); break; } - if (getnameinfo(&sa, sa.sa_len, mask, sizeof(mask), NULL, 0, NI_NUMERICHOST)) { - err(1, "could not get a numeric mask"); - } + if (getnameinfo(&sa, sa.sa_len, mask, sizeof(mask), NULL, 0, + NI_NUMERICHOST)) + errx(1, "could not get a numeric mask"); + if ((network = strdup(src->name)) == NULL) err(1, "ike_section_qmids: strdup"); if ((p = strrchr(network, '/')) != NULL) @@ -419,18 +422,21 @@ ike_section_qmids(u_int8_t proto, struct ipsec_addr_wrap *src, switch (dst->af) { case AF_INET: sa.sa_len = sizeof(struct sockaddr_in); - bcopy(&dst->mask.ipa, &((struct sockaddr_in *)(&sa))->sin_addr, - sizeof(struct in6_addr)); + bcopy(&dst->mask.ipa, + &((struct sockaddr_in *)(&sa))->sin_addr, + sizeof(struct in6_addr)); break; case AF_INET6: sa.sa_len = sizeof(struct sockaddr_in6); - bcopy(&dst->mask.ipa, &((struct sockaddr_in6 *)(&sa))->sin6_addr, - sizeof(struct in6_addr)); + bcopy(&dst->mask.ipa, + &((struct sockaddr_in6 *)(&sa))->sin6_addr, + sizeof(struct in6_addr)); break; } - if (getnameinfo(&sa, sa.sa_len, mask, sizeof(mask), NULL, 0, NI_NUMERICHOST)) { - err(1, "could not get a numeric mask"); - } + if (getnameinfo(&sa, sa.sa_len, mask, sizeof(mask), NULL, 0, + NI_NUMERICHOST)) + errx(1, "could not get a numeric mask"); + if ((network = strdup(dst->name)) == NULL) err(1, "ike_section_qmids: strdup"); if ((p = strrchr(network, '/')) != NULL) |