summaryrefslogtreecommitdiff
path: root/sbin/iked/iked.h
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2013-12-09 15:22:33 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2013-12-09 15:22:33 +0000
commit8203afc791d0af335bf7ed43ef6e8115f41d1092 (patch)
tree51176c0e5130a0716fbf5a0529f78bd20828ec5e /sbin/iked/iked.h
parent042be85945deca3406c5f839b5ed84a6188289b1 (diff)
distingush between sa_msgid not set and 0; otherwise we start
dropping messages if we usually are the initiator and the peer initiates rekeying first. ok mikeb@
Diffstat (limited to 'sbin/iked/iked.h')
-rw-r--r--sbin/iked/iked.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h
index 51ce4c7d79b..b261a2b725c 100644
--- a/sbin/iked/iked.h
+++ b/sbin/iked/iked.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iked.h,v 1.61 2013/12/03 13:55:39 markus Exp $ */
+/* $OpenBSD: iked.h,v 1.62 2013/12/09 15:22:32 markus Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -338,8 +338,9 @@ struct iked_sahdr {
struct iked_sa {
struct iked_sahdr sa_hdr;
- u_int32_t sa_msgid; /* Last resp rcvd */
- u_int32_t sa_reqid; /* Next req sent */
+ u_int32_t sa_msgid; /* Last request rcvd */
+ int sa_msgid_set; /* msgid initialized */
+ u_int32_t sa_reqid; /* Next request sent */
int sa_type;
#define IKED_SATYPE_LOOKUP 0 /* Used for lookup */