summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rw-r--r--anyctr.cpp119
-rw-r--r--connectionList.cpp10
-rw-r--r--connectionList.h2
-rw-r--r--syncSocket.cpp7
5 files changed, 145 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 3f5b583..f631f98 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,7 @@ SOCKETDEPS = Sockets/libSockets.a
# Sockets/SSLInitializer.o
-OBJS = anytun.o \
- tunDevice.o \
+OBJS = tunDevice.o \
packetSource.o \
buffer.o \
syncBuffer.o \
@@ -81,12 +80,15 @@ OBJS = anytun.o \
$(OPENVPNDEPS) \
$(SOCKETDEPS)
-EXECUTABLE = anytun
+EXECUTABLE = anytun anyctr
all: $(EXECUTABLE) libAnysync.a
-anytun: $(OBJS)
- $(LD) $(OBJS) -o $@ $(LDFLAGS)
+anytun: $(OBJS) anytun.o
+ $(LD) $(OBJS) anytun.o -o $@ $(LDFLAGS)
+
+anyctr: $(OBJS) anyctr.o
+ $(LD) $(OBJS) anyctr.o -o $@ $(LDFLAGS)
tunDevice.o: tunDevice.cpp tunDevice.h
$(C++) $(CCFLAGS) $< -c
@@ -190,6 +192,9 @@ router.o: router.cpp router.h
anytun.o: anytun.cpp
$(C++) $(CCFLAGS) $< -c
+anyctr.o: anyctr.cpp
+ $(C++) $(CCFLAGS) $< -c
+
cConnectionParam.o: cConnectionParam.cpp
$(C++) $(CCFLAGS) $< -c
diff --git a/anyctr.cpp b/anyctr.cpp
new file mode 100644
index 0000000..51b79aa
--- /dev/null
+++ b/anyctr.cpp
@@ -0,0 +1,119 @@
+/*
+ * anytun
+ *
+ * The secure anycast tunneling protocol (satp) defines a protocol used
+ * for communication between any combination of unicast and anycast
+ * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel
+ * mode and allows tunneling of every ETHER TYPE protocol (e.g.
+ * ethernet, ip, arp ...). satp directly includes cryptography and
+ * message authentication based on the methodes used by SRTP. It is
+ * intended to deliver a generic, scaleable and secure solution for
+ * tunneling and relaying of packets of any protocol.
+ *
+ *
+ * Copyright (C) 2007 anytun.org <satp@wirdorange.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (see the file COPYING included with this
+ * distribution); if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <iostream>
+#include <poll.h>
+
+#include <gcrypt.h>
+#include <cerrno> // for ENOMEM
+
+#include "datatypes.h"
+
+#include "log.h"
+#include "buffer.h"
+#include "plainPacket.h"
+#include "encryptedPacket.h"
+#include "cipher.h"
+#include "keyDerivation.h"
+#include "authAlgo.h"
+#include "authTag.h"
+#include "cipherFactory.h"
+#include "authAlgoFactory.h"
+#include "keyDerivationFactory.h"
+#include "signalController.h"
+#include "packetSource.h"
+#include "tunDevice.h"
+#include "options.h"
+#include "seqWindow.h"
+#include "connectionList.h"
+#include "routingTable.h"
+#include "networkAddress.h"
+
+#include "syncQueue.h"
+#include "syncSocketHandler.h"
+#include "syncListenSocket.h"
+
+#include "syncSocket.h"
+#include "syncClientSocket.h"
+#include "syncCommand.h"
+
+#include "threadParam.h"
+
+#define MAX_PACKET_LENGTH 1600
+
+#define SESSION_KEYLEN_AUTH 20 // TODO: hardcoded size
+#define SESSION_KEYLEN_ENCR 16 // TODO: hardcoded size
+#define SESSION_KEYLEN_SALT 14 // TODO: hardcoded size
+
+void createConnection(const std::string & remote_host, u_int16_t remote_port, ConnectionList & cl, u_int16_t seqSize, SyncQueue & queue, mux_t mux)
+{
+ SeqWindow * seq= new SeqWindow(seqSize);
+ seq_nr_t seq_nr_=0;
+ KeyDerivation * kd = KeyDerivationFactory::create(gOpt.getKdPrf());
+ kd->init(gOpt.getKey(), gOpt.getSalt());
+ 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,mux);
+ NetworkAddress addr(ipv4,gOpt.getIfconfigParamRemoteNetmask().c_str());
+ NetworkPrefix prefix(addr);
+ gRoutingTable.addRoute(prefix,mux);
+ std::ostringstream sout;
+ boost::archive::text_oarchive oa(sout);
+ const SyncCommand scom(cl,mux);
+ const SyncCommand scom2 (prefix);
+ oa << scom;
+ oa << scom2;
+ std::cout << sout.str() << std::endl;
+}
+
+int main(int argc, char* argv[])
+{
+ int ret=0;
+ if(!gOpt.parse(argc, argv))
+ {
+ gOpt.printUsage();
+ exit(-1);
+ }
+
+ SignalController sig;
+ sig.init();
+
+ ConnectionList cl;
+ SyncQueue queue;
+
+ if(gOpt.getRemoteAddr() != "")
+ {
+ createConnection(gOpt.getRemoteAddr(),gOpt.getRemotePort(),cl,gOpt.getSeqWindowSize(), queue, gOpt.getMux());
+
+ }
+
+ return ret;
+}
+
diff --git a/connectionList.cpp b/connectionList.cpp
index f3bb129..3c86d71 100644
--- a/connectionList.cpp
+++ b/connectionList.cpp
@@ -67,6 +67,16 @@ const ConnectionMap::iterator ConnectionList::getEnd()
return connections_.end();
}
+ConnectionMap::iterator ConnectionList::getBeginUnlocked()
+{
+ return connections_.begin();
+}
+
+ConnectionMap::iterator ConnectionList::getEndUnlocked()
+{
+ return connections_.end();
+}
+
const ConnectionMap::iterator ConnectionList::getConnection(u_int16_t mux)
{
Lock lock(mutex_);
diff --git a/connectionList.h b/connectionList.h
index 98f7799..5d4d70a 100644
--- a/connectionList.h
+++ b/connectionList.h
@@ -48,6 +48,8 @@ public:
void addConnection(ConnectionParam &conn, u_int16_t mux);
const ConnectionMap::iterator getConnection(u_int16_t mux);
const ConnectionMap::iterator getEnd();
+ ConnectionMap::iterator getEndUnlocked();
+ ConnectionMap::iterator getBeginUnlocked();
ConnectionParam & getOrNewConnectionUnlocked(u_int16_t mux);
bool empty();
void clear();
diff --git a/syncSocket.cpp b/syncSocket.cpp
index d14ca23..d557bf4 100644
--- a/syncSocket.cpp
+++ b/syncSocket.cpp
@@ -27,15 +27,16 @@ void SyncSocket::OnAccept()
// Send( Utility::GetLocalAddress() + "\n");
// Send("Number of sockets in list : " + Utility::l2string(Handler().GetCount()) + "\n");
// Send("\n");
- if( ! cl_.empty())
+ //TODO Locking here
+ ConnectionMap::iterator cit = cl_.getBeginUnlocked();
+ for (;cit!=cl_.getEndUnlocked();++cit)
{
std::ostringstream sout;
boost::archive::text_oarchive oa(sout);
- const SyncCommand scom(cl_,0);
+ const SyncCommand scom(cl_,cit->first);
oa << scom;
Send(sout.str());
}
- sleep(1);
//TODO Locking here
RoutingMap::iterator it = gRoutingTable.getBeginUnlocked();
for (;it!=gRoutingTable.getEndUnlocked();++it)