diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 06:57:57 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 06:57:57 +0000 |
| commit | f3139162868e91c03f57cb3c67d9ec7a39c7fe0e (patch) | |
| tree | 91642cd77eba581ff75a8d511080503ab6ee18c0 | |
| parent | 93748dd382cc30607aa48bf2730d2028b099e41e (diff) | |
Merge with EOM 1.46
author: niklas
style
author: angelos
No reserved1 field anymore.
author: angelos
Begining of ACQUIRE support.
author: angelos
No need to delete SPIs, they'll just expire.
author: angelos
Only play with flows if we're using the "old" IPsec code (the new
kernel code to be committed).
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 55af917a934..7057fe5ecc2 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pf_key_v2.c,v 1.29 2000/09/19 19:01:31 angelos Exp $ */ -/* $EOM: pf_key_v2.c,v 1.41 2000/06/20 03:35:01 itojun Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.30 2000/10/07 06:57:56 niklas Exp $ */ +/* $EOM: pf_key_v2.c,v 1.46 2000/10/07 06:46:55 niklas Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -1879,17 +1879,20 @@ pf_key_v2_acquire (struct pf_key_v2_msg *pmsg) srcaddr = (struct sockaddr *)(src + 1); switch (dstaddr->sa_family) - { - case AF_INET: - LOG_DBG ((LOG_SYSDEP, 20, "pf_key_v2_acquire: dst=%s sproto %d", - inet_ntop(AF_INET, &((struct sockaddr_in *)dstaddr)->sin_addr, adbuf, 16), msg->sadb_msg_satype)); - break; - - case AF_INET6: - LOG_DBG ((LOG_SYSDEP, 20, "pf_key_v2_acquire: dst=%s sproto %d", - inet_ntop(AF_INET6, &((struct sockaddr_in6 *)dstaddr)->sin6_addr, adbuf, 16), msg->sadb_msg_satype)); - break; - } + { + case AF_INET: + LOG_DBG ((LOG_SYSDEP, 20, "pf_key_v2_acquire: dst=%s sproto %d", + inet_ntop(AF_INET, &((struct sockaddr_in *)dstaddr)->sin_addr, + adbuf, 16), msg->sadb_msg_satype)); + break; + + case AF_INET6: + LOG_DBG ((LOG_SYSDEP, 20, "pf_key_v2_acquire: dst=%s sproto %d", + inet_ntop(AF_INET6 + , &((struct sockaddr_in6 *)dstaddr)->sin6_addr, + adbuf, 16), msg->sadb_msg_satype)); + break; + } /* XXX Only support one proposal for now */ /* XXX Finish it */ |