From 2205b2fbf6f29d9d7fec8d245d51c0ccd75d2a7f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 25 Feb 2008 00:05:37 +0000 Subject: options is global now kd_prf_ is set to null if cipher_ is null as well --- threadParam.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'threadParam.h') diff --git a/threadParam.h b/threadParam.h index 11b7c72..584396e 100644 --- a/threadParam.h +++ b/threadParam.h @@ -33,7 +33,6 @@ #include "threadUtils.hpp" #include "datatypes.h" -#include "options.h" #include "tunDevice.h" #include "connectionList.h" #include "syncQueue.h" @@ -41,10 +40,9 @@ class ThreadParam { public: - ThreadParam(Options& opt_,TunDevice& dev_,PacketSource& src_,ConnectionList& cl_,SyncQueue & queue_,OptionConnectTo & connto_) - : opt(opt_),dev(dev_),src(src_),cl(cl_),queue(queue_),connto(connto_) + ThreadParam(TunDevice& dev_,PacketSource& src_,ConnectionList& cl_,SyncQueue & queue_,OptionConnectTo & connto_) + : dev(dev_),src(src_),cl(cl_),queue(queue_),connto(connto_) {}; - Options& opt; TunDevice& dev; PacketSource& src; ConnectionList& cl; -- cgit v1.2.3