Whole heap more cleanup and refactoring...

2 files changed, 208 insertions, 0 deletions

diff --git a/attic/Socket.hpp b/attic/Socket.hpp
new file mode 100644
index 00000000..79f393fb
--- /dev/null
+++ b/attic/Socket.hpp
@@ -0,0 +1,99 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_SOCKET_HPP
+#define ZT_SOCKET_HPP
+
+#include "Constants.hpp"
+#include "InetAddress.hpp"
+#include "AtomicCounter.hpp"
+#include "SharedPtr.hpp"
+#include "NonCopyable.hpp"
+
+/**
+ * Maximum discrete message length supported by all socket types
+ */
+#define ZT_SOCKET_MAX_MESSAGE_LEN 2048
+
+namespace ZeroTier {
+
+class Socket;
+
+/**
+ * Base class for transport-layer socket implementations
+ */
+class Socket : NonCopyable
+{
+	friend class SharedPtr<Socket>;
+
+public:
+	enum Type
+	{
+		ZT_SOCKET_TYPE_UDP_V4 = 1,
+		ZT_SOCKET_TYPE_UDP_V6 = 2,
+		ZT_SOCKET_TYPE_TCP_IN = 3,  // incoming connection accepted from listen socket
+		ZT_SOCKET_TYPE_TCP_OUT = 4, // outgoing connection to remote endpoint
+		ZT_SOCKET_TYPE_ETHERNET = 5 // unused, for future SDN backplane support
+	};
+
+	virtual ~Socket() {}
+
+	/**
+	 * @return Socket type
+	 */
+	inline Type type() const throw() { return _type; }
+
+	/**
+	 * @return True if this is a UDP socket
+	 */
+	inline bool udp() const throw() { return ((_type == ZT_SOCKET_TYPE_UDP_V4)||(_type == ZT_SOCKET_TYPE_UDP_V6)); }
+
+	/**
+	 * @return True if this is a TCP socket
+	 */
+	inline bool tcp() const throw() { return ((_type == ZT_SOCKET_TYPE_TCP_IN)||(_type == ZT_SOCKET_TYPE_TCP_OUT)); }
+
+	/**
+	 * Send a ZeroTier message packet
+	 *
+	 * @param to Destination address (ignored in connected TCP sockets)
+	 * @param msg Message data
+	 * @param msglen Message length (max 16384 bytes)
+	 * @return True if send appears successful on our end, false if e.g. address type unreachable from this socket
+	 */
+	virtual bool send(const InetAddress &to,const void *msg,unsigned int msglen) = 0;
+
+protected:
+	Socket(const Type &t) : _type(t) {}
+
+	Type _type;
+	AtomicCounter __refCount;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/attic/SocketManager.hpp b/attic/SocketManager.hpp
new file mode 100644
index 00000000..21a49ea4
--- /dev/null
+++ b/attic/SocketManager.hpp
@@ -0,0 +1,109 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_SOCKETMANAGER_HPP
+#define ZT_SOCKETMANAGER_HPP
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <map>
+#include <stdexcept>
+
+#include "Constants.hpp"
+#include "InetAddress.hpp"
+#include "Buffer.hpp"
+#include "NonCopyable.hpp"
+#include "Socket.hpp"
+
+namespace ZeroTier {
+
+/**
+ * Socket I/O implementation
+ */
+class SocketManager : NonCopyable
+{
+public:
+	SocketManager() {}
+	virtual ~SocketManager() {}
+
+	/**
+	 * Send a message to a remote peer
+	 *
+	 * @param to Destination address
+	 * @param tcp Use TCP?
+	 * @param autoConnectTcp If true, automatically initiate TCP connection if there is none
+	 * @param msg Message to send
+	 * @param msglen Length of message
+	 */
+	virtual bool send(
+		const InetAddress &to,
+		bool tcp,
+		bool autoConnectTcp,
+		const void *msg,
+		unsigned int msglen) = 0;
+
+	/**
+	 * Send a message to a remote peer via UDP (shortcut for setting both TCP params to false in send)
+	 *
+	 * @param to Destination address
+	 * @param msg Message to send
+	 * @param msglen Length of message
+	 */
+	inline bool sendUdp(
+		const InetAddress &to,
+		const void *msg,
+		unsigned int msglen) { return send(to,false,false,msg,msglen); }
+
+	/**
+	 * Perform I/O polling operation (e.g. select())
+	 *
+	 * If called concurrently, one will block until the other completes.
+	 *
+	 * @param timeout Timeout in milliseconds, may return sooner if whack() is called
+	 * @param handler Packet data handler
+	 * @param arg Void argument to packet data handler
+	 */
+	virtual void poll(
+		unsigned long timeout,
+		void (*handler)(const SharedPtr<Socket> &,void *,const InetAddress &,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> &),
+		void *arg) = 0;
+
+	/**
+	 * Cause current or next blocking poll() operation to timeout immediately
+	 */
+	virtual void whack() = 0;
+
+	/**
+	 * Close TCP sockets
+	 */
+	virtual void closeTcpSockets() = 0;
+};
+
+} // namespace ZeroTier
+
+#endif