[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openswan-cvs
Subject:    [Openswan CVS] openswan-2/programs/starter keywords.h,1.10,1.11
From:       <ken () xelerance ! com>
Date:       2004-11-29 18:41:48
Message-ID: 20041129184148.13B93138039 () tla ! xelerance ! com
[Download RAW message or body]

Update of /xelerance/master/openswan-2/programs/starter
In directory tla.xelerance.com:/tmp/cvs-serv26601

Modified Files:
	keywords.h 
Log Message:
Start adding support for DPD, XAUTH, Mode Config parameters


Index: keywords.h
===================================================================
RCS file: /xelerance/master/openswan-2/programs/starter/keywords.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- keywords.h	18 Apr 2004 03:09:27 -0000	1.10
+++ keywords.h	29 Nov 2004 18:41:45 -0000	1.11
@@ -27,15 +27,13 @@
     KSF_PREPLUTO   = 3,
     KSF_POSTPLUTO  = 4,
     /* KSF_PACKETDEFAULT = 5, */
-/*    KSF_VIRTUALPRIVATE= 6, */
+    KSF_VIRTUALPRIVATE= 6, 
     KSF_SYSLOG     = 7,
     KSF_DUMPDIR    = 8,
     KSF_MANUALSTART= 9,
     KSF_PLUTOLOAD  = 10,
     KSF_PLUTOSTART = 11,
-#ifdef VIRTUAL_IP
     KSF_VIRTUALPRIVATE = 12,
-#endif
     KSF_MYID       = 13,
     KSF_PLUTO      = 14,
     KSF_PLUTOOPTS  = 15,
@@ -70,13 +68,14 @@
     KBF_REKEYMARGIN= 21,
     KBF_REKEYFUZZ  = 22,
     KBF_COMPRESS   = 23,
-    KBF_KEYINGTRIES = 24,
-    KBF_ARRIVALCHECK =25,
-    KBF_FAILURESHUNT =26,
-    KBF_IKELIFETIME  =27,
-    KBF_KLIPSDEBUG   =28,
-    KBF_PLUTODEBUG   =29,
-    KBF_MAX = 30
+    KBF_KEYINGTRIES  = 24,
+    KBF_ARRIVALCHECK = 25,
+    KBF_FAILURESHUNT = 26,
+    KBF_IKELIFETIME  = 27,
+    KBF_KLIPSDEBUG   = 28,
+    KBF_PLUTODEBUG   = 29,
+    KBF_NHELPERS     = 30,
+    KBF_MAX          = 31
 };
 
 /*
@@ -86,32 +85,42 @@
  */
 
 enum keyword_string_conn_field {
-    KSCF_IP     = 0,
-    KSCF_SUBNET = 1,
-    KSCF_NEXTHOP= 2,
-    KSCF_UPDOWN = 3,
-    KSCF_ID     = 4,
-    KSCF_RSAKEY1= 5,
-    KSCF_RSAKEY2= 6,
-    KSCF_CERT   = 7,
-    KSCF_CA     = 8,
+    KSCF_IP           = 0,
+    KSCF_SUBNET       = 1,
+    KSCF_NEXTHOP      = 2,
+    KSCF_UPDOWN       = 3,
+    KSCF_ID           = 4,
+    KSCF_RSAKEY1      = 5,
+    KSCF_RSAKEY2      = 6,
+    KSCF_CERT         = 7,
+    KSCF_CA           = 8,
     KSCF_SUBNETWITHIN = 9,
-    KSCF_PROTOPORT = 10,
-    KSCF_ESP    = 11,
-    KSCF_ESPENCKEY = 12,
-    KSCF_ESPAUTHKEY= 13,
-    KSCF_MAX    = 20
+    KSCF_PROTOPORT    = 10,
+    KSCF_IKE          = 11,
+    KSCF_ESP          = 12,
+    KSCF_ESPENCKEY    = 13,
+    KSCF_ESPAUTHKEY   = 14,
+    KSCF_DPDACTION    = 15,
+    KSCF_MAX          = 20
 };
 
 
 enum keyword_numeric_conn_field {
-    KNCF_IP       = 0,
-    KNCF_FIREWALL = 1,
-    KNCF_IDTYPE   = 2,
-    KNCF_SPIBASE  = 3,
-    KNCF_SPI      = 4,
-    KNCF_ESPREPLAYWINDOW = 5,
-    KNCF_MAX      = 30,
+    KNCF_IP               = 0,
+    KNCF_FIREWALL         = 1,
+    KNCF_IDTYPE           = 2,
+    KNCF_SPIBASE          = 3,
+    KNCF_SPI              = 4,
+    KNCF_ESPREPLAYWINDOW  = 5,
+    KNCF_DPDDELAY         = 6,
+    KNCF_DPDTIMEOUT       = 7,
+    KNCF_AGGRMODE         = 8,
+    KNCF_XAUTHSERVER      = 9,
+    KNCF_XAUTHCLIENT      = 10,
+    KNCF_MODECONFIGSERVER = 11,
+    KNCF_MODECONFIGCLIENT = 12,
+    KNCF_MODECONFIGPULL   = 13,
+    KNCF_MAX              = 30,
 };
 
 #define KEY_STRINGS_MAX (KSF_MAX > KSCF_MAX ? KSF_MAX : KSCF_MAX)

_______________________________________________
Cvs mailing list
Cvs@openswan.org
http://lists.openswan.org/mailman/listinfo/cvs
[prev in list] [next in list] [prev in thread] [next in thread]