diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:09:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:09:26 +0000 |
| commit | e13cc2d80520205675bd2af774ba409cbc0359e0 (patch) | |
| tree | bdac9fcd2a8fe294cfb9f3d941834ba6998c4802 /sbin/isakmpd/ipsec.c | |
| parent | d684b8832a75f3b2a437bd8a26e0867cedec1665 (diff) | |
kill USE_OLD_SOCKADDR
Diffstat (limited to 'sbin/isakmpd/ipsec.c')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index b1ca3a09050..2cad2c40edb 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.112 2005/04/06 16:00:20 deraadt Exp $ */ +/* $OpenBSD: ipsec.c,v 1.113 2005/04/08 16:09:25 deraadt Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -461,18 +461,14 @@ ipsec_set_network(u_int8_t *src_id, u_int8_t *dst_id, struct ipsec_sa *isa) if (!isa->src_net) goto memfail; isa->src_net->sa_family = AF_INET; -#ifndef USE_OLD_SOCKADDR isa->src_net->sa_len = sizeof(struct sockaddr_in); -#endif isa->src_mask = (struct sockaddr *)calloc(1, sizeof(struct sockaddr_in)); if (!isa->src_mask) goto memfail; isa->src_mask->sa_family = AF_INET; -#ifndef USE_OLD_SOCKADDR isa->src_mask->sa_len = sizeof(struct sockaddr_in); -#endif break; case IPSEC_ID_IPV6_ADDR: @@ -482,18 +478,14 @@ ipsec_set_network(u_int8_t *src_id, u_int8_t *dst_id, struct ipsec_sa *isa) if (!isa->src_net) goto memfail; isa->src_net->sa_family = AF_INET6; -#ifndef USE_OLD_SOCKADDR isa->src_net->sa_len = sizeof(struct sockaddr_in6); -#endif isa->src_mask = (struct sockaddr *)calloc(1, sizeof(struct sockaddr_in6)); if (!isa->src_mask) goto memfail; isa->src_mask->sa_family = AF_INET6; -#ifndef USE_OLD_SOCKADDR isa->src_mask->sa_len = sizeof(struct sockaddr_in6); -#endif break; case IPSEC_ID_IPV4_RANGE: @@ -540,18 +532,14 @@ ipsec_set_network(u_int8_t *src_id, u_int8_t *dst_id, struct ipsec_sa *isa) if (!isa->dst_net) goto memfail; isa->dst_net->sa_family = AF_INET; -#ifndef USE_OLD_SOCKADDR isa->dst_net->sa_len = sizeof(struct sockaddr_in); -#endif isa->dst_mask = (struct sockaddr *)calloc(1, sizeof(struct sockaddr_in)); if (!isa->dst_mask) goto memfail; isa->dst_mask->sa_family = AF_INET; -#ifndef USE_OLD_SOCKADDR isa->dst_mask->sa_len = sizeof(struct sockaddr_in); -#endif break; case IPSEC_ID_IPV6_ADDR: @@ -561,18 +549,14 @@ ipsec_set_network(u_int8_t *src_id, u_int8_t *dst_id, struct ipsec_sa *isa) if (!isa->dst_net) goto memfail; isa->dst_net->sa_family = AF_INET6; -#ifndef USE_OLD_SOCKADDR isa->dst_net->sa_len = sizeof(struct sockaddr_in6); -#endif isa->dst_mask = (struct sockaddr *)calloc(1, sizeof(struct sockaddr_in6)); if (!isa->dst_mask) goto memfail; isa->dst_mask->sa_family = AF_INET6; -#ifndef USE_OLD_SOCKADDR isa->dst_mask->sa_len = sizeof(struct sockaddr_in6); -#endif break; } |