From 613afe3c92c202da1900ef2f7000425f6baabb9e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 7 Apr 2009 00:16:12 +0000 Subject: removed anytun02-compat mode --- src/options.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/options.cpp') diff --git a/src/options.cpp b/src/options.cpp index 7d01d49..7505eb5 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -198,7 +198,6 @@ Options::Options() : key_(u_int32_t(0)), salt_(u_int32_t(0)) kd_prf_ = "null"; #endif role_ = ROLE_LEFT; - anytun02_compat_ = false; } Options::~Options() @@ -408,7 +407,6 @@ bool Options::parse(int argc, char* argv[]) #ifndef NO_CRYPT PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_) PARSE_SCALAR_PARAM("-e","--role", role) - PARSE_BOOL_PARAM("-O","--anytun02-compat", anytun02_compat_) #ifndef NO_PASSPHRASE PARSE_PHRASE_PARAM_SEC("-E","--passphrase", passphrase_) #endif @@ -465,9 +463,6 @@ void Options::parse_post() } #endif - if(anytun02_compat_) - cLog.msg(Log::PRIO_WARNING) << "--anytun02-compat is deprecated and very likly to be removed by the next release"; - if(dev_name_ == "" && dev_type_ == "") dev_type_ = "tun"; } @@ -634,7 +629,6 @@ void Options::printOptions() case ROLE_RIGHT: std::cout << "right" << std::endl; break; default: std::cout << "??" << std::endl; break; } - std::cout << "anytun02_compat = " << anytun02_compat_ << std::endl; std::cout << "passphrase = '" << passphrase_ << "'" << std::endl; std::cout << "key = " << key_.getHexDumpOneLine() << std::endl; std::cout << "salt = " << salt_.getHexDumpOneLine() << std::endl; @@ -1036,19 +1030,6 @@ Options& Options::setRole(role_t r) return *this; } -bool Options::getAnytun02Compat() -{ - ReadersLock lock(mutex); - return anytun02_compat_; -} - -Options& Options::setAnytun02Compat(bool a) -{ - WritersLock lock(mutex); - anytun02_compat_ = a; - return *this; -} - std::string Options::getPassphrase() { ReadersLock lock(mutex); -- cgit v1.2.3