summaryrefslogtreecommitdiff
path: root/src/options.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-03-22 18:49:35 +0000
committerChristian Pointner <equinox@anytun.org>2009-03-22 18:49:35 +0000
commit6be7bf8698f0f374281343ad709d4977297be449 (patch)
tree91b5a652c3fb0ff71cb61b8b939bcb1cfaff05fe /src/options.cpp
parentadded error callback to resolver for better handling (diff)
added gResolver to anytun-config
Diffstat (limited to 'src/options.cpp')
-rw-r--r--src/options.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/options.cpp b/src/options.cpp
index 94e3c44..7d01d49 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -179,6 +179,7 @@ Options::Options() : key_(u_int32_t(0)), salt_(u_int32_t(0))
mux_ = 0;
seq_window_size_ = 0;
+#if !defined(ANYCONF_OPTIONS)
#ifndef NO_CRYPT
cipher_ = "aes-ctr";
auth_algo_ = "sha1";
@@ -190,6 +191,12 @@ Options::Options() : key_(u_int32_t(0)), salt_(u_int32_t(0))
auth_tag_length_ = 0;
kd_prf_ = "null";
#endif
+#else
+ cipher_ = "null";
+ auth_algo_ = "null";
+ auth_tag_length_ = 0;
+ kd_prf_ = "null";
+#endif
role_ = ROLE_LEFT;
anytun02_compat_ = false;
}