summaryrefslogtreecommitdiff
path: root/threadParam.h
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-02-25 00:05:37 +0000
committerChristian Pointner <equinox@anytun.org>2008-02-25 00:05:37 +0000
commit2205b2fbf6f29d9d7fec8d245d51c0ccd75d2a7f (patch)
treee32ab0b36d848f4454a9e22871ba0b446fc6cc7f /threadParam.h
parentsorry forgot to add keyDerivatioFactory (diff)
options is global now
kd_prf_ is set to null if cipher_ is null as well
Diffstat (limited to 'threadParam.h')
-rw-r--r--threadParam.h6
1 files changed, 2 insertions, 4 deletions
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;