ipsec-258.1.3.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / isakmp.h

diff --git a/ipsec-tools/racoon/isakmp.h b/ipsec-tools/racoon/isakmp.h
index 628276c04a7ca6661bc54bc4241e3aec4372310e..b66bf0662844e63f19aefc12a6fce61b921c99a6 100644 (file)
--- a/ipsec-tools/racoon/isakmp.h
+++ b/ipsec-tools/racoon/isakmp.h
@@ -32,6 +32,11 @@
 #ifndef _ISAKMP_H
 #define _ISAKMP_H
 
+#include <sys/types.h>
+#include "racoon_types.h"
+#include "vmbuf.h"
+#include "isakmp_var.h"
+
 /* refer to RFC 2408 */
 
 /* must include <netinet/in.h> first. */
@@ -120,9 +125,11 @@ struct isakmp {
  */
 #define ISAKMP_NPTYPE_GSS      129     /* GSS token */
 
-#define ISAKMP_MAJOR_VERSION   1
+#define ISAKMP_MAJOR_VERSION_IKEV1     1
+#define ISAKMP_MAJOR_VERSION_IKEV2     2
 #define ISAKMP_MINOR_VERSION   0
-#define ISAKMP_VERSION_NUMBER  0x10
+#define ISAKMP_VERSION_NUMBER_IKEV1    0x10
+#define ISAKMP_VERSION_NUMBER_IKEV2    0x20
 #define ISAKMP_GETMAJORV(v)    (((v) & 0xf0) >> 4)
 #define ISAKMP_SETMAJORV(v, m) ((v) = ((v) & 0x0f) | (((m) << 4) & 0xf0))
 #define ISAKMP_GETMINORV(v)    ((v) & 0x0f)
@@ -390,12 +397,16 @@ struct isakmp_pl_natoa {
        /* IP address */
 } __attribute__((__packed__));
 
-struct payload_list {
+typedef struct payload_list {
        struct payload_list     *next, *prev;
        vchar_t                 *payload;
        int                     payload_type;
-};
+} payload_list_t;
 
+typedef struct payload_list_head {
+  int             num_payloads;
+  payload_list_t *payloads;
+} payload_list_head_t;
 
 /* See draft-ietf-ipsec-isakmp-mode-cfg-04.txt, 3.2 */
 struct isakmp_pl_attr {
@@ -458,4 +469,7 @@ struct isakmp_pl_resp_lifetime {
     /* data follows next */
 } __attribute__((__packed__));
 
+extern u_char i_ck0[];
+extern u_char r_ck0[];
+
 #endif /* _ISAKMP_H */