summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOthmar Gsenger <otti@anytun.org>2008-12-22 21:46:39 +0000
committerOthmar Gsenger <otti@anytun.org>2008-12-22 21:46:39 +0000
commitcd02a8d6f95ef116eb2c824587767ae943066707 (patch)
tree87cdf9a10923314dc6f82afd4afa9bc933f495df /src
parentfixed anytun and anytun-controld commandline parser error (127.0.0.1:124 got ... (diff)
updateRouteTree has to stay unlocked (is only called within locked routines so far)
this might change at later time
Diffstat (limited to 'src')
-rw-r--r--src/routingTable.cpp2
-rw-r--r--src/routingTable.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/routingTable.cpp b/src/routingTable.cpp
index 3c79e8f..c767d62 100644
--- a/src/routingTable.cpp
+++ b/src/routingTable.cpp
@@ -60,7 +60,7 @@ RoutingTable::~RoutingTable()
void RoutingTable::updateRouteTree(const NetworkPrefix & pref)
{
- Lock lock(mutex_);
+ //Lock lock(mutex_); //deadlock
u_int8_t length=pref.getNetworkPrefixLength();
network_address_type_t type=pref.getNetworkAddressType();
diff --git a/src/routingTable.h b/src/routingTable.h
index 85de0fa..2f25c1a 100644
--- a/src/routingTable.h
+++ b/src/routingTable.h
@@ -50,7 +50,7 @@ public:
RoutingTable();
~RoutingTable();
void addRoute(const NetworkPrefix & ,u_int16_t);
- void updateRouteTree(const NetworkPrefix & pref);
+ void updateRouteTree(const NetworkPrefix & pref); //Warning Unlocked!!!
void delRoute(const NetworkPrefix & );
u_int16_t getRoute(const NetworkAddress &);
bool empty(network_address_type_t type);