From 1d37204a37b9ce58fa1ef67d4a209573e559c391 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 12 Sep 2014 16:57:37 -0700
Subject: Refactoring in progress... pardon our dust...

---
 node/IpcConnection.cpp | 224 -------------------------------------------------
 1 file changed, 224 deletions(-)
 delete mode 100644 node/IpcConnection.cpp

(limited to 'node/IpcConnection.cpp')

diff --git a/node/IpcConnection.cpp b/node/IpcConnection.cpp
deleted file mode 100644
index 5924f545..00000000
--- a/node/IpcConnection.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2011-2014  ZeroTier Networks LLC
- *
- * 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/
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-
-#include <stdexcept>
-
-#include "IpcConnection.hpp"
-
-#ifndef __WINDOWS__
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#endif
-
-namespace ZeroTier {
-
-IpcConnection::IpcConnection(const char *endpoint,void (*commandHandler)(void *,IpcConnection *,IpcConnection::EventType,const char *),void *arg) :
-	_handler(commandHandler),
-	_arg(arg),
-#ifdef __WINDOWS__
-	_sock(INVALID_HANDLE_VALUE),
-	_incoming(false),
-#else
-	_sock(-1),
-#endif
-	_run(true),
-	_running(true)
-{
-#ifdef __WINDOWS__
-	_sock = CreateFileA(endpoint,GENERIC_READ|GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,NULL,OPEN_EXISTING,0,NULL);
-	if (_sock == INVALID_HANDLE_VALUE)
-		throw std::runtime_error("IPC endpoint unreachable");
-	DWORD pipeMode = PIPE_READMODE_BYTE;
-	SetNamedPipeHandleState(_sock,&pipeMode,NULL,NULL);
-#else
-	struct sockaddr_un unaddr;
-	unaddr.sun_family = AF_UNIX;
-	strncpy(unaddr.sun_path,endpoint,sizeof(unaddr.sun_path));
-	unaddr.sun_path[sizeof(unaddr.sun_path) - 1] = (char)0;
-
-	_sock = socket(AF_UNIX,SOCK_STREAM,0);
-	if (_sock <= 0)
-		throw std::runtime_error("unable to create socket of type AF_UNIX");
-
-	if (connect(_sock,(struct sockaddr *)&unaddr,sizeof(unaddr))) {
-		::close(_sock);
-		throw std::runtime_error("IPC endpoint unreachable");
-	}
-#endif
-
-	_thread = Thread::start(this);
-}
-
-#ifdef __WINDOWS__
-IpcConnection::IpcConnection(HANDLE s,void (*commandHandler)(void *,IpcConnection *,IpcConnection::EventType,const char *),void *arg) :
-#else
-IpcConnection::IpcConnection(int s,void (*commandHandler)(void *,IpcConnection *,IpcConnection::EventType,const char *),void *arg) :
-#endif
-	_handler(commandHandler),
-	_arg(arg),
-	_sock(s),
-#ifdef __WINDOWS__
-	_incoming(true),
-#endif
-	_run(true),
-	_running(true)
-{
-	_thread = Thread::start(this);
-}
-
-IpcConnection::~IpcConnection()
-{
-	_writeLock.lock();
-	_run = false;
-	_writeLock.unlock();
-
-#ifdef __WINDOWS__
-	while (_running) {
-		Thread::cancelIO(_thread);
-		Sleep(100);
-	}
-#else
-	int s = _sock;
-	_sock = 0;
-	if (s > 0) {
-		::shutdown(s,SHUT_RDWR);
-		::close(s);
-	}
-#endif
-}
-
-void IpcConnection::printf(const char *format,...)
-{
-	va_list ap;
-	int n;
-	char tmp[65536];
-
-	va_start(ap,format);
-	n = (int)::vsnprintf(tmp,sizeof(tmp),format,ap);
-	va_end(ap);
-	if (n <= 0)
-		return;
-
-	Mutex::Lock _l(_writeLock);
-
-#ifdef __WINDOWS__
-	_writeBuf.append(tmp,n);
-	Thread::cancelIO(_thread);
-#else
-	if (_sock > 0)
-		::write(_sock,tmp,n);
-#endif
-}
-
-void IpcConnection::threadMain()
-	throw()
-{
-	char tmp[65536];
-	char linebuf[65536];
-	unsigned int lineptr = 0;
-	char c;
-
-#ifdef __WINDOWS__
-	DWORD n,i;
-	std::string wbuf;
-#else
-	int s,n,i;
-#endif
-
-	while (_run) {
-#ifdef __WINDOWS__
-		{
-			Mutex::Lock _l(_writeLock);
-			if (!_run)
-				break;
-			if (_writeBuf.length() > 0) {
-				wbuf.append(_writeBuf);
-				_writeBuf.clear();
-			}
-		}
-		if (wbuf.length() > 0) {
-			n = 0;
-			if ((WriteFile(_sock,wbuf.data(),(DWORD)(wbuf.length()),&n,NULL))&&(n > 0)) {
-				if (n < (DWORD)wbuf.length())
-					wbuf.erase(0,n);
-				else wbuf.clear();
-			} else if (GetLastError() != ERROR_OPERATION_ABORTED)
-				break;
-			FlushFileBuffers(_sock);
-		}
-		if (!_run)
-			break;
-		n = 0;
-		if ((!ReadFile(_sock,tmp,sizeof(tmp),&n,NULL))||(n <= 0)) {
-			if (GetLastError() == ERROR_OPERATION_ABORTED)
-				n = 0;
-			else break;
-		}
-		if (!_run)
-			break;
-#else
-		if ((s = _sock) <= 0)
-			break;
-		n = (int)::read(s,tmp,sizeof(tmp));
-		if ((n <= 0)||(_sock <= 0))
-			break;
-#endif
-		for(i=0;i<n;++i) {
-			c = (linebuf[lineptr] = tmp[i]);
-			if ((c == '\r')||(c == '\n')||(lineptr == (sizeof(linebuf) - 1))) {
-				if (lineptr) {
-					linebuf[lineptr] = (char)0;
-					_handler(_arg,this,IPC_EVENT_COMMAND,linebuf);
-					lineptr = 0;
-				}
-			} else ++lineptr;
-		}
-	}
-
-	_writeLock.lock();
-	bool r = _run;
-	_writeLock.unlock();
-
-#ifdef __WINDOWS__
-	if (_incoming)
-		DisconnectNamedPipe(_sock);
-	CloseHandle(_sock);
-	_running = false;
-#endif
-
-	if (r)
-		_handler(_arg,this,IPC_EVENT_CONNECTION_CLOSED,(const char *)0);
-}
-
-} // namespace ZeroTier
-- 
cgit v1.2.3