summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOthmar Gsenger <otti@anytun.org>2007-11-03 15:04:28 +0000
committerOthmar Gsenger <otti@anytun.org>2007-11-03 15:04:28 +0000
commit2feb2f0299b59f8b246598b4ae21f4bc7c53783b (patch)
tree8c9595bf69a9b0b63538edd7e5c1e0dd974d1cf7
parentvortrag 2 (diff)
added connectionList
fixed README (libgcrypt-dev)
-rw-r--r--Makefile1
-rw-r--r--README1
-rw-r--r--anytun.cpp4
-rw-r--r--connectionList.cpp52
-rw-r--r--connectionList.h55
5 files changed, 111 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 33a9bf3..4dbad5e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ OBJS = anytun.o \
cypher.o \
authAlgo.o \
keyDerivation.o \
+ connectionList.o \
PracticalSocket.o \
signalController.o \
log.o \
diff --git a/README b/README
index bea9046..830500b 100644
--- a/README
+++ b/README
@@ -2,6 +2,7 @@ Building
========
* install libSRTP (as seen below)
+* install libgcrypt11-dev
* ./configure
* make
diff --git a/anytun.cpp b/anytun.cpp
index e7d5134..c92f328 100644
--- a/anytun.cpp
+++ b/anytun.cpp
@@ -90,7 +90,7 @@ void* sender(void* p)
param->c.setKey(tmp_key);
param->c.setSalt(tmp_salt);
- std::cout << "Send Package: seq: " << seq << std::endl << "sID: " << param->opt.getSenderId() << std::endl;
+ //std::cout << "Send Package: seq: " << seq << std::endl << "sID: " << param->opt.getSenderId() << std::endl;
//std::cout << "Package dump: " << pack.getBuf() << std::endl;
param->c.cypher(pack, seq, param->opt.getSenderId());
@@ -154,7 +154,7 @@ void* receiver(void* p)
param->c.setSalt(tmp_salt);
param->c.cypher(pack, seq, sid);
- std::cout << "Received Package: seq: " << seq << std::endl << "sID: " << sid << std::endl;
+ //std::cout << "Received Package: seq: " << seq << std::endl << "sID: " << sid << std::endl;
//std::cout << "Package dump: " << pack.getBuf() << std::endl;
// check payload_type and remove it
diff --git a/connectionList.cpp b/connectionList.cpp
new file mode 100644
index 0000000..0395284
--- /dev/null
+++ b/connectionList.cpp
@@ -0,0 +1,52 @@
+/*
+ * 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 "threadUtils.hpp"
+#include "datatypes.h"
+
+#include "connectionList.h"
+
+ConnectionList::ConnectionList()
+{
+}
+
+ConnectionList::~ConnectionList()
+{
+}
+
+void ConnectionList::addConnection()
+{
+ Lock lock(mutex_);
+}
+
+void ConnectionList::clear()
+{
+ Lock lock(mutex_);
+}
diff --git a/connectionList.h b/connectionList.h
new file mode 100644
index 0000000..926a9ba
--- /dev/null
+++ b/connectionList.h
@@ -0,0 +1,55 @@
+/*
+ * 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
+ */
+
+#ifndef _CONNECTION_LIST_H
+#define _CONNECTION_LIST_H
+
+#include <map>
+#include <deque>
+
+#include "threadUtils.hpp"
+#include "datatypes.h"
+
+class ConnectionList
+{
+public:
+ ConnectionList();
+ ~ConnectionList();
+ void addConnection();
+ void clear();
+
+private:
+ ConnectionList(const ConnectionList &s);
+ void operator=(const ConnectionList &s);
+
+ Mutex mutex_;
+};
+
+#endif