diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2004-06-21 18:41:07 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2004-06-21 18:41:07 +0000 |
| commit | 5a9a84d2750e9a284200f0c7520efdc378b8eefa (patch) | |
| tree | 8a64cd74617cbda36a4dc00fd5f7a46769b1615b /sbin/isakmpd | |
| parent | 0239e4cfebc1ebf30d110ddb12e4c01e9548e77c (diff) | |
udpencap_port should be taken from dst transport
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index e94dca327bd..2eac89a2d2e 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_key_v2.c,v 1.143 2004/06/21 15:15:38 ho Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.144 2004/06/21 18:41:06 ho Exp $ */ /* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */ /* @@ -859,7 +859,6 @@ pf_key_v2_set_spi(struct sa *sa, struct proto *proto, int incoming, #endif #if defined (USE_NAT_TRAVERSAL) && defined (SADB_X_EXT_UDPENCAP) struct sadb_x_udpencap udpencap; - const char *errstr; #endif #ifdef USE_DEBUG char *addr_str; @@ -1135,18 +1134,10 @@ pf_key_v2_set_spi(struct sa *sa, struct proto *proto, int incoming, udpencap.sadb_x_udpencap_exttype = SADB_X_EXT_UDPENCAP; udpencap.sadb_x_udpencap_len = sizeof udpencap / PF_KEY_V2_CHUNK; - udpencap.sadb_x_udpencap_port = - strtonum(udp_encap_default_port ? udp_encap_default_port : - UDP_ENCAP_DEFAULT_PORT_STR, 0, USHRT_MAX, &errstr); - if (errstr) - log_print("pf_key_v2_set_spi: bad port for UDPENCAP"); - else { - udpencap.sadb_x_udpencap_port = - htons(udpencap.sadb_x_udpencap_port); - if (pf_key_v2_msg_add(update, - (struct sadb_ext *)&udpencap, 0) == -1) - goto cleanup; - } + udpencap.sadb_x_udpencap_port = sockaddr_port(dst); + if (pf_key_v2_msg_add(update, (struct sadb_ext *)&udpencap, 0) + == -1) + goto cleanup; } #endif |