[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.12,1.13
From:       <ken () xelerance ! com>
Date:       2004-11-29 21:05:16
Message-ID: 20041129210516.C3B46138039 () tla ! xelerance ! com
[Download RAW message or body]

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

Modified Files:
	keywords.h 
Log Message:
Add support for dpd, aggr mode, xauth and mode config


Index: keywords.h
===================================================================
RCS file: /xelerance/master/openswan-2/programs/starter/keywords.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- keywords.h	29 Nov 2004 20:35:32 -0000	1.12
+++ keywords.h	29 Nov 2004 21:05:14 -0000	1.13
@@ -257,6 +257,17 @@
 struct keyword_enum_values kw_authby_list=
     { kw_authby_values, sizeof(kw_authby_values)/sizeof(struct keyword_enum_value)};
 
+/*
+ * Values for dpdaction={hold,clear}
+ */
+struct keyword_enum_value kw_dpdaction_values[]={
+    { "hold",    DPD_ACTION_HOLD},
+    { "clear",   DPD_ACTION_CLEAR},
+};
+
+struct keyword_enum_values kw_dpdaction_list=
+    { kw_dpdaction_values, sizeof(kw_dpdaction_values)/sizeof(struct keyword_enum_value)};
+
 
 /*
  * Values for auto={add,start,route,ignore}
@@ -327,6 +338,7 @@
     { "oppo",     DBG_OPPO },
     { "controlmore", DBG_CONTROLMORE },
     { "private",  DBG_PRIVATE },
+    { "x509",  DBG_X509 },
 
     { "impair-delay-adns-key-answer", IMPAIR_DELAY_ADNS_KEY_ANSWER },
     { "impair-delay-adns-txt-answer", IMPAIR_DELAY_ADNS_TXT_ANSWER },
@@ -386,6 +398,9 @@
     {"nocrsend",       kv_config, kt_bool,      KBF_NOCRSEND,NOT_ENUM},
     {"strictcrlpolicy",kv_config, kt_enum,      KBF_STRICTCRLPOLICY,NOT_ENUM},
     {"crlcheckinterval",kv_config,kt_time,      KBF_CRLCHECKINTERVAL,NOT_ENUM},
+#ifdef NAT_TRAVERSAL
+    {"virtual_private",kv_config,kt_string,     KSF_VIRTUALPRIVATE,NOT_ENUM},
+#endif
 
     /* this is "left=" and "right=" */
     {"",               kv_conn|kv_leftright, kt_loose_enum, KSCF_IP, &kw_host_list},  
@@ -420,6 +435,22 @@
     {"ikelifetime",    kv_conn|kv_auto, kt_time,   KBF_IKELIFETIME,NOT_ENUM},
     {"disablearrivalcheck", kv_conn|kv_auto, kt_invertbool, KBF_ARRIVALCHECK,NOT_ENUM},
     {"failureshunt",   kv_conn|kv_auto, kt_enum,   KBF_FAILURESHUNT, &kw_failureshunt_list},
+
+
+    /* DPD */ 
+    {"dpddelay", kv_conn|kv_auto,kt_number, KNCF_DPDDELAY, NOT_ENUM},
+    {"dpdtimeout", kv_conn|kv_auto,kt_number,KNCF_DPDTIMEOUT , NOT_ENUM},
+    {"dpdaction", kv_conn|kv_auto,kt_enum, KSCF_DPDACTION , &kw_dpdaction_list},
+
+
+    /* aggr/xauth/modeconfig */ 
+    {"aggrmode", kv_conn|kv_auto,kt_invertbool,KNCF_AGGRMODE , NOT_ENUM},
+    {"xauthserver", kv_conn|kv_auto,kt_invertbool,KNCF_XAUTHSERVER , NOT_ENUM},
+    {"xauthclient", kv_conn|kv_auto,kt_invertbool, KNCF_XAUTHCLIENT, NOT_ENUM},
+    {"modeconfigserver", kv_conn|kv_auto,kt_invertbool, KNCF_MODECONFIGSERVER, NOT_ENUM},
+    {"modeconfigclient", kv_conn|kv_auto,kt_invertbool, KNCF_MODECONFIGCLIENT, NOT_ENUM},
+    {"moeconfigpull", kv_conn|kv_auto,kt_invertbool,KNCF_MODECONFIGPULL , NOT_ENUM},
+
 
     /* things for manual keying only */
     {"spi",            kv_conn|kv_leftright|kv_manual, kt_number, KNCF_SPI,NOT_ENUM},

_______________________________________________
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]