summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile17
-rw-r--r--anytun.cpp43
-rw-r--r--options.cpp179
-rw-r--r--options.h64
4 files changed, 274 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 80b83c7..2b093d5 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,19 @@ OPENVPNDEPS = openvpn/tun.o \
openvpn/shaper.o \
openvpn/fragment.o
+OBJS = anytun.o \
+ tunDevice.o \
+ packetSource.o \
+ buffer.o \
+ packet.o \
+ cypher.o \
+ authAlgo.o \
+ PracticalSocket.o \
+ signalController.o \
+ log.o \
+ options.o \
+ $(OPENVPNDEPS)
-
-OBJS = anytun.o tunDevice.o packetSource.o buffer.o packet.o cypher.o authAlgo.o PracticalSocket.o signalController.o log.o $(OPENVPNDEPS)
EXECUTABLE = anytun
all: $(EXECUTABLE)
@@ -66,6 +76,9 @@ PracticalSocket.o: PracticalSocket.cpp PracticalSocket.h
log.o: log.cpp log.h
$(C++) $(CCFLAGS) $< -c
+options.o: options.cpp options.h
+ $(C++) $(CCFLAGS) $< -c
+
anytun.o: anytun.cpp
$(C++) $(CCFLAGS) $< -c
diff --git a/anytun.cpp b/anytun.cpp
index c32c134..bebb71b 100644
--- a/anytun.cpp
+++ b/anytun.cpp
@@ -41,20 +41,14 @@
#include "signalController.h"
#include "packetSource.h"
#include "tunDevice.h"
-
-sender_id_t my_sender_id_ = 23;
-u_int16_t local_port_ = 4444;
-string remote_addr_ = "127.0.0.1";
-u_int16_t remote_port_ = 4444;
-string dev_type_ = "tap";
-string ifconfig_param_1_ = "192.168.200.1";
-string ifconfig_param_2_ = "255.255.255.0";
+#include "options.h"
#define PAYLOAD_TYPE_TAP 0x6558
#define PAYLOAD_TYPE_TUN 0x0800
struct Param
{
+ Options* opt;
TunDevice* dev;
Cypher* c;
AuthAlgo* a;
@@ -86,14 +80,14 @@ void* sender(void* p)
param->c->cypher(pack);
// add header to packet
- pack.addHeader(my_sender_id_, seq);
+ pack.addHeader(param->opt->getSenderId(), seq);
// calc auth_tag and add it to the packet
auth_tag_t at = param->a->calc(pack);
pack.addAuthTag(at);
// send it out to remote host
- param->src->send(pack, remote_addr_, remote_port_);
+ param->src->send(pack, param->opt->getRemoteAddr(), param->opt->getRemotePort());
}
pthread_exit(NULL);
}
@@ -139,32 +133,27 @@ void* receiver(void* p)
int main(int argc, char* argv[])
{
std::cout << "anytun - secure anycast tunneling protocol" << std::endl;
+ Options opt;
+ if(!opt.parse(argc, argv))
+ {
+ opt.printUsage();
+ exit(-1);
+ }
cLog.msg(Log::PRIO_NOTICE) << "anytun started...";
- if(argc > 1)
- my_sender_id_ = atoi(argv[1]);
- if(argc > 2)
- local_port_ = atoi(argv[2]);
- if(argc > 3)
- remote_addr_ = argv[3];
- if(argc > 4)
- remote_port_ = atoi(argv[4]);
- if(argc > 5)
- dev_type_ = argv[5];
- if(argc > 6)
- ifconfig_param_1_ = argv[6];
- if(argc > 7)
- ifconfig_param_2_ = argv[7];
-
SignalController sig;
sig.init();
struct Param p;
- p.dev = new TunDevice(dev_type_.c_str(), ifconfig_param_1_.c_str(), ifconfig_param_2_.c_str());
+ p.opt = &opt;
+ p.dev = new TunDevice(opt.getDevName().c_str(), opt.getIfconfigParamLocal().c_str(), opt.getIfconfigParamRemoteNetmask().c_str());
p.c = new NullCypher();
p.a = new NullAuthAlgo();
- p.src = new UDPPacketSource(local_port_);
+ if(opt.getLocalAddr() == "")
+ p.src = new UDPPacketSource(opt.getLocalPort());
+ else
+ p.src = new UDPPacketSource(opt.getLocalAddr(), opt.getLocalPort());
std::cout << "dev created (opened)" << std::endl;
std::cout << "dev opened - actual name is '" << p.dev->getActualName() << "'" << std::endl;
diff --git a/options.cpp b/options.cpp
new file mode 100644
index 0000000..31bdb1b
--- /dev/null
+++ b/options.cpp
@@ -0,0 +1,179 @@
+/*
+ * 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 <string>
+#include <sstream>
+
+#include "datatypes.h"
+#include "options.h"
+
+
+#define PARSE_BOOL_PARAM(SHORT, LONG, VALUE) \
+ else if(str == SHORT || str == LONG) \
+ VALUE = true;
+
+#define PARSE_INVERSE_BOOL_PARAM(SHORT, LONG, VALUE) \
+ else if(str == SHORT || str == LONG) \
+ VALUE = false;
+
+#define PARSE_SCALAR_PARAM(SHORT, LONG, VALUE) \
+ else if(str == SHORT || str == LONG) \
+ { \
+ if(argc < 1 || argv[i+1][0] == '-') \
+ return false; \
+ std::stringstream tmp; \
+ tmp << argv[i+1]; \
+ tmp >> VALUE; \
+ argc--; \
+ i++; \
+ }
+
+#define PARSE_SCALAR_PARAM2(SHORT, LONG, VALUE1, VALUE2) \
+ else if(str == SHORT || str == LONG) \
+ { \
+ if(argc < 2 || \
+ argv[i+1][0] == '-' || argv[i+2][0] == '-') \
+ return false; \
+ std::stringstream tmp; \
+ tmp << argv[i+1] << " " << argv[i+2]; \
+ tmp >> VALUE1; \
+ tmp >> VALUE2; \
+ argc-=2; \
+ i+=2; \
+ }
+
+
+Options::Options()
+{
+ progname_ = "anytun";
+ sender_id_ = 0;
+ local_addr_ = "";
+ local_port_ = 4444;
+ remote_addr_ = "";
+ remote_port_ = 4444;
+ dev_name_ = "tap";
+ ifconfig_param_local_ = "192.168.200.1";
+ ifconfig_param_remote_netmask_ = "255.255.255.0";
+}
+
+bool Options::parse(int argc, char* argv[])
+{
+ progname_ = argv[0];
+ argc--;
+
+ for(int i=1; argc > 0; ++i)
+ {
+ std::string str(argv[i]);
+ argc--;
+
+ if(str == "-h" || str == "--help")
+ return false;
+ PARSE_SCALAR_PARAM("-s","--sender-id", sender_id_)
+ PARSE_SCALAR_PARAM("-i","--interface", local_addr_)
+ PARSE_SCALAR_PARAM("-p","--port", local_port_)
+ PARSE_SCALAR_PARAM("-r","--remote-host", remote_addr_)
+ PARSE_SCALAR_PARAM("-o","--remote-port", remote_port_)
+ PARSE_SCALAR_PARAM("-d","--dev", dev_name_)
+ PARSE_SCALAR_PARAM2("-c","--ifconfig", ifconfig_param_local_, ifconfig_param_remote_netmask_)
+ else
+ return false;
+ }
+ return true;
+}
+
+void Options::printUsage() const
+{
+ std::cout << "USAGE:" << std::endl;
+ std::cout << "anytun [-h|--help] prints this..." << std::endl;
+// std::cout << " [-f|--config] <file> the config file" << std::endl;
+ std::cout << " [-s|--sender-id ] <sender id> the sender id to use" << std::endl;
+ std::cout << " [-i|--interface] <interface> local interface to bind to" << std::endl;
+ std::cout << " [-p|--port] <port> local port to bind to" << std::endl;
+ std::cout << " [-r|--remote-host] <hostname/ip> remote host" << std::endl;
+ std::cout << " [-o|--remote-port] <port> remote port" << std::endl;
+ std::cout << " [-d|--dev] <name> device name/type" << std::endl;
+ std::cout << " [-c|--ifconfig] <local> the local address for the tun/tap device" << std::endl
+ << " <remote/netmask> the remote address(tun) or netmask(tap)" << std::endl;
+}
+
+void Options::printOptions() const
+{
+ std::cout << "Options:" << std::endl;
+ std::cout << "sender_id='" << sender_id_ << "'" << std::endl;
+ std::cout << "local_addr='" << local_addr_ << "'" << std::endl;
+ std::cout << "local_port='" << local_port_ << "'" << std::endl;
+ std::cout << "remote_addr='" << remote_addr_ << "'" << std::endl;
+ std::cout << "remote_port='" << remote_port_ << "'" << std::endl;
+ std::cout << "dev_name='" << dev_name_ << "'" << std::endl;
+ std::cout << "ifconfig_param_local='" << ifconfig_param_local_ << "'" << std::endl;
+ std::cout << "ifconfig_param_remote_netmask='" << ifconfig_param_remote_netmask_ << "'" << std::endl;
+}
+
+sender_id_t Options::getSenderId() const
+{
+ return sender_id_;
+}
+
+std::string Options::getLocalAddr() const
+{
+ return local_addr_;
+}
+
+u_int16_t Options::getLocalPort() const
+{
+ return local_port_;
+}
+
+std::string Options::getRemoteAddr() const
+{
+ return remote_addr_;
+}
+
+u_int16_t Options::getRemotePort() const
+{
+ return remote_port_;
+}
+
+std::string Options::getDevName() const
+{
+ return dev_name_;
+}
+
+std::string Options::getIfconfigParamLocal() const
+{
+ return ifconfig_param_local_;
+}
+
+std::string Options::getIfconfigParamRemoteNetmask() const
+{
+ return ifconfig_param_remote_netmask_;
+}
+
diff --git a/options.h b/options.h
new file mode 100644
index 0000000..9088b28
--- /dev/null
+++ b/options.h
@@ -0,0 +1,64 @@
+/*
+ * 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 _OPTIONS_H_
+#define _OPTIONS_H_
+
+class Options
+{
+public:
+ Options();
+ bool parse(int argc, char* argv[]);
+ void printUsage() const;
+ void printOptions() const;
+
+ std::string getProgname() const;
+ sender_id_t getSenderId() const;
+ std::string getLocalAddr() const;
+ u_int16_t getLocalPort() const;
+ std::string getRemoteAddr() const;
+ u_int16_t getRemotePort() const;
+ std::string getDevName() const;
+ std::string getIfconfigParamLocal() const;
+ std::string getIfconfigParamRemoteNetmask() const;
+
+private:
+ std::string progname_;
+ sender_id_t sender_id_;
+ std::string local_addr_;
+ u_int16_t local_port_;
+ std::string remote_addr_;
+ u_int16_t remote_port_;
+ std::string dev_name_;
+ std::string ifconfig_param_local_;
+ std::string ifconfig_param_remote_netmask_;
+};
+
+#endif