summaryrefslogtreecommitdiff
path: root/anytun.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-02-04 21:07:50 +0000
committerChristian Pointner <equinox@anytun.org>2008-02-04 21:07:50 +0000
commit1fd035fb9c2d659deea96d2ac5675869c7105566 (patch)
treea35e604644846f7fa0ea3878c062ab0cfa30a30d /anytun.cpp
parentfixed bug @ sync (diff)
fixed Deadlock @ connecetionlist
Diffstat (limited to 'anytun.cpp')
-rw-r--r--anytun.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/anytun.cpp b/anytun.cpp
index 0e7b01b..2056f02 100644
--- a/anytun.cpp
+++ b/anytun.cpp
@@ -87,11 +87,10 @@ void createConnection(const std::string & remote_host , u_int16_t remote_port, C
KeyDerivation * kd = new KeyDerivation;
kd->init(Buffer(key, sizeof(key)), Buffer(salt, sizeof(salt)));
cLog.msg(Log::PRIO_NOTICE) << "added connection remote host " << remote_host << ":" << remote_port;
-
ConnectionParam connparam ( (*kd), (*seq), seq_nr_, remote_host, remote_port);
+ cl.addConnection(connparam,0);
+ SyncCommand sc (cl,0);
- cl.addConnection(connparam,0);
- SyncCommand sc (cl,0);
queue.push(sc);
}
@@ -361,9 +360,12 @@ int main(int argc, char* argv[])
ConnectToList connect_to = opt.getConnectTo();
SyncQueue queue;
+ cLog.msg(Log::PRIO_DEBUG) << "pre create conn";
+
if(opt.getRemoteAddr() != "")
createConnection(opt.getRemoteAddr(),opt.getRemotePort(),cl,opt.getSeqWindowSize(), queue);
+ cLog.msg(Log::PRIO_DEBUG) << "post create conn";
ThreadParam p(opt, dev, *src, cl, queue,*(new OptionConnectTo()));