Merge branch 'adamierymenko-dev'

.gitignore

@@ -1,5 +1,8 @@
-zerotier-*
-/Makefile
+/ext/llvm-g++-Xcode4.6.2
+/ext/llvm-g++-Xcode4.6.2.tar.bz2
+/zerotier-*
+/build-ZeroTierUI-*
+/ZeroTierUI/*.user
 *.o
 .DS_Store
 .Apple*
@@ -20,6 +23,7 @@ mac-tap/tuntap/tap.kext
 /vsprojects/TapDriver/x64
 /vsprojects/InstallerUpdater/obj
 /vsprojects/Service/obj
+/vsprojects/SelfTest/SelfTest.aps
 /Build/*
 *.log
 *.opensdf
@@ -27,4 +31,6 @@ mac-tap/tuntap/tap.kext
 *.cache
 *.obj
 *.tlog
-/vsprojects/SelfTest/SelfTest.aps
+/installer-build
+/zt1-*-install
+/file2lz4c

BUILDING.txt

@@ -18,6 +18,18 @@ make -f Makefile.linux
 
 Edit Makefile.linux if you want to change between debug or release build.
 
+If you are building ext/tap-mac you will need a different version of the
+OSX gcc compiler chain than what currently ships (clang). We've got a copy
+available here:
+
+http://download.zerotier.com/dev/llvm-g++-Xcode4.6.2.tar.bz2
+
+Un-tar this into ext/ (it's excluded in .gitignore) and then 'make' in
+ext/tap-mac/tuntap/src/tap.
+
+Most users should not need to build tap-mac, since a binary is included
+in ext/bin.
+
 -- Windows
 
 Here be dragons.

Makefile

@@ -0,0 +1,11 @@
+# Common makefile -- loads make rules for each platform
+
+OSTYPE=$(shell uname -s)
+
+ifeq ($(OSTYPE),Darwin)
+	include make-mac.mk
+endif
+
+ifeq ($(OSTYPE),Linux)
+	include make-linux.mk
+endif

ZeroTierUI/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string>zt1icon.icns</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>ZeroTier One (Mac GUI)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>ZeroTier One</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.ZeroTierOne</string>
+</dict>
+</plist>

ZeroTierUI/ZeroTierUI.pro

@@ -0,0 +1,31 @@
+QT       += core gui widgets
+TARGET = "ZeroTier One"
+TEMPLATE = app
+
+win32:RC_FILE = ZeroTierUI.rc
+mac:ICON = zt1icon.icns
+mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+mac:QMAKE_INFO_PLIST = Info.plist
+
+# ZeroTier One must be built before building this, since it links in the
+# client code and some stuff from Utils to talk to the running service.
+LIBS += ../node/*.o
+
+SOURCES += main.cpp\
+				mainwindow.cpp \
+		network.cpp \
+		aboutwindow.cpp
+
+HEADERS  += mainwindow.h \
+		network.h \
+		aboutwindow.h \
+		../node/Node.hpp \
+		../node/Utils.hpp \
+		../node/Defaults.hpp
+
+FORMS    += mainwindow.ui \
+		network.ui \
+		aboutwindow.ui
+
+RESOURCES += \
+		resources.qrc

ZeroTierUI/ZeroTierUI.rc

@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "zt1icon.ico"

ZeroTierUI/aboutwindow.cpp

@@ -0,0 +1,31 @@
+#include "aboutwindow.h"
+#include "ui_aboutwindow.h"
+
+#include <QMessageBox>
+#include "../node/Defaults.hpp"
+
+AboutWindow::AboutWindow(QWidget *parent) :
+	QDialog(parent),
+	ui(new Ui::AboutWindow)
+{
+	ui->setupUi(this);
+#ifndef __APPLE__
+	ui->uninstallButton->hide();
+#endif
+}
+
+AboutWindow::~AboutWindow()
+{
+	delete ui;
+}
+
+void AboutWindow::on_uninstallButton_clicked()
+{
+	// Apple only... other OSes have more intrinsic mechanisms for uninstalling.
+	QMessageBox::information(
+				this,
+				"Uninstalling ZeroTier One",
+				QString("Uninstalling ZeroTier One is easy!\n\nJust remove ZeroTier One from your Applications folder and the service will automatically shut down within a few seconds. Then, on your next reboot, all other support files will be automatically deleted.\n\nIf you wish to uninstall the service and support files now, you can run the 'uninstall.sh' script found in ") + ZeroTier::ZT_DEFAULTS.defaultHomePath.c_str() + " using the 'sudo' command in a terminal.",
+				QMessageBox::Ok,
+				QMessageBox::NoButton);
+}

ZeroTierUI/aboutwindow.h

@@ -0,0 +1,25 @@
+#ifndef AboutWindow_H
+#define AboutWindow_H
+
+#include <QDialog>
+
+namespace Ui {
+class AboutWindow;
+}
+
+class AboutWindow : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit AboutWindow(QWidget *parent = 0);
+	virtual ~AboutWindow();
+
+private slots:
+	void on_uninstallButton_clicked();
+
+private:
+	Ui::AboutWindow *ui;
+};
+
+#endif // AboutWindow_H

ZeroTierUI/aboutwindow.ui

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AboutWindow</class>
+ <widget class="QDialog" name="AboutWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>508</width>
+    <height>261</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>About ZeroTier One</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/img/zt1icon.png</normaloff>:/img/zt1icon.png</iconset>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="widget" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="iconLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>128</width>
+             <height>128</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>128</width>
+             <height>128</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="resources.qrc">:/img/zt1icon.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::NoTextInteraction</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="frame_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QLabel" name="aboutTextLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <weight>50</weight>
+             <bold>false</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>ZeroTier One GUI
+(c)2012-2013 ZeroTier Networks LLC
+
+Author(s): Adam Ierymenko
+Version: 1.0</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter|Qt::AlignTop</set>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::NoTextInteraction</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="widget_2" native="true">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="uninstallButton">
+              <property name="text">
+               <string>Uninstall</string>
+              </property>
+              <property name="autoDefault">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AboutWindow</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AboutWindow</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>applet</string>
+	<key>CFBundleIconFile</key>
+	<string>applet</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.one.ZeroTierOneMacAuthenticateScript</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ZeroTier One (Authenticate)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>aplt</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6</string>
+	</dict>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2013 ZeroTier Networks LLC</string>
+	<key>WindowState</key>
+	<dict>
+		<key>dividerCollapsed</key>
+		<false/>
+		<key>eventLogLevel</key>
+		<integer>-1</integer>
+		<key>name</key>
+		<string>ScriptWindowState</string>
+		<key>positionOfDivider</key>
+		<real>333</real>
+		<key>savedFrame</key>
+		<string>7 181 602 597 0 0 1280 778 </string>
+		<key>selectedTabView</key>
+		<string>result</string>
+	</dict>
+</dict>
+</plist>

ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPLaplt

ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/description.rtfd/TXT.rtf

@@ -0,0 +1,4 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265
+{\fonttbl}
+{\colortbl;\red255\green255\blue255;}
+}

ZeroTierUI/main.cpp

@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+	QApplication a(argc, argv);
+	MainWindow w;
+	w.show();
+
+	return a.exec();
+}

ZeroTierUI/mainwindow.cpp

@@ -0,0 +1,272 @@
+#include "mainwindow.h"
+#include "aboutwindow.h"
+#include "network.h"
+#include "ui_mainwindow.h"
+
+#include <string>
+#include <map>
+#include <set>
+#include <vector>
+#include <stdexcept>
+#include <utility>
+
+#include <QClipboard>
+#include <QMutex>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QMessageBox>
+#include <QDebug>
+#include <QProcess>
+#include <QStringList>
+#include <QVBoxLayout>
+
+// Globally visible
+ZeroTier::Node::LocalClient *zeroTierClient = (ZeroTier::Node::LocalClient *)0;
+
+// Main window instance for app
+static MainWindow *mainWindow = (MainWindow *)0;
+
+static void handleZTMessage(void *arg,unsigned long id,const char *line)
+{
+	static std::map< unsigned long,std::vector<std::string> > ztReplies;
+	static QMutex ztReplies_m;
+
+	ztReplies_m.lock();
+	if (*line) {
+		ztReplies[id].push_back(std::string(line));
+		ztReplies_m.unlock();
+	} else { // empty lines conclude transmissions
+		std::map< unsigned long,std::vector<std::string> >::iterator r(ztReplies.find(id));
+		if (r != ztReplies.end()) {
+			MainWindow::ZTMessageEvent *event = new MainWindow::ZTMessageEvent(r->second);
+			ztReplies.erase(r);
+			ztReplies_m.unlock();
+			QCoreApplication::postEvent(mainWindow,event); // must post since this may be another thread
+		} else ztReplies_m.unlock();
+	}
+}
+
+MainWindow::MainWindow(QWidget *parent) :
+	QMainWindow(parent),
+	ui(new Ui::MainWindow)
+{
+	ui->setupUi(this);
+	this->startTimer(1000); // poll service every second
+	this->setEnabled(false); // gets enabled when updates are received
+	mainWindow = this;
+	this->cyclesSinceResponseFromService = 0;
+}
+
+MainWindow::~MainWindow()
+{
+	delete ui;
+	delete zeroTierClient;
+	zeroTierClient = (ZeroTier::Node::LocalClient *)0;
+	mainWindow = (MainWindow *)0;
+}
+
+void MainWindow::timerEvent(QTimerEvent *event)
+{
+	QMainWindow::timerEvent(event);
+
+	if (!zeroTierClient) {
+		std::string dotAuthFile((QDir::homePath() + QDir::separator() + ".zeroTierOneAuthToken").toStdString());
+		std::string authToken;
+		if (!ZeroTier::Utils::readFile(dotAuthFile.c_str(),authToken)) {
+#ifdef __APPLE__
+			// Run the little AppleScript hack that asks for admin credentials and
+			// then installs the auth token file in the current user's home.
+			QString authHelperPath(QCoreApplication::applicationDirPath() + "/../Resources/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet");
+			if (!QFile::exists(authHelperPath)) {
+				// Allow this to also work from the source tree if it's run from there.
+				// This is for debugging purposes and shouldn't harm the live release
+				// in any way.
+				authHelperPath = QCoreApplication::applicationDirPath() + "/../../../../ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet";
+				if (!QFile::exists(authHelperPath)) {
+					QMessageBox::critical(this,"Unable to Locate Helper","Unable to locate authorization helper, cannot obtain authentication token.",QMessageBox::Ok,QMessageBox::NoButton);
+					QApplication::exit(1);
+					return;
+				}
+			}
+			QProcess::execute(authHelperPath,QStringList());
+#endif
+
+			if (!ZeroTier::Utils::readFile(dotAuthFile.c_str(),authToken)) {
+				QMessageBox::critical(this,"Cannot Authorize","Unable to authorize this user to administrate ZeroTier One.\n\nTo do so manually, copy 'authtoken.secret' from the ZeroTier One home directory to '.zeroTierOneAuthToken' in your home directory and set file modes on this file to only be readable by you (e.g. 0600 on Mac or Linux systems).",QMessageBox::Ok,QMessageBox::NoButton);
+				QApplication::exit(1);
+				return;
+			}
+		}
+
+		zeroTierClient = new ZeroTier::Node::LocalClient(authToken.c_str(),0,&handleZTMessage,this);
+	}
+
+	// TODO: do something more user-friendly here... or maybe try to restart
+	// the service?
+	if (++this->cyclesSinceResponseFromService == 3)
+		QMessageBox::critical(this,"No Response from Service","The ZeroTier One service does not appear to be running.",QMessageBox::Ok,QMessageBox::NoButton);
+
+	zeroTierClient->send("info");
+	zeroTierClient->send("listnetworks");
+	zeroTierClient->send("listpeers");
+}
+
+void MainWindow::customEvent(QEvent *event)
+{
+	ZTMessageEvent *m = (ZTMessageEvent *)event; // only one custom event type so far
+
+	if (m->ztMessage.size() == 0)
+		return;
+
+	std::vector<std::string> hdr(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[0]));
+	if (hdr.size() < 2)
+		return;
+	if (hdr[0] != "200")
+		return;
+
+	this->cyclesSinceResponseFromService = 0;
+
+	if (hdr[1] == "info") {
+		if (hdr.size() >= 3)
+			this->myAddress = hdr[2].c_str();
+		if (hdr.size() >= 4)
+			this->myStatus = hdr[3].c_str();
+		if (hdr.size() >= 5)
+			this->myVersion = hdr[4].c_str();
+	} else if (hdr[1] == "listnetworks") {
+		std::map< std::string,std::vector<std::string> > byNwid;
+		for(unsigned long i=1;i<m->ztMessage.size();++i) {
+			std::vector<std::string> l(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[i]));
+			// 200 listnetworks <nwid> <name> <status> <config age> <type> <dev> <ips>
+			if ((l.size() == 9)&&(l[2].length() == 16))
+				byNwid[l[2]] = l;
+		}
+
+		std::map< std::string,std::pair<int,Network *> > existingByNwid;
+		for(int r=0;r<ui->networkListWidget->count();++r) {
+			Network *nw = (Network *)ui->networkListWidget->itemWidget(ui->networkListWidget->item(r));
+			existingByNwid[nw->networkId()] = std::make_pair(r,nw);
+		}
+
+		for(std::map< std::string,std::pair<int,Network *> >::iterator i(existingByNwid.begin());i!=existingByNwid.end();++i) {
+			if (byNwid.count(i->first)) {
+				std::vector<std::string> &l = byNwid[i->first];
+				i->second.second->setNetworkName(l[3]);
+				i->second.second->setStatus(l[4],l[5]);
+				i->second.second->setNetworkType(l[6]);
+				i->second.second->setNetworkDeviceName(l[7]);
+				i->second.second->setIps(l[8]);
+			} else {
+				delete ui->networkListWidget->takeItem(i->second.first);
+			}
+		}
+
+		for(std::map< std::string,std::vector<std::string> >::iterator i(byNwid.begin());i!=byNwid.end();++i) {
+			if (!existingByNwid.count(i->first)) {
+				std::vector<std::string> &l = i->second;
+				Network *nw = new Network((QWidget *)0,i->first);
+				nw->setNetworkName(l[3]);
+				nw->setStatus(l[4],l[5]);
+				nw->setNetworkType(l[6]);
+				nw->setNetworkDeviceName(l[7]);
+				nw->setIps(l[8]);
+				QListWidgetItem *item = new QListWidgetItem();
+				item->setSizeHint(nw->sizeHint());
+				ui->networkListWidget->addItem(item);
+				ui->networkListWidget->setItemWidget(item,nw);
+			}
+		}
+	} else if (hdr[1] == "listpeers") {
+		this->numPeers = 0;
+		for(unsigned long i=1;i<m->ztMessage.size();++i) {
+			std::vector<std::string> l(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[i]));
+			if ((l.size() >= 5)&&((l[3] != "-")||(l[4] != "-")))
+				++this->numPeers; // number of direct peers online -- check for active IPv4 and/or IPv6 address
+		}
+	}
+
+	if (this->myAddress.size()) {
+		QString st(this->myAddress);
+		st += "    (";
+		st += this->myStatus;
+		st += ", v";
+		st += this->myVersion;
+		st += ", ";
+		st += QString::number(this->numPeers);
+		st += " peers)";
+		while (st.size() < 45)
+			st += QChar::Space;
+		ui->statusAndAddressButton->setText(st);
+	}
+
+	if (this->myStatus == "ONLINE") {
+		if (!this->isEnabled())
+			this->setEnabled(true);
+	} else {
+		if (this->isEnabled())
+			this->setEnabled(false);
+	}
+}
+
+void MainWindow::on_joinNetworkButton_clicked()
+{
+	QString toJoin(ui->networkIdLineEdit->text());
+	ui->networkIdLineEdit->setText(QString());
+
+	if (!zeroTierClient) // sanity check
+		return;
+
+	if (toJoin.size() != 16) {
+		QMessageBox::information(this,"Invalid Network ID","The network ID you entered was not valid. Enter a 16-digit hexadecimal network ID, like '8056c2e21c000001'.",QMessageBox::Ok,QMessageBox::NoButton);
+		return;
+	}
+
+	zeroTierClient->send((QString("join ") + toJoin).toStdString());
+}
+
+void MainWindow::on_actionAbout_triggered()
+{
+	AboutWindow *about = new AboutWindow(this);
+	about->show();
+}
+
+void MainWindow::on_networkIdLineEdit_textChanged(const QString &text)
+{
+	QString newText;
+	for(QString::const_iterator i(text.begin());i!=text.end();++i) {
+		switch(i->toLatin1()) {
+			case '0': newText.append('0'); break;
+			case '1': newText.append('1'); break;
+			case '2': newText.append('2'); break;
+			case '3': newText.append('3'); break;
+			case '4': newText.append('4'); break;
+			case '5': newText.append('5'); break;
+			case '6': newText.append('6'); break;
+			case '7': newText.append('7'); break;
+			case '8': newText.append('8'); break;
+			case '9': newText.append('9'); break;
+			case 'a': newText.append('a'); break;
+			case 'b': newText.append('b'); break;
+			case 'c': newText.append('c'); break;
+			case 'd': newText.append('d'); break;
+			case 'e': newText.append('e'); break;
+			case 'f': newText.append('f'); break;
+			case 'A': newText.append('a'); break;
+			case 'B': newText.append('b'); break;
+			case 'C': newText.append('c'); break;
+			case 'D': newText.append('d'); break;
+			case 'E': newText.append('e'); break;
+			case 'F': newText.append('f'); break;
+			default: break;
+		}
+	}
+	if (newText.size() > 16)
+		newText.truncate(16);
+	ui->networkIdLineEdit->setText(newText);
+}
+
+void MainWindow::on_statusAndAddressButton_clicked()
+{
+	QApplication::clipboard()->setText(this->myAddress);
+}

ZeroTierUI/mainwindow.h

@@ -0,0 +1,61 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QEvent>
+#include <QString>
+
+#include "../node/Node.hpp"
+#include "../node/Utils.hpp"
+
+namespace Ui {
+class MainWindow;
+}
+
+// Globally visible instance of local client for communicating with ZT1
+// Can be null if not connected, or will point to current
+extern ZeroTier::Node::LocalClient *zeroTierClient;
+
+class MainWindow : public QMainWindow
+{
+	Q_OBJECT
+
+public:
+	// Event used to pass messages from the Node::LocalClient thread to the
+	// main window to update network lists and stats.
+	class ZTMessageEvent : public QEvent
+	{
+	public:
+		ZTMessageEvent(const std::vector<std::string> &m) :
+			QEvent(QEvent::User),
+			ztMessage(m)
+		{
+		}
+
+		std::vector<std::string> ztMessage;
+	};
+
+	explicit MainWindow(QWidget *parent = 0);
+	virtual ~MainWindow();
+
+protected:
+	virtual void timerEvent(QTimerEvent *event);
+	virtual void customEvent(QEvent *event);
+
+private slots:
+	void on_joinNetworkButton_clicked();
+	void on_actionAbout_triggered();
+	void on_networkIdLineEdit_textChanged(const QString &text);
+	void on_statusAndAddressButton_clicked();
+
+private:
+	Ui::MainWindow *ui;
+
+	QString myAddress;
+	QString myStatus;
+	QString myVersion;
+	unsigned int numPeers;
+	unsigned int cyclesSinceResponseFromService;
+};
+
+#endif // MAINWINDOW_H

ZeroTierUI/mainwindow.ui

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>668</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>ZeroTier One</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/img/zt1icon.png</normaloff>:/img/zt1icon.png</iconset>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>6</number>
+    </property>
+    <property name="leftMargin">
+     <number>6</number>
+    </property>
+    <property name="topMargin">
+     <number>6</number>
+    </property>
+    <property name="rightMargin">
+     <number>6</number>
+    </property>
+    <property name="bottomMargin">
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QListWidget" name="networkListWidget">
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="autoScroll">
+       <bool>false</bool>
+      </property>
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::NoSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <property name="verticalScrollMode">
+       <enum>QAbstractItemView::ScrollPerPixel</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QWidget" name="bottomContainerWidget" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="sizeConstraint">
+        <enum>QLayout::SetDefaultConstraint</enum>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QToolButton" name="statusAndAddressButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Courier</family>
+           <pointsize>12</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>Click to Copy Address to Clipboard</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border: 0;</string>
+         </property>
+         <property name="text">
+          <string>0000000000    (OFFLINE, v0.0.0, 0 peers)     </string>
+         </property>
+         <property name="toolButtonStyle">
+          <enum>Qt::ToolButtonTextOnly</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="networkIdLineEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Courier</family>
+           <pointsize>12</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>Enter Hexadecimal Network ID</string>
+         </property>
+         <property name="frame">
+          <bool>true</bool>
+         </property>
+         <property name="placeholderText">
+          <string>(Numeric ID of Network to Join)</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="joinNetworkButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Courier</family>
+           <pointsize>12</pointsize>
+           <weight>50</weight>
+           <bold>false</bold>
+           <underline>false</underline>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>Join Network</string>
+         </property>
+         <property name="autoFillBackground">
+          <bool>false</bool>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string>Join</string>
+         </property>
+         <property name="toolButtonStyle">
+          <enum>Qt::ToolButtonTextOnly</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>668</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
+  <action name="actionExit">
+   <property name="text">
+    <string>Exit</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>actionExit</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>333</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ZeroTierUI/network.cpp

@@ -0,0 +1,106 @@
+#include "network.h"
+#include "mainwindow.h"
+#include "ui_network.h"
+
+#include <QClipboard>
+#include <QString>
+#include <QStringList>
+#include <QCoreApplication>
+#include <QProcess>
+#include <QList>
+#include <QMessageBox>
+
+Network::Network(QWidget *parent,const std::string &nwid) :
+	QWidget(parent),
+	ui(new Ui::Network),
+	networkIdStr(nwid)
+{
+	ui->setupUi(this);
+	ui->networkIdPushButton->setText(QString(nwid.c_str()));
+	QFontMetrics fm(ui->ipListWidget->font());
+	int lineHeight = ui->ipListWidget->spacing() + fm.height();
+	ui->ipListWidget->setMinimumHeight(lineHeight * 3);
+	ui->ipListWidget->setMaximumHeight(lineHeight * 3);
+}
+
+Network::~Network()
+{
+	delete ui;
+}
+
+void Network::setStatus(const std::string &status,const std::string &age)
+{
+	ui->statusLabel->setText(QString(status.c_str()));
+	if (status == "OK")
+		ui->ageLabel->setText(QString("(configuration is ") + age.c_str() + " seconds old)");
+	else ui->ageLabel->setText(QString());
+}
+
+void Network::setNetworkName(const std::string &name)
+{
+	ui->nameLabel->setText(QString(name.c_str()));
+}
+
+void Network::setNetworkType(const std::string &type)
+{
+	ui->networkTypeLabel->setText(QString(type.c_str()));
+	if (type == "?")
+		ui->networkTypeLabel->setToolTip("Waiting for configuration...");
+	else if (type == "public")
+		ui->networkTypeLabel->setToolTip("This network can be joined by anyone.");
+	else if (type == "private")
+		ui->networkTypeLabel->setToolTip("This network is private, only authorized peers can join.");
+	else ui->networkTypeLabel->setToolTip(QString());
+}
+
+void Network::setNetworkDeviceName(const std::string &dev)
+{
+	ui->deviceLabel->setText(QString(dev.c_str()));
+}
+
+void Network::setIps(const std::string &commaSeparatedList)
+{
+	QStringList ips(QString(commaSeparatedList.c_str()).split(QChar(','),QString::SkipEmptyParts));
+	if (commaSeparatedList == "-")
+		ips.clear();
+
+	QStringList tmp;
+	ips.sort();
+	for(QStringList::iterator i(ips.begin());i!=ips.end();++i) {
+		QString ipOnly(*i);
+		int slashIdx = ipOnly.indexOf('/');
+		if (slashIdx > 0)
+			ipOnly.truncate(slashIdx);
+		tmp.append(ipOnly);
+	}
+	ips = tmp;
+
+	for(QStringList::iterator i(ips.begin());i!=ips.end();++i) {
+		if (ui->ipListWidget->findItems(*i,Qt::MatchCaseSensitive).size() == 0)
+			ui->ipListWidget->addItem(*i);
+	}
+
+	for(int i=0;i<ui->ipListWidget->count();++i) {
+		QListWidgetItem *item = ui->ipListWidget->item(i);
+		if (!ips.contains(item->text()))
+			ui->ipListWidget->removeItemWidget(item);
+	}
+}
+
+const std::string &Network::networkId()
+{
+	return networkIdStr;
+}
+
+void Network::on_leaveNetworkButton_clicked()
+{
+	if (QMessageBox::question(this,"Leave Network?",QString("Are you sure you want to leave network '") + networkIdStr.c_str() + "'?",QMessageBox::No,QMessageBox::Yes) == QMessageBox::Yes) {
+		zeroTierClient->send((QString("leave ") + networkIdStr.c_str()).toStdString());
+		this->setEnabled(false);
+	}
+}
+
+void Network::on_networkIdPushButton_clicked()
+{
+	QApplication::clipboard()->setText(ui->networkIdPushButton->text());
+}

ZeroTierUI/network.h

@@ -0,0 +1,37 @@
+#ifndef NETWORK_H
+#define NETWORK_H
+
+#include <string>
+
+#include <QWidget>
+
+namespace Ui {
+class Network;
+}
+
+class Network : public QWidget
+{
+	Q_OBJECT
+
+public:
+	explicit Network(QWidget *parent = 0,const std::string &nwid = std::string());
+	virtual ~Network();
+
+	void setStatus(const std::string &status,const std::string &age);
+	void setNetworkName(const std::string &name);
+	void setNetworkType(const std::string &type);
+	void setNetworkDeviceName(const std::string &dev);
+	void setIps(const std::string &commaSeparatedList);
+
+	const std::string &networkId();
+
+private slots:
+	void on_leaveNetworkButton_clicked();
+	void on_networkIdPushButton_clicked();
+
+private:
+	Ui::Network *ui;
+	std::string networkIdStr;
+};
+
+#endif // NETWORK_H

ZeroTierUI/network.ui

@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Network</class>
+ <widget class="QWidget" name="Network">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>580</width>
+    <height>253</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Network</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="leftWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="formAlignment">
+       <set>Qt::AlignHCenter|Qt::AlignTop</set>
+      </property>
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Network ID:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="networkIdPushButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>Click to Copy Network ID to Clipboard</string>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border: 0; padding: 0; margin: 0; text-align: left;</string>
+        </property>
+        <property name="text">
+         <string>0000000000000000</string>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Name:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLabel" name="nameLabel">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>?</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Type:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLabel" name="networkTypeLabel">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>?</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Status:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Device:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QLabel" name="deviceLabel">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>?</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QWidget" name="widget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="spacing">
+          <number>12</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="statusLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>?</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="ageLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>(configuration is 0 seconds old)</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="rightWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="sizeConstraint">
+       <enum>QLayout::SetNoConstraint</enum>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label_6">
+        <property name="font">
+         <font>
+          <underline>false</underline>
+         </font>
+        </property>
+        <property name="text">
+         <string>IP Address Assignments</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QListWidget" name="ipListWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <family>Courier</family>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+        <property name="showDropIndicator" stdset="0">
+         <bool>false</bool>
+        </property>
+        <property name="selectionMode">
+         <enum>QAbstractItemView::SingleSelection</enum>
+        </property>
+        <property name="horizontalScrollMode">
+         <enum>QAbstractItemView::ScrollPerPixel</enum>
+        </property>
+        <property name="sortingEnabled">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="leaveNetworkButtonContainerWidget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="leaveNetworkButton">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+             <underline>false</underline>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">padding: 0.1em; margin:0;</string>
+           </property>
+           <property name="text">
+            <string>Leave Network</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

ZeroTierUI/resources.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/img">
+        <file>zt1icon.png</file>
+    </qresource>
+</RCC>

attic/update-dummy/update-dummy.nfo

@@ -0,0 +1,6 @@
+vMajor=999
+vMinor=999
+vRevision=999
+signedBy=e9bc3707b5
+ed25519=ca7b943ace5451f420f1f599822d7013534a7cb7997096141e6a1aa6398c5f260c19dc5eecb297c922950f26dee7f9db787f8dbf85bc422baf3bff94c1131e086a7fc85c26dbb8c1b0a9cae63acc34998d9e1ce553156ea5638f9c99a50f6e2e
+url=http://download.zerotier.com/update/update-dummy.sh

attic/update-dummy/update-dummy.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Dummy updater -- run with opts: $*"
+exit 0

buildinstaller.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# This script builds the installer for *nix systems. Windows must do everything
+# completely differently, as usual.
+
+if [ ! -f zerotier-one ]; then
+	echo "Could not find 'zerotier-one' binary, please build before running this script."
+	exit 2
+fi
+
+make -j 2 file2lz4c
+if [ ! -f file2lz4c ]; then
+	echo "Build of file2lz4c utility failed, aborting installer build."
+	exit 2
+fi
+
+machine=`uname -m`
+system=`uname -s`
+
+vmajor=`cat version.h | grep -F ZEROTIER_ONE_VERSION_MAJOR | cut -d ' ' -f 3`
+vminor=`cat version.h | grep -F ZEROTIER_ONE_VERSION_MINOR | cut -d ' ' -f 3`
+revision=`cat version.h | grep -F ZEROTIER_ONE_VERSION_REVISION | cut -d ' ' -f 3`
+
+if [ -z "$vmajor" -o -z "$vminor" -o -z "$revision" ]; then
+	echo "Unable to extract version info from version.h, aborting installer build."
+	exit 2
+fi
+
+echo "Packaging common files: zerotier-one"
+
+rm -rf installer-build
+mkdir installer-build
+
+./file2lz4c zerotier-one zerotier_one >installer-build/zerotier_one.h
+
+case "$system" in
+
+	Linux)
+		# Canonicalize $machine for some architectures... we use x86
+		# and x64 for Intel stuff. ARM and others should be fine if
+		# we ever ship officially for those.
+		case "$machine" in
+			i386|i486|i586|i686)
+				machine="x86"
+				;;
+			x86_64|amd64|x64)
+				machine="x64"
+				;;
+			*)
+				echo "Unsupported machine type: $machine"
+				exit 2
+		esac
+
+		echo "Assembling Linux installer for $machine and ZT1 version $vmajor.$vminor.$revision"
+
+		./file2lz4c ext/installfiles/linux/uninstall.sh uninstall_sh >installer-build/uninstall_sh.h
+		./file2lz4c ext/installfiles/linux/init.d/zerotier-one linux__init_d__zerotier_one >installer-build/linux__init_d__zerotier_one.h
+
+		g++ -Os -o "zt1-${vmajor}_${vminor}_${revision}-linux-${machine}-install" installer.cpp ext/lz4/lz4.o ext/lz4/lz4hc.o
+		ls -l zt1-*-install
+
+		;;
+
+	Darwin)
+		echo "Assembling OSX installer for x86/x64 (combined) and ZT1 version $vmajor.$vminor.$revision"
+
+		./file2lz4c ext/installfiles/linux/uninstall.sh uninstall_sh >installer-build/uninstall_sh.h
+		./file2lz4c ext/bin/tap-mac/tap.kext/Contents/Info.plist tap_mac__Info_plist >installer-build/tap_mac__Info_plist.h
+		./file2lz4c ext/bin/tap-mac/tap.kext/Contents/MacOS/tap tap_mac__tap >installer-build/tap_mac__tap.h
+
+		g++ -Os -arch i386 -o "zt1-${vmajor}_${vminor}_${revision}-mac-combined-install" installer.cpp ext/lz4/lz4.o ext/lz4/lz4hc.o
+		ls -l zt1-*-install
+
+		;;
+
+	*)
+		echo "Unsupported platform: $system"
+		exit 2
+
+esac
+
+exit 0

cli.cpp

@@ -1,148 +0,0 @@
-/*
- * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  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>
-
-#ifndef __WINDOWS__
-#include <unistd.h>
-#endif
-
-#include "node/Node.hpp"
-#include "node/Constants.hpp"
-#include "node/Utils.hpp"
-#include "node/Thread.hpp"
-#include "node/Condition.hpp"
-
-using namespace ZeroTier;
-
-static void printHelp(FILE *out,const char *exename)
-{
-	fprintf(out,"Usage: %s [-switches] <command>"ZT_EOL_S,exename);
-	fprintf(out,ZT_EOL_S);
-	fprintf(out,"Available switches:"ZT_EOL_S);
-	fprintf(out," -c<port>         - Communicate with daemon over this local port"ZT_EOL_S);
-	fprintf(out," -t<token>        - Specify token on command line"ZT_EOL_S);
-	fprintf(out," -T<file>         - Read token from file"ZT_EOL_S);
-	fprintf(out,ZT_EOL_S);
-	fprintf(out,"Use the 'help' command to get help from ZeroTier One itself."ZT_EOL_S);
-}
-
-static volatile unsigned int numResults = 0;
-static Condition doneCondition;
-
-static void resultHandler(void *arg,unsigned long id,const char *line)
-{
-	++numResults;
-	if (strlen(line))
-		fprintf(stdout,"%s"ZT_EOL_S,line);
-	else doneCondition.signal();
-}
-
-int main(int argc,char **argv)
-{
-	if (argc <= 1) {
-		printHelp(stdout,argv[0]);
-		return -1;
-	}
-
-	std::string authToken;
-	std::string command;
-	bool pastSwitches = false;
-	unsigned int controlPort = 0;
-	for(int i=1;i<argc;++i) {
-		if ((argv[i][0] == '-')&&(!pastSwitches)) {
-			if (strlen(argv[i]) <= 1) {
-				printHelp(stdout,argv[0]);
-				return -1;
-			}
-			switch(argv[i][1]) {
-				case 'c':
-					controlPort = Utils::strToUInt(argv[i] + 2);
-					break;
-				case 't':
-					authToken.assign(argv[i] + 2);
-					break;
-				case 'T':
-					if (!Utils::readFile(argv[i] + 2,authToken)) {
-						fprintf(stdout,"FATAL ERROR: unable to read token from '%s'"ZT_EOL_S,argv[i] + 2);
-						return -2;
-					}
-					break;
-				default:
-					return -1;
-			}
-		} else {
-			pastSwitches = true;
-			if (command.length())
-				command.push_back(' ');
-			command.append(argv[i]);
-		}
-	}
-
-	if (!authToken.length()) {
-		const char *home = getenv("HOME");
-		if (home) {
-			std::string dotZeroTierAuthToken(home);
-			dotZeroTierAuthToken.push_back(ZT_PATH_SEPARATOR);
-			dotZeroTierAuthToken.append(".zerotierOneAuthToken");
-			if (!Utils::readFile(dotZeroTierAuthToken.c_str(),authToken)) {
-#ifndef __WINDOWS__
-#ifdef __APPLE__
-				const char *systemAuthTokenPath = "/Library/Application Support/ZeroTier/One/authtoken.secret";
-#else
-				const char *systemAuthTokenPath = "/var/lib/zerotier-one/authtoken.secret";
-#endif
-				if (!Utils::readFile(systemAuthTokenPath,authToken)) {
-					fprintf(stdout,"FATAL ERROR: no token specified on command line and could not read '%s' or '%s'"ZT_EOL_S,dotZeroTierAuthToken.c_str(),systemAuthTokenPath);
-					return -2;
-				}
-#else // __WINDOWS__
-				fprintf(stdout,"FATAL ERROR: no token specified on command line and could not read '%s'"ZT_EOL_S,dotZeroTierAuthToken.c_str());
-				return -2;
-#endif // __WINDOWS__
-			}
-		}
-	}
-	if (!authToken.length()) {
-		fprintf(stdout,"FATAL ERROR: could not find auth token"ZT_EOL_S);
-		return -2;
-	}
-
-	Node::LocalClient client(authToken.c_str(),controlPort,&resultHandler,(void *)0);
-	client.send(command.c_str());
-
-	doneCondition.wait(1000);
-
-	if (!numResults) {
-		fprintf(stdout,"ERROR: no results received. Is ZeroTier One running?"ZT_EOL_S);
-		return -1;
-	}
-
-	return 0;
-}

ext/installfiles/linux/init.d/zerotier-one

@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# zerotier-one   Virtual distributed Ethernet service
+#
+# chkconfig: 2345 11 89
+# description: ZeroTier One provides public and private distributed ethernet \
+#              networks. See https://www.zerotier.com/ for more information.
+
+### BEGIN INIT INFO
+# Provides: zerotier-one
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs
+# Default-Start:  2345
+# Default-Stop: 90
+# Short-Description: start ZeroTier One
+# Description: ZeroTier One provides public and private distributed ethernet \
+#              networks. See https://www.zerotier.com/ for more information.
+### END INIT INFO
+
+#
+# This script is written to avoid distro-specific dependencies, so it does not
+# use the rc bash script libraries found on some systems. It should work on
+# just about anything, even systems using Upstart. Upstart native support may
+# come in the future.
+#
+
+zthome=/var/lib/zerotier-one
+
+# Add $zthome to path so we can invoke zerotier-one naked, makes it look
+# better in a ps listing.
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:$zthome
+
+if [ "$UID" -ne 0 ]; then
+	echo "Init script must be called as root."
+	exit 4
+fi
+
+if [ ! -f "$zthome/zerotier-one" ]; then
+	echo "ZeroTier One is not installed in $zthome."
+	exit 5
+fi
+
+pid=0
+if [ -f "$zthome/zerotier-one.pid" ]; then
+	pid=`cat $zthome/zerotier-one.pid`
+fi
+
+running=0
+if [ "$pid" -gt 0 ]; then
+	if [ "`readlink -nf /proc/$pid/exe`" = "$zthome/zerotier-one" ]; then
+		running=1
+	else
+		rm -f "$zthome/zerotier-one.pid"
+	fi
+fi
+
+case "$1" in
+	start)
+		if [ $running -gt 0 ]; then
+			echo "ZeroTier One already running."
+			exit 0
+		fi
+		echo "Starting ZeroTier One..."
+		nohup zerotier-one >>/dev/null 2>&1 &
+		disown %1
+		exit 0
+		;;
+	stop)
+		if [ $running -gt 0 ]; then
+			echo "Stopping ZeroTier One..."
+			kill -TERM $pid
+		else
+			echo "ZeroTier One is not running."
+		fi
+		;;
+	restart|reload|force-reload|condrestart|try-restart)
+		echo "Restarting ZeroTier One..."
+		if [ $running -gt 0 ]; then
+			kill -TERM $pid
+		fi
+		while [ -f "$zthome/zerotier-one.pid" ]; do sleep 1; done
+		nohup zerotier-one >>/dev/null 2>&1 &
+		disown %1
+		;;
+	status)
+		if [ $running -gt 0 ]; then
+			exit 0
+		else
+			exit 3
+		fi
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+		exit 2
+esac
+
+exit 0

ext/installfiles/linux/uninstall.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+
+if [ "$UID" -ne 0 ]; then
+	echo "Must be run as root; try: sudo $0"
+	exit 1
+fi
+
+echo
+
+echo "This will uninstall ZeroTier One, hit CTRL+C to abort."
+echo "Waiting 5 seconds..."
+sleep 5
+
+echo "Killing any running zerotier-one service..."
+killall -q -TERM zerotier-one
+sleep 2
+killall -q -KILL zerotier-one
+
+echo "Removing SysV init items..."
+rm -fv /etc/init.d/zerotier-one
+find /etc/rc*.d -name '???zerotier-one' -print0 | xargs -0 rm -fv
+
+echo "Erasing binary and support files..."
+cd /var/lib/zerotier-one
+rm -fv zerotier-one *.persist authtoken.secret identity.public *.log *.pid
+rm -rfv updates.d networks.d iddb.d
+
+echo "Erasing anything installed into system bin directories..."
+rm -fv /usr/local/bin/zerotier-* /usr/bin/zerotier-*
+
+echo "Done."
+echo
+echo "Your ZeroTier One identity is still preserved in /var/lib/zerotier-one"
+echo "as identity.secret and can be manually deleted if you wish. Save it if"
+echo "you wish to re-use the address of this node, as it cannot be regenerated."
+
+echo
+
+exit 0

ext/installfiles/mac/check_for_updates.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+

ext/installfiles/mac/uninstall.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+if [ "$UID" -ne 0 ]; then
+	echo "Must be run as root; try: sudo $0"
+	exit 1
+fi
+
+echo
+
+echo "This will uninstall ZeroTier One, hit CTRL+C to abort."
+echo "Waiting 5 seconds..."
+sleep 5
+
+ztpath="/Library/Application Support/ZeroTier/One"
+
+echo "Killing any running zerotier-one service..."
+killall -TERM zerotier-one >>/dev/null 2>&1
+sleep 3
+killall -KILL zerotier-one >>/dev/null 2>&1
+
+echo "Unloading kernel extension..."
+kextunload "$ztpath/tap.kext"
+
+echo "Erasing binary and support files..."
+cd $ztpath
+rm -rfv zerotier-one *.persist authtoken.secret identity.public *.log *.pid *.kext
+
+echo "Done."
+echo
+echo "Your ZeroTier One identity is still preserved in $ztpath"
+echo "as identity.secret and can be manually deleted if you wish. Save it if"
+echo "you wish to re-use the address of this node, as it cannot be regenerated."
+
+echo
+
+exit 0

ext/lz4/bench.c

@@ -1,477 +0,0 @@
-/*
-    bench.c - Demo program to benchmark open-source compression algorithm
-    Copyright (C) Yann Collet 2012
-	GPL v2 License
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-	You can contact the author at :
-	- LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-	- LZ4 source repository : http://code.google.com/p/lz4/
-*/
-
-//**************************************
-// Compiler Options
-//**************************************
-// Disable some Visual warning messages
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_DEPRECATE     // VS2005
-
-// Unix Large Files support (>4GB)
-#if (defined(__sun__) && (!defined(__LP64__)))   // Sun Solaris 32-bits requires specific definitions
-#  define _LARGEFILE_SOURCE 
-#  define FILE_OFFSET_BITS=64
-#elif ! defined(__LP64__)                        // No point defining Large file for 64 bit
-#  define _LARGEFILE64_SOURCE
-#endif
-
-// S_ISREG & gettimeofday() are not supported by MSVC
-#if defined(_MSC_VER)
-#  define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
-#  define BMK_LEGACY_TIMER 1
-#endif
-
-// GCC does not support _rotl outside of Windows
-#if !defined(_WIN32)
-#  define _rotl(x,r) ((x << r) | (x >> (32 - r)))
-#endif
-
-
-//**************************************
-// Includes
-//**************************************
-#include <stdlib.h>      // malloc
-#include <stdio.h>       // fprintf, fopen, ftello64
-#include <sys/types.h>   // stat64
-#include <sys/stat.h>    // stat64
-
-// Use ftime() if gettimeofday() is not available on your target
-#if defined(BMK_LEGACY_TIMER)   
-#  include <sys/timeb.h>   // timeb, ftime
-#else
-#  include <sys/time.h>    // gettimeofday
-#endif
-
-#include "lz4.h"
-#define COMPRESSOR0 LZ4_compress
-#include "lz4hc.h"
-#define COMPRESSOR1 LZ4_compressHC
-#define DEFAULTCOMPRESSOR LZ4_compress
-
-
-
-//**************************************
-// Basic Types
-//**************************************
-#if defined(_MSC_VER)    // Visual Studio does not support 'stdint' natively
-#define BYTE	unsigned __int8
-#define U16		unsigned __int16
-#define U32		unsigned __int32
-#define S32		__int32
-#define U64		unsigned __int64
-#else
-#include <stdint.h>
-#define BYTE	uint8_t
-#define U16		uint16_t
-#define U32		uint32_t
-#define S32		int32_t
-#define U64		uint64_t
-#endif
-
-
-//**************************************
-// Constants
-//**************************************
-#define NBLOOPS		3
-#define TIMELOOP	2000
-
-#define KNUTH		2654435761U
-#define MAX_MEM		(1984<<20)
-#define DEFAULT_CHUNKSIZE   (8<<20)
-
-
-//**************************************
-// Local structures
-//**************************************
-struct chunkParameters
-{
-	U32   id;
-	char* inputBuffer;
-	char* outputBuffer;
-	int   inputSize;
-	int   outputSize;
-};
-
-struct compressionParameters
-{
-	int (*compressionFunction)(const char*, char*, int);
-	int (*decompressionFunction)(const char*, char*, int);
-};
-
-
-//**************************************
-// MACRO
-//**************************************
-#define DISPLAY(...) fprintf(stderr, __VA_ARGS__)
-
-
-
-//**************************************
-// Benchmark Parameters
-//**************************************
-static int chunkSize = DEFAULT_CHUNKSIZE;
-static int nbIterations = NBLOOPS;
-static int BMK_pause = 0;
-
-void BMK_SetBlocksize(int bsize)
-{
-	chunkSize = bsize;
-	DISPLAY("-Using Block Size of %i KB-", chunkSize>>10);
-}
-
-void BMK_SetNbIterations(int nbLoops)
-{
-	nbIterations = nbLoops;
-	DISPLAY("- %i iterations-", nbIterations);
-}
-
-void BMK_SetPause()
-{
-    BMK_pause = 1;
-}
-
-//*********************************************************
-//  Private functions
-//*********************************************************
-
-#if defined(BMK_LEGACY_TIMER)
-
-static int BMK_GetMilliStart()
-{
-  // Based on Legacy ftime()
-  // Rolls over every ~ 12.1 days (0x100000/24/60/60)
-  // Use GetMilliSpan to correct for rollover
-  struct timeb tb;
-  int nCount;
-  ftime( &tb );
-  nCount = (int) (tb.millitm + (tb.time & 0xfffff) * 1000);
-  return nCount;
-}
-
-#else
-
-static int BMK_GetMilliStart()
-{
-  // Based on newer gettimeofday()
-  // Use GetMilliSpan to correct for rollover
-  struct timeval tv;
-  int nCount;
-  gettimeofday(&tv, NULL);
-  nCount = (int) (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
-  return nCount;
-}
-
-#endif
-
-
-static int BMK_GetMilliSpan( int nTimeStart )
-{
-  int nSpan = BMK_GetMilliStart() - nTimeStart;
-  if ( nSpan < 0 )
-    nSpan += 0x100000 * 1000;
-  return nSpan;
-}
-
-
-static U32 BMK_checksum_MMH3A (char* buff, U32 length)
-{
-  const BYTE* data = (const BYTE*)buff;
-  const int nblocks = length >> 2;
-
-  U32 h1 = KNUTH;
-  U32 c1 = 0xcc9e2d51;
-  U32 c2 = 0x1b873593;
-
-  const U32* blocks = (const U32*)(data + nblocks*4);
-  int i;
-
-  for(i = -nblocks; i; i++)
-  {
-    U32 k1 = blocks[i];
-
-    k1 *= c1;
-    k1 = _rotl(k1,15);
-    k1 *= c2;
-
-    h1 ^= k1;
-    h1 = _rotl(h1,13);
-    h1 = h1*5+0xe6546b64;
-  }
-
-  {
-	  const BYTE* tail = (const BYTE*)(data + nblocks*4);
-	  U32 k1 = 0;
-
-	  switch(length & 3)
-	  {
-	  case 3: k1 ^= tail[2] << 16;
-	  case 2: k1 ^= tail[1] << 8;
-	  case 1: k1 ^= tail[0];
-			  k1 *= c1; k1 = _rotl(k1,15); k1 *= c2; h1 ^= k1;
-	  };
-  }
-
-  h1 ^= length;
-  h1 ^= h1 >> 16;
-  h1 *= 0x85ebca6b;
-  h1 ^= h1 >> 13;
-  h1 *= 0xc2b2ae35;
-  h1 ^= h1 >> 16;
-
-  return h1;
-}
-
-
-static size_t BMK_findMaxMem(U64 requiredMem)
-{
-	size_t step = (64U<<20);   // 64 MB
-	BYTE* testmem=NULL;
-
-	requiredMem = (((requiredMem >> 25) + 1) << 26);
-	if (requiredMem > MAX_MEM) requiredMem = MAX_MEM;
-
-	requiredMem += 2*step;
-	while (!testmem)
-	{
-		requiredMem -= step;
-		testmem = malloc ((size_t)requiredMem);
-	}
-
-	free (testmem);
-	return (size_t) (requiredMem - step);
-}
-
-
-static U64 BMK_GetFileSize(char* infilename)
-{
-	int r;
-#if defined(_MSC_VER)
-	struct _stat64 statbuf;
-	r = _stat64(infilename, &statbuf);
-#else
-	struct stat statbuf;
-	r = stat(infilename, &statbuf);
-#endif
-	if (r || !S_ISREG(statbuf.st_mode)) return 0;   // No good...
-	return (U64)statbuf.st_size;
-}
-
-
-//*********************************************************
-//  Public function
-//*********************************************************
-
-int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel)
-{
-  int fileIdx=0;
-  FILE* fileIn;
-  char* infilename;
-  U64 largefilesize;
-  size_t benchedsize;
-  int nbChunks;
-  int maxCChunkSize;
-  size_t readSize;
-  char* in_buff;
-  char* out_buff; int out_buff_size;
-  struct chunkParameters* chunkP;
-  U32 crcc, crcd=0;
-  struct compressionParameters compP;
-
-  U64 totals = 0;
-  U64 totalz = 0;
-  double totalc = 0.;
-  double totald = 0.;
-
-
-  // Init
-  switch (cLevel)
-  {
-#ifdef COMPRESSOR0
-  case 0 : compP.compressionFunction = COMPRESSOR0; break;
-#endif
-#ifdef COMPRESSOR1
-  case 1 : compP.compressionFunction = COMPRESSOR1; break;
-#endif
-  default : compP.compressionFunction = DEFAULTCOMPRESSOR;
-  }
-  compP.decompressionFunction = LZ4_uncompress;
-
-  // Loop for each file
-  while (fileIdx<nbFiles)
-  {
-	  // Check file existence
-	  infilename = fileNamesTable[fileIdx++];
-	  fileIn = fopen( infilename, "rb" );
-	  if (fileIn==NULL)
-	  {
-		DISPLAY( "Pb opening %s\n", infilename);
-		return 11;
-	  }
-
-	  // Memory allocation & restrictions
-	  largefilesize = BMK_GetFileSize(infilename);
-	  benchedsize = (size_t) BMK_findMaxMem(largefilesize) / 2;
-	  if ((U64)benchedsize > largefilesize) benchedsize = (size_t)largefilesize;
-	  if (benchedsize < largefilesize)
-	  {
-		  DISPLAY("Not enough memory for '%s' full size; testing %i MB only...\n", infilename, (int)(benchedsize>>20));
-	  }
-
-	  // Alloc
-	  chunkP = (struct chunkParameters*) malloc(((benchedsize / chunkSize)+1) * sizeof(struct chunkParameters));
-	  in_buff = malloc((size_t )benchedsize);
-	  nbChunks = (int) (benchedsize / chunkSize) + 1;
-	  maxCChunkSize = LZ4_compressBound(chunkSize);
-	  out_buff_size = nbChunks * maxCChunkSize;
-	  out_buff = malloc((size_t )out_buff_size);
-
-
-	  if(!in_buff || !out_buff)
-	  {
-		DISPLAY("\nError: not enough memory!\n");
-		free(in_buff);
-		free(out_buff);
-		fclose(fileIn);
-		return 12;
-	  }
-
-	  // Init chunks data
-	  {
-		  int i;
-		  size_t remaining = benchedsize;
-		  char* in = in_buff;
-		  char* out = out_buff;
-		  for (i=0; i<nbChunks; i++)
-		  {
-			  chunkP[i].id = i;
-			  chunkP[i].inputBuffer = in; in += chunkSize;
-			  if ((int)remaining > chunkSize) { chunkP[i].inputSize = chunkSize; remaining -= chunkSize; } else { chunkP[i].inputSize = (int)remaining; remaining = 0; }
-			  chunkP[i].outputBuffer = out; out += maxCChunkSize;
-			  chunkP[i].outputSize = 0;
-		  }
-	  }
-
-	  // Fill input buffer
-	  DISPLAY("Loading %s...       \r", infilename);
-	  readSize = fread(in_buff, 1, benchedsize, fileIn);
-	  fclose(fileIn);
-
-	  if(readSize != benchedsize)
-	  {
-		DISPLAY("\nError: problem reading file '%s' !!    \n", infilename);
-		free(in_buff);
-		free(out_buff);
-		return 13;
-	  }
-
-	  // Calculating input Checksum
-	  crcc = BMK_checksum_MMH3A(in_buff, (unsigned int)benchedsize);
-
-
-	  // Bench
-	  {
-		int loopNb, nb_loops, chunkNb;
-		size_t cSize=0;
-	    int milliTime;
-		double fastestC = 100000000., fastestD = 100000000.;
-		double ratio=0.;
-
-		DISPLAY("\r%79s\r", "");
-		for (loopNb = 1; loopNb <= nbIterations; loopNb++)
-		{
-		  // Compression
-		  DISPLAY("%1i-%-14.14s : %9i ->\r", loopNb, infilename, (int)benchedsize);
-		  { size_t i; for (i=0; i<benchedsize; i++) out_buff[i]=(char)i; }     // warmimg up memory
-
-		  nb_loops = 0;
-		  milliTime = BMK_GetMilliStart();
-		  while(BMK_GetMilliStart() == milliTime);
-		  milliTime = BMK_GetMilliStart();
-		  while(BMK_GetMilliSpan(milliTime) < TIMELOOP)
-		  {
-			for (chunkNb=0; chunkNb<nbChunks; chunkNb++)
-				chunkP[chunkNb].outputSize = compP.compressionFunction(chunkP[chunkNb].inputBuffer, chunkP[chunkNb].outputBuffer, chunkP[chunkNb].inputSize);
-			nb_loops++;
-		  }
-		  milliTime = BMK_GetMilliSpan(milliTime);
-
-		  if ((double)milliTime < fastestC*nb_loops) fastestC = (double)milliTime/nb_loops;
-		  cSize=0; for (chunkNb=0; chunkNb<nbChunks; chunkNb++) cSize += chunkP[chunkNb].outputSize;
-		  ratio = (double)cSize/(double)benchedsize*100.;
-
-		  DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s\r", loopNb, infilename, (int)benchedsize, (int)cSize, ratio, (double)benchedsize / fastestC / 1000.);
-
-		  // Decompression
-		  { size_t i; for (i=0; i<benchedsize; i++) in_buff[i]=0; }     // zeroing area, for CRC checking
-
-		  nb_loops = 0;
-		  milliTime = BMK_GetMilliStart();
-		  while(BMK_GetMilliStart() == milliTime);
-		  milliTime = BMK_GetMilliStart();
-		  while(BMK_GetMilliSpan(milliTime) < TIMELOOP)
-		  {
-			for (chunkNb=0; chunkNb<nbChunks; chunkNb++)
-				chunkP[chunkNb].outputSize = LZ4_uncompress(chunkP[chunkNb].outputBuffer, chunkP[chunkNb].inputBuffer, chunkP[chunkNb].inputSize);
-				//chunkP[chunkNb].inputSize = LZ4_uncompress_unknownOutputSize(chunkP[chunkNb].outputBuffer, chunkP[chunkNb].inputBuffer, chunkP[chunkNb].outputSize, chunkSize);
-			nb_loops++;
-		  }
-		  milliTime = BMK_GetMilliSpan(milliTime);
-
-		  if ((double)milliTime < fastestD*nb_loops) fastestD = (double)milliTime/nb_loops;
-		  DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\r", loopNb, infilename, (int)benchedsize, (int)cSize, ratio, (double)benchedsize / fastestC / 1000., (double)benchedsize / fastestD / 1000.);
-
-		  // CRC Checking
-		  crcd = BMK_checksum_MMH3A(in_buff, (unsigned int)benchedsize);
-		  if (crcc!=crcd) { DISPLAY("\n!!! WARNING !!! %14s : Invalid Checksum : %x != %x\n", infilename, (unsigned)crcc, (unsigned)crcd); break; }
-		}
-
-	    if (crcc==crcd)
-		{
-			if (ratio<100.)
-				DISPLAY("%-16.16s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\n", infilename, (int)benchedsize, (int)cSize, ratio, (double)benchedsize / fastestC / 1000., (double)benchedsize / fastestD / 1000.);
-			else
-				DISPLAY("%-16.16s : %9i -> %9i (%5.1f%%),%7.1f MB/s ,%7.1f MB/s \n", infilename, (int)benchedsize, (int)cSize, ratio, (double)benchedsize / fastestC / 1000., (double)benchedsize / fastestD / 1000.);
-		}
-		totals += benchedsize;
-		totalz += cSize;
-		totalc += fastestC;
-		totald += fastestD;
-	  }
-
-	  free(in_buff);
-	  free(out_buff);
-	  free(chunkP);
-  }
-
-  if (nbFiles > 1)
-		printf("%-16.16s :%10llu ->%10llu (%5.2f%%), %6.1f MB/s , %6.1f MB/s\n", "  TOTAL", (long long unsigned int)totals, (long long unsigned int)totalz, (double)totalz/(double)totals*100., (double)totals/totalc/1000., (double)totals/totald/1000.);
-
-  if (BMK_pause) { printf("press enter...\n"); getchar(); }
-
-  return 0;
-}
-
-
-

ext/lz4/bench.h

@@ -1,41 +0,0 @@
-/*
-    bench.h - Demo program to benchmark open-source compression algorithm
-    Copyright (C) Yann Collet 2012
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-	You can contact the author at :
-	- LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-	- LZ4 source repository : http://code.google.com/p/lz4/
-*/
-#pragma once
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel);
-
-// Parameters
-void BMK_SetBlocksize(int bsize);
-void BMK_SetNbIterations(int nbLoops);
-void BMK_SetPause();
-
-
-
-#if defined (__cplusplus)
-}
-#endif

ext/lz4/fuzzer.c

@@ -1,227 +0,0 @@
-/*
-    fuzzer.c - Fuzzer test tool for LZ4
-    Copyright (C) Andrew Mahone - Yann Collet 2012
-	Original code by Andrew Mahone / Modified by Yann Collet
-	GPL v2 License
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-	You can contact the author at :
-	- LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-	- LZ4 source repository : http://code.google.com/p/lz4/
-*/
-
-//**************************************
-// Remove Visual warning messages
-//**************************************
-#define _CRT_SECURE_NO_WARNINGS  // fgets
-
-
-//**************************************
-// Includes
-//**************************************
-#include <stdlib.h>
-#include <stdio.h>      // fgets, sscanf
-#include <sys/timeb.h>  // timeb
-#include "lz4.h"
-
-
-//**************************************
-// Constants
-//**************************************
-#define NB_ATTEMPTS (1<<18)
-#define LEN ((1<<15))
-#define SEQ_POW 2
-#define NUM_SEQ (1 << SEQ_POW)
-#define SEQ_MSK ((NUM_SEQ) - 1)
-#define MOD_SEQ(x) ((((x) >> 8) & 255) == 0)
-#define NEW_SEQ(x) ((((x) >> 10) %10) == 0)
-#define PAGE_SIZE 4096
-#define ROUND_PAGE(x) (((x) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
-#define PRIME1   2654435761U
-#define PRIME2   2246822519U
-#define PRIME3   3266489917U
-
-
-
-//*********************************************************
-//  Functions
-//*********************************************************
-static int FUZ_GetMilliStart()
-{
-  struct timeb tb;
-  int nCount;
-  ftime( &tb );
-  nCount = (int) (tb.millitm + (tb.time & 0xfffff) * 1000);
-  return nCount;
-}
-
-static int FUZ_GetMilliSpan( int nTimeStart )
-{
-  int nSpan = FUZ_GetMilliStart() - nTimeStart;
-  if ( nSpan < 0 )
-    nSpan += 0x100000 * 1000;
-  return nSpan;
-}
-
-
-unsigned int FUZ_rand(unsigned int* src)
-{
-	*src =  ((*src) * PRIME1) + PRIME2;
-	return *src;
-}
-
-
-int test_canary(unsigned char *buf) {
-        int i;
-        for (i = 0; i < 2048; i++)
-                if (buf[i] != buf[i + 2048])
-                        return 0;
-        return 1;
-}
-
-int FUZ_SecurityTest()
-{
-  char* output;
-  char* input;
-  int i, r;
-
-  printf("Starting security tests...");
-  input = (char*) malloc (20<<20);
-  output = (char*) malloc (20<<20);
-  input[0] = 0x0F;
-  input[1] = 0x00;
-  input[2] = 0x00;
-  for(i = 3; i < 16840000; i++)
-    input[i] = 0xff;
-  r = LZ4_uncompress(input, output, 20<<20);
-
-  free(input);
-  free(output);
-  printf(" Completed (r=%i)\n",r);
-  return 0;
-}
-
-
-//int main(int argc, char *argv[]) {
-int main() {
-        unsigned long long bytes = 0;
-        unsigned long long cbytes = 0;
-        unsigned char buf[LEN];
-        unsigned char testOut[LEN+1];
-#       define FUZ_max   LZ4_COMPRESSBOUND(LEN)
-#       define FUZ_avail ROUND_PAGE(FUZ_max)
-        const int off_full = FUZ_avail - FUZ_max;
-        unsigned char cbuf[FUZ_avail + PAGE_SIZE];
-		unsigned int seed, cur_seq=PRIME3, seeds[NUM_SEQ], timestamp=FUZ_GetMilliStart();
-        int i, j, k, ret, len;
-		char userInput[30] = {0};
-
-		printf("starting LZ4 fuzzer\n");
-		printf("Select an Initialisation number (default : random) : ");
-		fflush(stdout);
-		if ( fgets(userInput, sizeof userInput, stdin) )
-		{
-			if ( sscanf(userInput, "%d", &seed) == 1 ) {}
-			else seed = FUZ_GetMilliSpan(timestamp);
-		}
-		printf("Seed = %u\n", seed);
-
-		FUZ_SecurityTest();
-
-		for (i = 0; i < 2048; i++)
-                cbuf[FUZ_avail + i] = cbuf[FUZ_avail + 2048 + i] = FUZ_rand(&seed) >> 16;
-
-        for (i = 0; i < NB_ATTEMPTS; i++) 
-        {
-			printf("\r%7i /%7i\r", i, NB_ATTEMPTS);
-			
-			FUZ_rand(&seed);
-            for (j = 0; j < NUM_SEQ; j++) {
-                    seeds[j] = FUZ_rand(&seed) << 8;
-                    seeds[j] ^= (FUZ_rand(&seed) >> 8) & 65535;
-            }
-            for (j = 0; j < LEN; j++) {
-                    k = FUZ_rand(&seed);
-                    if (j == 0 || NEW_SEQ(k))
-                            cur_seq = seeds[(FUZ_rand(&seed) >> 16) & SEQ_MSK];
-                    if (MOD_SEQ(k)) {
-                            k = (FUZ_rand(&seed) >> 16) & SEQ_MSK;
-                            seeds[k] = FUZ_rand(&seed) << 8;
-                            seeds[k] ^= (FUZ_rand(&seed) >> 8) & 65535;
-                    }
-                    buf[j] = FUZ_rand(&cur_seq) >> 16;
-            }
-
-			// Test compression
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[off_full], LEN, FUZ_max);
-			if (ret == 0) { printf("compression failed despite sufficient space: seed %u, len %d\n", seed, LEN); goto _output_error; }
-            len = ret;
-
-			// Test decoding with output size being exactly what's necessary => must work
-			ret = LZ4_uncompress((char*)&cbuf[off_full], (char*)testOut, LEN);
-			if (ret<0) { printf("decompression failed despite correct space: seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with one byte missing => must fail
-			ret = LZ4_uncompress((char*)&cbuf[off_full], (char*)testOut, LEN-1);
-			if (ret>=0) { printf("decompression should have failed, due to Output Size being too small : seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with one byte too much => must fail
-			ret = LZ4_uncompress((char*)&cbuf[off_full], (char*)testOut, LEN+1);
-			if (ret>=0) { printf("decompression should have failed, due to Output Size being too large : seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with enough output size => must work
-			ret = LZ4_uncompress_unknownOutputSize((char*)&cbuf[off_full], (char*)testOut, len, LEN+1);
-			if (ret<0) { printf("decompression failed despite sufficient space: seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with output size being exactly what's necessary => must work
-			ret = LZ4_uncompress_unknownOutputSize((char*)&cbuf[off_full], (char*)testOut, len, LEN);
-			if (ret<0) { printf("decompression failed despite sufficient space: seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with output size being one byte too short => must fail
-			ret = LZ4_uncompress_unknownOutputSize((char*)&cbuf[off_full], (char*)testOut, len, LEN-1);
-			if (ret>=0) { printf("decompression should have failed, due to Output Size being too small : seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with input size being one byte too short => must fail
-			ret = LZ4_uncompress_unknownOutputSize((char*)&cbuf[off_full], (char*)testOut, len-1, LEN);
-			if (ret>=0) { printf("decompression should have failed, due to input size being too small : seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test decoding with input size being one byte too large => must fail
-			ret = LZ4_uncompress_unknownOutputSize((char*)&cbuf[off_full], (char*)testOut, len+1, LEN);
-			if (ret>=0) { printf("decompression should have failed, due to input size being too large : seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test compression with output size being exactly what's necessary (should work)
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[FUZ_avail-len], LEN, len);
-            if (!test_canary(&cbuf[FUZ_avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d\n", seed, LEN, len); goto _output_error; }
-            if (ret == 0) { printf("compression failed despite sufficient space: seed %u, len %d\n", seed, LEN); goto _output_error; }
-
-			// Test compression with just one missing byte into output buffer => must fail
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[FUZ_avail-(len-1)], LEN, len-1);
-            if (ret) { printf("compression overran output buffer: seed %u, len %d, olen %d => ret %d", seed, LEN, len-1, ret); goto _output_error; }
-            if (!test_canary(&cbuf[FUZ_avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d", seed, LEN, len-1); goto _output_error; }
-
-			bytes += LEN;
-            cbytes += len;
-        }
-
-		printf("all tests completed successfully \n");
-        printf("compression ratio: %0.3f%%\n", (double)cbytes/bytes*100);
-		getchar();
-        return 0;
-
-_output_error:
-		getchar();
-		return 1;
-}

ext/lz4/lz4.h

@@ -1,7 +1,7 @@
 /*
    LZ4 - Fast LZ compression algorithm
    Header File
-   Copyright (C) 2011-2012, Yann Collet.
+   Copyright (C) 2011-2013, Yann Collet.
    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
 
    Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@ extern "C" {
 // Compiler Options
 //**************************************
 #if defined(_MSC_VER) && !defined(__cplusplus)   // Visual Studio
-#  define inline __inline           // Visual is not C99, but supports some kind of inline
+#  define inline __inline           // Visual C is not C99, but supports some kind of inline
 #endif
 
 
@@ -50,79 +50,156 @@ extern "C" {
 // Simple Functions
 //****************************
 
-int LZ4_compress   (const char* source, char* dest, int isize);
-int LZ4_uncompress (const char* source, char* dest, int osize);
+int LZ4_compress        (const char* source, char* dest, int inputSize);
+int LZ4_decompress_safe (const char* source, char* dest, int inputSize, int maxOutputSize);
 
 /*
 LZ4_compress() :
-    Compresses 'isize' bytes from 'source' into 'dest'.
+    Compresses 'inputSize' bytes from 'source' into 'dest'.
     Destination buffer must be already allocated,
     and must be sized to handle worst cases situations (input data not compressible)
     Worst case size evaluation is provided by function LZ4_compressBound()
-
-    isize  : is the input size. Max supported value is ~1.9GB
+    inputSize : Max supported value is LZ4_MAX_INPUT_VALUE
     return : the number of bytes written in buffer dest
+             or 0 if the compression fails
 
-
-LZ4_uncompress() :
-    osize  : is the output size, therefore the original size
-    return : the number of bytes read in the source buffer
-             If the source stream is malformed, the function will stop decoding and return a negative result, indicating the byte position of the faulty instruction
-             This function never writes outside of provided buffers, and never modifies input buffer.
-    note : destination buffer must be already allocated.
-           its size must be a minimum of 'osize' bytes.
+LZ4_decompress_safe() :
+    maxOutputSize : is the size of the destination buffer (which must be already allocated)
+    return : the number of bytes decoded in the destination buffer (necessarily <= maxOutputSize)
+             If the source stream is detected malformed, the function will stop decoding and return a negative result.
+             This function is protected against buffer overflow exploits (never writes outside of output buffer, and never reads outside of input buffer). Therefore, it is protected against malicious data packets
 */
 
 
 //****************************
 // Advanced Functions
 //****************************
-
-static inline int LZ4_compressBound(int isize)   { return ((isize) + ((isize)/255) + 16); }
-#define           LZ4_COMPRESSBOUND(    isize)            ((isize) + ((isize)/255) + 16)
+#define LZ4_MAX_INPUT_SIZE        0x7E000000   // 2 113 929 216 bytes
+#define LZ4_COMPRESSBOUND(isize)  ((unsigned int)(isize) > (unsigned int)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize)/255) + 16)
+static inline int LZ4_compressBound(int isize)  { return LZ4_COMPRESSBOUND(isize); }
 
 /*
 LZ4_compressBound() :
     Provides the maximum size that LZ4 may output in a "worst case" scenario (input data not compressible)
     primarily useful for memory allocation of output buffer.
-	inline function is recommended for the general case,
-	but macro is also provided when results need to be evaluated at compile time (such as table size allocation).
+    inline function is recommended for the general case,
+    macro is also provided when result needs to be evaluated at compilation (such as stack memory allocation).
 
-    isize  : is the input size. Max supported value is ~1.9GB
+    isize  : is the input size. Max supported value is LZ4_MAX_INPUT_SIZE
     return : maximum output size in a "worst case" scenario
-    note : this function is limited by "int" range (2^31-1)
+             or 0, if input size is too large ( > LZ4_MAX_INPUT_SIZE)
 */
 
 
-int LZ4_compress_limitedOutput   (const char* source, char* dest, int isize, int maxOutputSize);
+int LZ4_compress_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize);
 
 /*
 LZ4_compress_limitedOutput() :
-    Compress 'isize' bytes from 'source' into an output buffer 'dest' of maximum size 'maxOutputSize'.
+    Compress 'inputSize' bytes from 'source' into an output buffer 'dest' of maximum size 'maxOutputSize'.
     If it cannot achieve it, compression will stop, and result of the function will be zero.
     This function never writes outside of provided output buffer.
 
-    isize  : is the input size. Max supported value is ~1.9GB
+    inputSize  : Max supported value is LZ4_MAX_INPUT_VALUE
     maxOutputSize : is the size of the destination buffer (which must be already allocated)
     return : the number of bytes written in buffer 'dest'
              or 0 if the compression fails
 */
 
 
-int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize);
+int LZ4_decompress_fast (const char* source, char* dest, int outputSize);
 
 /*
-LZ4_uncompress_unknownOutputSize() :
-    isize  : is the input size, therefore the compressed size
-    maxOutputSize : is the size of the destination buffer (which must be already allocated)
+LZ4_decompress_fast() :
+    outputSize : is the original (uncompressed) size
+    return : the number of bytes read from the source buffer (in other words, the compressed size)
+             If the source stream is malformed, the function will stop decoding and return a negative result.
+    note : This function is a bit faster than LZ4_decompress_safe()
+           This function never writes outside of output buffers, but may read beyond input buffer in case of malicious data packet.
+           Use this function preferably into a trusted environment (data to decode comes from a trusted source).
+           Destination buffer must be already allocated. Its size must be a minimum of 'outputSize' bytes.
+*/
+
+int LZ4_decompress_safe_partial (const char* source, char* dest, int inputSize, int targetOutputSize, int maxOutputSize);
+
+/*
+LZ4_decompress_safe_partial() :
+    This function decompress a compressed block of size 'inputSize' at position 'source'
+    into output buffer 'dest' of size 'maxOutputSize'.
+    The function tries to stop decompressing operation as soon as 'targetOutputSize' has been reached,
+    reducing decompression time.
     return : the number of bytes decoded in the destination buffer (necessarily <= maxOutputSize)
-             If the source stream is malformed, the function will stop decoding and return a negative result, indicating the byte position of the faulty instruction
-             This function never writes beyond dest + maxOutputSize, and is therefore protected against malicious data packets
-    note   : Destination buffer must be already allocated.
-             This version is slightly slower than LZ4_uncompress()
+       Note : this number can be < 'targetOutputSize' should the compressed block to decode be smaller.
+             Always control how many bytes were decoded.
+             If the source stream is detected malformed, the function will stop decoding and return a negative result.
+             This function never writes outside of output buffer, and never reads outside of input buffer. It is therefore protected against malicious data packets
 */
 
 
+//****************************
+// Stream Functions
+//****************************
+
+void* LZ4_create (const char* inputBuffer);
+int   LZ4_compress_continue (void* LZ4_Data, const char* source, char* dest, int inputSize);
+int   LZ4_compress_limitedOutput_continue (void* LZ4_Data, const char* source, char* dest, int inputSize, int maxOutputSize);
+char* LZ4_slideInputBuffer (void* LZ4_Data);
+int   LZ4_free (void* LZ4_Data);
+
+/* 
+These functions allow the compression of dependent blocks, where each block benefits from prior 64 KB within preceding blocks.
+In order to achieve this, it is necessary to start creating the LZ4 Data Structure, thanks to the function :
+
+void* LZ4_create (const char* inputBuffer);
+The result of the function is the (void*) pointer on the LZ4 Data Structure.
+This pointer will be needed in all other functions.
+If the pointer returned is NULL, then the allocation has failed, and compression must be aborted.
+The only parameter 'const char* inputBuffer' must, obviously, point at the beginning of input buffer.
+The input buffer must be already allocated, and size at least 192KB.
+'inputBuffer' will also be the 'const char* source' of the first block.
+
+All blocks are expected to lay next to each other within the input buffer, starting from 'inputBuffer'.
+To compress each block, use either LZ4_compress_continue() or LZ4_compress_limitedOutput_continue().
+Their behavior are identical to LZ4_compress() or LZ4_compress_limitedOutput(), 
+but require the LZ4 Data Structure as their first argument, and check that each block starts right after the previous one.
+If next block does not begin immediately after the previous one, the compression will fail (return 0).
+
+When it's no longer possible to lay the next block after the previous one (not enough space left into input buffer), a call to : 
+char* LZ4_slideInputBuffer(void* LZ4_Data);
+must be performed. It will typically copy the latest 64KB of input at the beginning of input buffer.
+Note that, for this function to work properly, minimum size of an input buffer must be 192KB.
+==> The memory position where the next input data block must start is provided as the result of the function.
+
+Compression can then resume, using LZ4_compress_continue() or LZ4_compress_limitedOutput_continue(), as usual.
+
+When compression is completed, a call to LZ4_free() will release the memory used by the LZ4 Data Structure.
+*/
+
+
+int LZ4_decompress_safe_withPrefix64k (const char* source, char* dest, int inputSize, int maxOutputSize);
+int LZ4_decompress_fast_withPrefix64k (const char* source, char* dest, int outputSize);
+
+/*
+*_withPrefix64k() :
+    These decoding functions work the same as their "normal name" versions,
+    but can use up to 64KB of data in front of 'char* dest'.
+    These functions are necessary to decode inter-dependant blocks.
+*/
+
+
+//****************************
+// Obsolete Functions
+//****************************
+
+static inline int LZ4_uncompress (const char* source, char* dest, int outputSize) { return LZ4_decompress_fast(source, dest, outputSize); }
+static inline int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize) { return LZ4_decompress_safe(source, dest, isize, maxOutputSize); }
+
+/*
+These functions are deprecated and should no longer be used.
+They are provided here for compatibility with existing user programs.
+*/
+
+
+
 #if defined (__cplusplus)
 }
 #endif

ext/lz4/lz4_format_description.txt

@@ -1,121 +0,0 @@
-LZ4 Format Description
-Last revised: 2012-02-27
-Author : Y. Collet
-
-
-
-This small specification intents to provide enough information
-to anyone willing to produce LZ4-compatible compressed streams
-using any programming language.
-
-LZ4 is an LZ77-type compressor with a fixed, byte-oriented encoding.
-The most important design principle behind LZ4 is simplicity.
-It helps to create an easy to read and maintain source code.
-It also helps later on for optimisations, compactness, and speed.
-There is no entropy encoder backend nor framing layer.
-The latter is assumed to be handled by other parts of the system.
-
-This document only describes the format,
-not how the LZ4 compressor nor decompressor actually work.
-The correctness of the decompressor should not depend
-on implementation details of the compressor, and vice versa.
-
-
-
--- Compressed stream format --
-
-An LZ4 compressed stream is composed of sequences.
-Schematically, a sequence is a suite of literals, followed by a match copy.
-
-Each sequence starts with a token.
-The token is a one byte value, separated into two 4-bits fields.
-Therefore each field ranges from 0 to 15.
-
-
-The first field uses the 4 high-bits of the token.
-It provides the length of literals to follow.
-(Note : a literal is a not-compressed byte).
-If the field value is 0, then there is no literal.
-If it is 15, then we need to add some more bytes to indicate the full length.
-Each additionnal byte then represent a value from 0 to 255,
-which is added to the previous value to produce a total length.
-When the byte value is 255, another byte is output.
-There can be any number of bytes following the token. There is no "size limit".
-(Sidenote this is why a not-compressible input stream is expanded by 0.4%).
-
-Example 1 : A length of 48 will be represented as :
-- 15 : value for the 4-bits High field
-- 33 : (=48-15) remaining length to reach 48
-
-Example 2 : A length of 280 will be represented as :
-- 15  : value for the 4-bits High field
-- 255 : following byte is maxed, since 280-15 >= 255
-- 10  : (=280 - 15 - 255) ) remaining length to reach 280
-
-Example 3 : A length of 15 will be represented as :
-- 15 : value for the 4-bits High field
-- 0  : (=15-15) yes, the zero must be output
-
-Following the token and optional length bytes, are the literals themselves.
-They are exactly as numerous as previously decoded (length of literals).
-It's possible that there are zero literal.
-
-
-Following the literals is the match copy operation.
-
-It starts by the offset.
-This is a 2 bytes value, in little endian format :
-the lower byte is the first one in the stream.
-
-The offset represents the position of the match to be copied from.
-1 means "current position - 1 byte".
-The maximum offset value is 65535, 65536 cannot be coded.
-Note that 0 is an invalid value, not used. 
-
-Then we need to extract the match length.
-For this, we use the second token field, the low 4-bits.
-Value, obviously, ranges from 0 to 15.
-However here, 0 means that the copy operation will be minimal.
-The minimum length of a match, called minmatch, is 4. 
-As a consequence, a 0 value means 4 bytes, and a value of 15 means 19+ bytes.
-Similar to literal length, on reaching the highest possible value (15), 
-we output additional bytes, one at a time, with values ranging from 0 to 255.
-They are added to total to provide the final match length.
-A 255 value means there is another byte to read and add.
-There is no limit to the number of optional bytes that can be output this way.
-(This points towards a maximum achievable compression ratio of ~250).
-
-With the offset and the matchlength,
-the decoder can now proceed to copy the data from the already decoded buffer.
-On decoding the matchlength, we reach the end of the compressed sequence,
-and therefore start another one.
-
-
--- Parsing restrictions --
-
-There are specific parsing rules to respect in order to remain compatible
-with assumptions made by the decoder :
-1) The last 5 bytes are always literals
-2) The last match must start at least 12 bytes before end of stream
-Consequently, a file with less than 13 bytes cannot be compressed.
-These rules are in place to ensure that the decoder
-will never read beyond the input buffer, nor write beyond the output buffer.
-
-Note that the last sequence is also incomplete,
-and stops right after literals.
-
-
--- Additional notes --
-
-There is no assumption nor limits to the way the compressor
-searches and selects matches within the source stream.
-It could be a fast scan, a multi-probe, a full search using BST,
-standard hash chains or MMC, well whatever.
-
-Advanced parsing strategies can also be implemented, such as lazy match,
-or full optimal parsing.
-
-All these trade-off offer distinctive speed/memory/compression advantages.
-Whatever the method used by the compressor, its result will be decodable
-by any LZ4 decoder if it follows the format specification described above.
-

ext/lz4/lz4demo.c

@@ -1,402 +0,0 @@
-/*
-    LZ4Demo - Demo CLI program using LZ4 compression
-    Copyright (C) Yann Collet 2011-2012
-	GPL v2 License
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-	You can contact the author at :
-	- LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-	- LZ4 source repository : http://code.google.com/p/lz4/
-*/
-/*
-	Note : this is *only* a demo program, an example to show how LZ4 can be used.
-	It is not considered part of LZ4 compression library.
-	The license of LZ4 is BSD.
-	The license of the demo program is GPL.
-*/
-
-//**************************************
-// Compiler Options
-//**************************************
-// Disable some Visual warning messages
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_DEPRECATE     // VS2005
-
-
-//****************************
-// Includes
-//****************************
-#include <stdio.h>		// fprintf, fopen, fread, _fileno(?)
-#include <stdlib.h>		// malloc
-#include <string.h>		// strcmp
-#include <time.h>		// clock
-#ifdef _WIN32
-#include <io.h>			// _setmode
-#include <fcntl.h>		// _O_BINARY
-#endif
-#include "lz4.h"
-#include "lz4hc.h"
-#include "bench.h"
-
-
-//**************************************
-// Compiler-specific functions
-//**************************************
-#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-
-#if defined(_MSC_VER)    // Visual Studio
-#define swap32 _byteswap_ulong
-#elif GCC_VERSION >= 403
-#define swap32 __builtin_bswap32
-#else
-static inline unsigned int swap32(unsigned int x) {
-			return	((x << 24) & 0xff000000 ) |
-				((x <<  8) & 0x00ff0000 ) |
-				((x >>  8) & 0x0000ff00 ) |
-				((x >> 24) & 0x000000ff );
-		 }
-#endif
-
-
-//****************************
-// Constants
-//****************************
-#define COMPRESSOR_NAME "Compression CLI using LZ4 algorithm"
-#define COMPRESSOR_VERSION ""
-#define COMPILED __DATE__
-#define AUTHOR "Yann Collet"
-#define EXTENSION ".lz4"
-#define WELCOME_MESSAGE "*** %s %s, by %s (%s) ***\n", COMPRESSOR_NAME, COMPRESSOR_VERSION, AUTHOR, COMPILED
-
-#define CHUNKSIZE (8<<20)    // 8 MB
-#define CACHELINE 64
-#define ARCHIVE_MAGICNUMBER 0x184C2102
-#define ARCHIVE_MAGICNUMBER_SIZE 4
-
-
-//**************************************
-// Architecture Macros
-//**************************************
-static const int one = 1;
-#define CPU_LITTLE_ENDIAN  (*(char*)(&one))
-#define CPU_BIG_ENDIAN     (!CPU_LITTLE_ENDIAN)
-#define LITTLE_ENDIAN32(i) if (CPU_BIG_ENDIAN) { i = swap32(i); }
-
-
-//**************************************
-// Macros
-//**************************************
-#define DISPLAY(...) fprintf(stderr, __VA_ARGS__)
-
-
-//****************************
-// Functions
-//****************************
-int usage(char* exename)
-{
-	DISPLAY( "Usage :\n");
-	DISPLAY( "      %s [arg] input output\n", exename);
-	DISPLAY( "Arguments :\n");
-	DISPLAY( " -c0: Fast compression (default) \n");
-	DISPLAY( " -c1: High compression \n");
-	DISPLAY( " -d : decompression \n");
-	DISPLAY( " -b#: Benchmark files, using # compression level\n");
-	DISPLAY( " -t : check compressed file \n");
-	DISPLAY( " -h : help (this text)\n");
-	DISPLAY( "input  : can be 'stdin' (pipe) or a filename\n");
-	DISPLAY( "output : can be 'stdout'(pipe) or a filename or 'null'\n");
-	return 0;
-}
-
-
-int badusage(char* exename)
-{
-	DISPLAY("Wrong parameters\n");
-	usage(exename);
-	return 0;
-}
-
-
-
-int get_fileHandle(char* input_filename, char* output_filename, FILE** pfinput, FILE** pfoutput)
-{
-	char stdinmark[] = "stdin";
-	char stdoutmark[] = "stdout";
-
-	if (!strcmp (input_filename, stdinmark)) {
-		DISPLAY( "Using stdin for input\n");
-		*pfinput = stdin;
-#ifdef _WIN32 // Need to set stdin/stdout to binary mode specifically for windows
-		_setmode( _fileno( stdin ), _O_BINARY );
-#endif
-	} else {
-		*pfinput = fopen( input_filename, "rb" );
-	}
-
-	if (!strcmp (output_filename, stdoutmark)) {
-		DISPLAY( "Using stdout for output\n");
-		*pfoutput = stdout;
-#ifdef _WIN32 // Need to set stdin/stdout to binary mode specifically for windows
-		_setmode( _fileno( stdout ), _O_BINARY );
-#endif
-	} else {
-		*pfoutput = fopen( output_filename, "wb" );
-	}
-
-	if ( *pfinput==0 ) { DISPLAY( "Pb opening %s\n", input_filename);  return 2; }
-	if ( *pfoutput==0) { DISPLAY( "Pb opening %s\n", output_filename); return 3; }
-
-	return 0;
-}
-
-
-
-int compress_file(char* input_filename, char* output_filename, int compressionlevel)
-{
-	int (*compressionFunction)(const char*, char*, int);
-	unsigned long long filesize = 0;
-	unsigned long long compressedfilesize = ARCHIVE_MAGICNUMBER_SIZE;
-	unsigned int u32var;
-	char* in_buff;
-	char* out_buff;
-	FILE* finput;
-	FILE* foutput;
-	int r;
-	int displayLevel = (compressionlevel>0);
-	clock_t start, end;
-	size_t sizeCheck;
-
-
-	// Init
-	switch (compressionlevel)
-	{
-	case 0 : compressionFunction = LZ4_compress; break;
-	case 1 : compressionFunction = LZ4_compressHC; break;
-	default : compressionFunction = LZ4_compress;
-	}
-	start = clock();
-	r = get_fileHandle(input_filename, output_filename, &finput, &foutput);
-	if (r) return r;
-
-	// Allocate Memory
-	in_buff = (char*)malloc(CHUNKSIZE);
-	out_buff = (char*)malloc(LZ4_compressBound(CHUNKSIZE));
-	if (!in_buff || !out_buff) { DISPLAY("Allocation error : not enough memory\n"); return 8; }
-
-	// Write Archive Header
-	u32var = ARCHIVE_MAGICNUMBER;
-	LITTLE_ENDIAN32(u32var);
-	*(unsigned int*)out_buff = u32var;
-	sizeCheck = fwrite(out_buff, 1, ARCHIVE_MAGICNUMBER_SIZE, foutput);
-	if (sizeCheck!=ARCHIVE_MAGICNUMBER_SIZE) { DISPLAY("write error\n"); return 10; }
-
-	// Main Loop
-	while (1)
-	{
-		int outSize;
-		// Read Block
-	    int inSize = (int) fread(in_buff, (size_t)1, (size_t)CHUNKSIZE, finput);
-		if( inSize<=0 ) break;
-		filesize += inSize;
-		if (displayLevel) DISPLAY("Read : %i MB  \r", (int)(filesize>>20));
-
-		// Compress Block
-		outSize = compressionFunction(in_buff, out_buff+4, inSize);
-		compressedfilesize += outSize+4;
-		if (displayLevel) DISPLAY("Read : %i MB  ==> %.2f%%\r", (int)(filesize>>20), (double)compressedfilesize/filesize*100);
-
-		// Write Block
-		LITTLE_ENDIAN32(outSize);
-		* (unsigned int*) out_buff = outSize;
-		LITTLE_ENDIAN32(outSize);
-		sizeCheck = fwrite(out_buff, 1, outSize+4, foutput);
-		if (sizeCheck!=(size_t)(outSize+4)) { DISPLAY("write error\n"); return 11; }
-	}
-
-	// Status
-	end = clock();
-	DISPLAY( "Compressed %llu bytes into %llu bytes ==> %.2f%%\n",
-		(unsigned long long) filesize, (unsigned long long) compressedfilesize, (double)compressedfilesize/filesize*100);
-	{
-		double seconds = (double)(end - start)/CLOCKS_PER_SEC;
-		DISPLAY( "Done in %.2f s ==> %.2f MB/s\n", seconds, (double)filesize / seconds / 1024 / 1024);
-	}
-
-	// Close & Free
-	free(in_buff);
-	free(out_buff);
-	fclose(finput);
-	fclose(foutput);
-
-	return 0;
-}
-
-
-int decode_file(char* input_filename, char* output_filename)
-{
-	unsigned long long filesize = 0;
-	char* in_buff;
-	char* out_buff;
-	size_t uselessRet;
-	int sinkint;
-	unsigned int chunkSize;
-	FILE* finput;
-	FILE* foutput;
-	clock_t start, end;
-	int r;
-	size_t sizeCheck;
-
-
-	// Init
-	start = clock();
-	r = get_fileHandle(input_filename, output_filename, &finput, &foutput);
-	if (r) return r;
-
-	// Allocate Memory
-	in_buff = (char*)malloc(LZ4_compressBound(CHUNKSIZE));
-	out_buff = (char*)malloc(CHUNKSIZE);
-	if (!in_buff || !out_buff) { DISPLAY("Allocation error : not enough memory\n"); return 7; }
-
-	// Check Archive Header
-	chunkSize = 0;
-	uselessRet = fread(&chunkSize, 1, ARCHIVE_MAGICNUMBER_SIZE, finput);
-	LITTLE_ENDIAN32(chunkSize);
-	if (chunkSize != ARCHIVE_MAGICNUMBER) { DISPLAY("Unrecognized header : file cannot be decoded\n"); return 6; }
-
-	// Main Loop
-	while (1)
-	{
-		// Block Size
-		uselessRet = fread(&chunkSize, 1, 4, finput);
-		if( uselessRet==0 ) break;   // Nothing to read : file read is completed
-		LITTLE_ENDIAN32(chunkSize);
-		if (chunkSize == ARCHIVE_MAGICNUMBER) 
-			continue;   // appended compressed stream
-		
-		// Read Block
-	    uselessRet = fread(in_buff, 1, chunkSize, finput);
-
-		// Decode Block
-		sinkint = LZ4_uncompress_unknownOutputSize(in_buff, out_buff, chunkSize, CHUNKSIZE);
-		if (sinkint < 0) { DISPLAY("Decoding Failed ! Corrupted input !\n"); return 9; }
-		filesize += sinkint;
-
-		// Write Block
-		sizeCheck = fwrite(out_buff, 1, sinkint, foutput);
-		if (sizeCheck != (size_t)sinkint) { DISPLAY("write error\n"); return 12; }
-	}
-
-	// Status
-	end = clock();
-	DISPLAY( "Successfully decoded %llu bytes \n", (unsigned long long)filesize);
-	{
-		double seconds = (double)(end - start)/CLOCKS_PER_SEC;
-		DISPLAY( "Done in %.2f s ==> %.2f MB/s\n", seconds, (double)filesize / seconds / 1024 / 1024);
-	}
-
-	// Close & Free
-	free(in_buff);
-	free(out_buff);
-	fclose(finput);
-	fclose(foutput);
-
-	return 0;
-}
-
-
-int main(int argc, char** argv)
-{
-  int i,
-	  cLevel=0,
-	  decode=0,
-	  bench=0,
-	  filenamesStart=2;
-  char* exename=argv[0];
-  char* input_filename=0;
-  char* output_filename=0;
-#ifdef _WIN32
-  char nulmark[] = "nul";
-#else
-  char nulmark[] = "/dev/null";
-#endif
-  char nullinput[] = "null";
-
-  // Welcome message
-  DISPLAY( WELCOME_MESSAGE);
-
-  if (argc<2) { badusage(exename); return 1; }
-
-  for(i=1; i<argc; i++)
-  {
-    char* argument = argv[i];
-
-    if(!argument) continue;   // Protection if argument empty
-
-	// Select command
-	if (argument[0]=='-')
-	{
-		argument ++;
-
-		// Display help on usage
-		if ( argument[0] =='h' ) { usage(exename); return 0; }
-
-		// Compression (default)
-		if ( argument[0] =='c' ) { if (argument[1] >='0') cLevel=argument[1] - '0'; continue; }
-
-		// Decoding
-		if ( argument[0] =='d' ) { decode=1; continue; }
-
-		// Bench
-		if ( argument[0] =='b' ) { bench=1; if (argument[1] >= '0') cLevel=argument[1] - '0'; continue; } 
-
-		// Modify Block Size (benchmark only)
-		if ( argument[0] =='B' ) { int B = argument[1] - '0'; int S = 1 << (10 + 2*B); BMK_SetBlocksize(S); continue; }
-
-		// Modify Nb Iterations (benchmark only)
-		if ( argument[0] =='i' ) { int iters = argument[1] - '0'; BMK_SetNbIterations(iters); continue; }
-
-		// Pause at the end (benchmark only)
-		if ( argument[0] =='p' ) { BMK_SetPause(); continue; }
-
-        // Test
-		if ( argument[0] =='t' ) { decode=1; output_filename=nulmark; continue; }
-	}
-
-	// first provided filename is input
-    if (!input_filename) { input_filename=argument; filenamesStart=i; continue; }
-
-	// second provided filename is output
-    if (!output_filename)
-	{
-		output_filename=argument;
-		if (!strcmp (output_filename, nullinput)) output_filename = nulmark;
-		continue;
-	}
-  }
-
-  // No input filename ==> Error
-  if(!input_filename) { badusage(exename); return 1; }
-
-  if (bench) return BMK_benchFile(argv+filenamesStart, argc-filenamesStart, cLevel);
-
-  // No output filename ==> Error
-  if (!output_filename) { badusage(exename); return 1; }
-
-  if (decode) return decode_file(input_filename, output_filename);
-
-  return compress_file(input_filename, output_filename, cLevel);   // Compression is 'default' action
-
-}

ext/lz4/lz4hc.c

@@ -1,6 +1,6 @@
 /*
    LZ4 HC - High Compression Mode of LZ4
-   Copyright (C) 2011-2012, Yann Collet.
+   Copyright (C) 2011-2013, Yann Collet.
    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
 
    Redistribution and use in source and binary forms, with or without
@@ -31,12 +31,24 @@
    - LZ4 source repository : http://code.google.com/p/lz4/
 */
 
+//**************************************
+// Memory routines
+//**************************************
+#include <stdlib.h>   // calloc, free
+#define ALLOCATOR(s)  calloc(1,s)
+#define FREEMEM       free
+#include <string.h>   // memset, memcpy
+#define MEM_INIT      memset
+
 
 //**************************************
 // CPU Feature Detection
 //**************************************
 // 32 or 64 bits ?
-#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || defined(__LP64__) || defined(_LP64) )   // Detects 64 bits mode
+#if (defined(__x86_64__) || defined(_M_X64) || defined(_WIN64) \
+  || defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) \
+  || defined(__64BIT__) || defined(_LP64) || defined(__LP64__) \
+  || defined(__ia64) || defined(__itanium__) || defined(_M_IA64) )   // Detects 64 bits mode
 #  define LZ4_ARCH64 1
 #else
 #  define LZ4_ARCH64 0
@@ -52,7 +64,7 @@
 #elif (defined(__BIG_ENDIAN__) || defined(__BIG_ENDIAN) || defined(_BIG_ENDIAN)) && !(defined(__LITTLE_ENDIAN__) || defined(__LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN))
 #  define LZ4_BIG_ENDIAN 1
 #elif defined(__sparc) || defined(__sparc__) \
-   || defined(__ppc__) || defined(_POWER) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(__PPC__) || defined(__PPC) || defined(PPC) || defined(__powerpc__) || defined(__powerpc) || defined(powerpc) \
+   || defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \
    || defined(__hpux)  || defined(__hppa) \
    || defined(_MIPSEB) || defined(__s390__)
 #  define LZ4_BIG_ENDIAN 1
@@ -76,78 +88,84 @@
 //**************************************
 // Compiler Options
 //**************************************
-#if __STDC_VERSION__ >= 199901L    // C99
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   // C99
   /* "restrict" is a known keyword */
 #else
 #  define restrict  // Disable restrict
 #endif
 
-#ifdef _MSC_VER
-#  define inline __inline             // Visual is not C99, but supports some kind of inline
-#  define forceinline __forceinline   
-#  include <intrin.h>                 // For Visual 2005
-#  if LZ4_ARCH64	// 64-bit
+#ifdef _MSC_VER    // Visual Studio
+#  define FORCE_INLINE static __forceinline
+#  include <intrin.h>                    // For Visual 2005
+#  if LZ4_ARCH64   // 64-bits
 #    pragma intrinsic(_BitScanForward64) // For Visual 2005
 #    pragma intrinsic(_BitScanReverse64) // For Visual 2005
-#  else
+#  else            // 32-bits
 #    pragma intrinsic(_BitScanForward)   // For Visual 2005
 #    pragma intrinsic(_BitScanReverse)   // For Visual 2005
 #  endif
+#  pragma warning(disable : 4127)        // disable: C4127: conditional expression is constant
+#  pragma warning(disable : 4701)        // disable: C4701: potentially uninitialized local variable used
 #else 
 #  ifdef __GNUC__
-#    define forceinline inline __attribute__((always_inline))
+#    define FORCE_INLINE static inline __attribute__((always_inline))
 #  else
-#    define forceinline inline
+#    define FORCE_INLINE static inline
 #  endif
 #endif
 
 #ifdef _MSC_VER  // Visual Studio
-#define lz4_bswap16(x) _byteswap_ushort(x)
+#  define lz4_bswap16(x) _byteswap_ushort(x)
 #else
-#define lz4_bswap16(x)  ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)))
+#  define lz4_bswap16(x)  ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)))
 #endif
 
 
 //**************************************
 // Includes
 //**************************************
-#include <stdlib.h>   // calloc, free
-#include <string.h>   // memset, memcpy
 #include "lz4hc.h"
-
-#define ALLOCATOR(s) calloc(1,s)
-#define FREEMEM free
-#define MEM_INIT memset
+#include "lz4.h"
 
 
 //**************************************
 // Basic Types
 //**************************************
-#if defined(_MSC_VER)    // Visual Studio does not support 'stdint' natively
-#define BYTE	unsigned __int8
-#define U16		unsigned __int16
-#define U32		unsigned __int32
-#define S32		__int32
-#define U64		unsigned __int64
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   // C99
+# include <stdint.h>
+  typedef uint8_t  BYTE;
+  typedef uint16_t U16;
+  typedef uint32_t U32;
+  typedef  int32_t S32;
+  typedef uint64_t U64;
 #else
-#include <stdint.h>
-#define BYTE	uint8_t
-#define U16		uint16_t
-#define U32		uint32_t
-#define S32		int32_t
-#define U64		uint64_t
+  typedef unsigned char       BYTE;
+  typedef unsigned short      U16;
+  typedef unsigned int        U32;
+  typedef   signed int        S32;
+  typedef unsigned long long  U64;
 #endif
 
-#ifndef LZ4_FORCE_UNALIGNED_ACCESS
-#pragma pack(push, 1) 
+#if defined(__GNUC__)  && !defined(LZ4_FORCE_UNALIGNED_ACCESS)
+#  define _PACKED __attribute__ ((packed))
+#else
+#  define _PACKED
 #endif
 
-typedef struct _U16_S { U16 v; } U16_S;
-typedef struct _U32_S { U32 v; } U32_S;
-typedef struct _U64_S { U64 v; } U64_S;
+#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#  ifdef __IBMC__
+#    pragma pack(1)
+#  else
+#    pragma pack(push, 1)
+#  endif
+#endif
 
-#ifndef LZ4_FORCE_UNALIGNED_ACCESS
-#pragma pack(pop) 
+typedef struct _U16_S { U16 v; } _PACKED U16_S;
+typedef struct _U32_S { U32 v; } _PACKED U32_S;
+typedef struct _U64_S { U64 v; } _PACKED U64_S;
+
+#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#  pragma pack(pop)
 #endif
 
 #define A64(x) (((U64_S *)(x))->v)
@@ -182,34 +200,40 @@ typedef struct _U64_S { U64 v; } U64_S;
 #define MINLENGTH (MFLIMIT+1)
 #define OPTIMAL_ML (int)((ML_MASK-1)+MINMATCH)
 
+#define KB *(1U<<10)
+#define MB *(1U<<20)
+#define GB *(1U<<30)
+
 
 //**************************************
 // Architecture-specific macros
 //**************************************
-#if LZ4_ARCH64	// 64-bit
-#define STEPSIZE 8
-#define LZ4_COPYSTEP(s,d)		A64(d) = A64(s); d+=8; s+=8;
-#define LZ4_COPYPACKET(s,d)		LZ4_COPYSTEP(s,d)
-#define UARCH U64
-#define AARCH A64
-#define HTYPE					U32
-#define INITBASE(b,s)			const BYTE* const b = s
-#else		// 32-bit
-#define STEPSIZE 4
-#define LZ4_COPYSTEP(s,d)		A32(d) = A32(s); d+=4; s+=4;
-#define LZ4_COPYPACKET(s,d)		LZ4_COPYSTEP(s,d); LZ4_COPYSTEP(s,d);
-#define UARCH U32
-#define AARCH A32
-#define HTYPE					const BYTE*
-#define INITBASE(b,s)		    const int b = 0
+#if LZ4_ARCH64   // 64-bit
+#  define STEPSIZE 8
+#  define LZ4_COPYSTEP(s,d)     A64(d) = A64(s); d+=8; s+=8;
+#  define LZ4_COPYPACKET(s,d)   LZ4_COPYSTEP(s,d)
+#  define UARCH U64
+#  define AARCH A64
+#  define HTYPE                 U32
+#  define INITBASE(b,s)         const BYTE* const b = s
+#else   // 32-bit
+#  define STEPSIZE 4
+#  define LZ4_COPYSTEP(s,d)     A32(d) = A32(s); d+=4; s+=4;
+#  define LZ4_COPYPACKET(s,d)   LZ4_COPYSTEP(s,d); LZ4_COPYSTEP(s,d);
+#  define UARCH U32
+#  define AARCH A32
+//#  define HTYPE                 const BYTE*
+//#  define INITBASE(b,s)         const int b = 0
+#  define HTYPE                 U32
+#  define INITBASE(b,s)         const BYTE* const b = s
 #endif
 
 #if defined(LZ4_BIG_ENDIAN)
-#define LZ4_READ_LITTLEENDIAN_16(d,s,p) { U16 v = A16(p); v = lz4_bswap16(v); d = (s) - v; }
-#define LZ4_WRITE_LITTLEENDIAN_16(p,i)  { U16 v = (U16)(i); v = lz4_bswap16(v); A16(p) = v; p+=2; }
-#else		// Little Endian
-#define LZ4_READ_LITTLEENDIAN_16(d,s,p) { d = (s) - A16(p); }
-#define LZ4_WRITE_LITTLEENDIAN_16(p,v)  { A16(p) = v; p+=2; }
+#  define LZ4_READ_LITTLEENDIAN_16(d,s,p) { U16 v = A16(p); v = lz4_bswap16(v); d = (s) - v; }
+#  define LZ4_WRITE_LITTLEENDIAN_16(p,i)  { U16 v = (U16)(i); v = lz4_bswap16(v); A16(p) = v; p+=2; }
+#else   // Little Endian
+#  define LZ4_READ_LITTLEENDIAN_16(d,s,p) { d = (s) - A16(p); }
+#  define LZ4_WRITE_LITTLEENDIAN_16(p,v)  { A16(p) = v; p+=2; }
 #endif
 
 
@@ -218,7 +242,9 @@ typedef struct _U64_S { U64 v; } U64_S;
 //************************************************************
 typedef struct 
 {
+    const BYTE* inputBuffer;
     const BYTE* base;
+    const BYTE* end;
     HTYPE hashTable[HASHTABLESIZE];
     U16 chainTable[MAXD];
     const BYTE* nextToUpdate;
@@ -230,11 +256,11 @@ typedef struct
 //**************************************
 #define LZ4_WILDCOPY(s,d,e)    do { LZ4_COPYPACKET(s,d) } while (d<e);
 #define LZ4_BLINDCOPY(s,d,l)   { BYTE* e=d+l; LZ4_WILDCOPY(s,d,e); d=e; }
-#define HASH_FUNCTION(i)	   (((i) * 2654435761U) >> ((MINMATCH*8)-HASH_LOG))
-#define HASH_VALUE(p)		   HASH_FUNCTION(A32(p))
-#define HASH_POINTER(p)		   (HashTable[HASH_VALUE(p)] + base)
-#define DELTANEXT(p)		   chainTable[(size_t)(p) & MAXD_MASK] 
-#define GETNEXT(p)			   ((p) - (size_t)DELTANEXT(p))
+#define HASH_FUNCTION(i)       (((i) * 2654435761U) >> ((MINMATCH*8)-HASH_LOG))
+#define HASH_VALUE(p)          HASH_FUNCTION(A32(p))
+#define HASH_POINTER(p)        (HashTable[HASH_VALUE(p)] + base)
+#define DELTANEXT(p)           chainTable[(size_t)(p) & MAXD_MASK] 
+#define GETNEXT(p)             ((p) - (size_t)DELTANEXT(p))
 
 
 //**************************************
@@ -242,99 +268,98 @@ typedef struct
 //**************************************
 #if LZ4_ARCH64
 
-inline static int LZ4_NbCommonBytes (register U64 val)
+FORCE_INLINE int LZ4_NbCommonBytes (register U64 val)
 {
 #if defined(LZ4_BIG_ENDIAN)
-    #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
     unsigned long r = 0;
     _BitScanReverse64( &r, val );
     return (int)(r>>3);
-    #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
     return (__builtin_clzll(val) >> 3); 
-    #else
+#  else
     int r;
     if (!(val>>32)) { r=4; } else { r=0; val>>=32; }
     if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
     r += (!val);
     return r;
-    #endif
+#  endif
 #else
-    #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
     unsigned long r = 0;
     _BitScanForward64( &r, val );
     return (int)(r>>3);
-    #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
     return (__builtin_ctzll(val) >> 3); 
-    #else
+#  else
     static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
     return DeBruijnBytePos[((U64)((val & -val) * 0x0218A392CDABBD3F)) >> 58];
-    #endif
+#  endif
 #endif
 }
 
 #else
 
-inline static int LZ4_NbCommonBytes (register U32 val)
+FORCE_INLINE int LZ4_NbCommonBytes (register U32 val)
 {
 #if defined(LZ4_BIG_ENDIAN)
-    #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
     unsigned long r;
     _BitScanReverse( &r, val );
     return (int)(r>>3);
-    #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
     return (__builtin_clz(val) >> 3); 
-    #else
+#  else
     int r;
     if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
     r += (!val);
     return r;
-    #endif
+#  endif
 #else
-    #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
     unsigned long r;
     _BitScanForward( &r, val );
     return (int)(r>>3);
-    #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
+#  elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
     return (__builtin_ctz(val) >> 3); 
-    #else
+#  else
     static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
     return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
-    #endif
+#  endif
 #endif
 }
 
 #endif
 
 
-inline static int LZ4HC_Init (LZ4HC_Data_Structure* hc4, const BYTE* base)
+FORCE_INLINE void LZ4_initHC (LZ4HC_Data_Structure* hc4, const BYTE* base)
 {
     MEM_INIT((void*)hc4->hashTable, 0, sizeof(hc4->hashTable));
     MEM_INIT(hc4->chainTable, 0xFF, sizeof(hc4->chainTable));
-    hc4->nextToUpdate = base + LZ4_ARCH64;
+    hc4->nextToUpdate = base + 1;
     hc4->base = base;
-    return 1;
+    hc4->inputBuffer = base;
+    hc4->end = base;
 }
 
 
-inline static void* LZ4HC_Create (const BYTE* base)
+void* LZ4_createHC (const char* inputBuffer)
 {
     void* hc4 = ALLOCATOR(sizeof(LZ4HC_Data_Structure));
-
-    LZ4HC_Init ((LZ4HC_Data_Structure*)hc4, base);
+    LZ4_initHC ((LZ4HC_Data_Structure*)hc4, (const BYTE*)inputBuffer);
     return hc4;
 }
 
 
-inline static int LZ4HC_Free (void** LZ4HC_Data)
+int LZ4_freeHC (void* LZ4HC_Data)
 {
-    FREEMEM(*LZ4HC_Data);
-    *LZ4HC_Data = NULL;
-    return (1);
+    FREEMEM(LZ4HC_Data);
+    return (0);
 }
 
 
 // Update chains up to ip (excluded)
-forceinline static void LZ4HC_Insert (LZ4HC_Data_Structure* hc4, const BYTE* ip)
+FORCE_INLINE void LZ4HC_Insert (LZ4HC_Data_Structure* hc4, const BYTE* ip)
 {
     U16*   chainTable = hc4->chainTable;
     HTYPE* HashTable  = hc4->hashTable;
@@ -342,17 +367,37 @@ forceinline static void LZ4HC_Insert (LZ4HC_Data_Structure* hc4, const BYTE* ip)
 
     while(hc4->nextToUpdate < ip)
     {
-        const BYTE* p = hc4->nextToUpdate;
+        const BYTE* const p = hc4->nextToUpdate;
         size_t delta = (p) - HASH_POINTER(p); 
         if (delta>MAX_DISTANCE) delta = MAX_DISTANCE; 
         DELTANEXT(p) = (U16)delta; 
-        HashTable[HASH_VALUE(p)] = (p) - base;
+        HashTable[HASH_VALUE(p)] = (HTYPE)((p) - base);
         hc4->nextToUpdate++;
     }
 }
 
 
-forceinline static size_t LZ4HC_CommonLength (const BYTE* p1, const BYTE* p2, const BYTE* const matchlimit)
+char* LZ4_slideInputBufferHC(void* LZ4HC_Data)
+{
+    LZ4HC_Data_Structure* hc4 = (LZ4HC_Data_Structure*)LZ4HC_Data;
+    U32 distance = (U32)(hc4->end - hc4->inputBuffer) - 64 KB;
+    distance = (distance >> 16) << 16;   // Must be a multiple of 64 KB
+    LZ4HC_Insert(hc4, hc4->end - MINMATCH);
+    memcpy((void*)(hc4->end - 64 KB - distance), (const void*)(hc4->end - 64 KB), 64 KB);
+    hc4->nextToUpdate -= distance;
+    hc4->base -= distance;
+    if ((U32)(hc4->inputBuffer - hc4->base) > 1 GB + 64 KB)   // Avoid overflow
+    {
+        int i;
+        hc4->base += 1 GB;
+        for (i=0; i<HASHTABLESIZE; i++) hc4->hashTable[i] -= 1 GB;
+    }
+    hc4->end -= distance;
+    return (char*)(hc4->end);
+}
+
+
+FORCE_INLINE size_t LZ4HC_CommonLength (const BYTE* p1, const BYTE* p2, const BYTE* const matchlimit)
 {
     const BYTE* p1t = p1;
 
@@ -370,7 +415,7 @@ forceinline static size_t LZ4HC_CommonLength (const BYTE* p1, const BYTE* p2, co
 }
 
 
-forceinline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4, const BYTE* ip, const BYTE* const matchlimit, const BYTE** matchpos)
+FORCE_INLINE int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4, const BYTE* ip, const BYTE* const matchlimit, const BYTE** matchpos)
 {
     U16* const chainTable = hc4->chainTable;
     HTYPE* const HashTable = hc4->hashTable;
@@ -378,7 +423,7 @@ forceinline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4,
     INITBASE(base,hc4->base);
     int nbAttempts=MAX_NB_ATTEMPTS;
     size_t repl=0, ml=0;
-    U16 delta;
+    U16 delta=0;  // useless assignment, to remove an uninitialization warning
 
     // HC4 match finder
     LZ4HC_Insert(hc4, ip);
@@ -387,7 +432,7 @@ forceinline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4,
 #define REPEAT_OPTIMIZATION
 #ifdef REPEAT_OPTIMIZATION
     // Detect repetitive sequences of length <= 4
-    if (ref >= ip-4)               // potential repetition
+    if ((U32)(ip-ref) <= 4)        // potential repetition
     {
         if (A32(ref) == A32(ip))   // confirmed
         {
@@ -399,7 +444,7 @@ forceinline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4,
     }
 #endif
 
-    while ((ref >= ip-MAX_DISTANCE) && (nbAttempts))
+    while (((U32)(ip-ref) <= MAX_DISTANCE) && (nbAttempts))
     {
         nbAttempts--;
         if (*(ref+ml) == *(ip+ml))
@@ -427,7 +472,7 @@ forceinline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4,
         do
         {
             DELTANEXT(ptr) = delta;    
-            HashTable[HASH_VALUE(ptr)] = (ptr) - base;     // Head of chain
+            HashTable[HASH_VALUE(ptr)] = (HTYPE)((ptr) - base);     // Head of chain
             ptr++;
         } while(ptr < end);
         hc4->nextToUpdate = end;
@@ -438,7 +483,7 @@ forceinline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4,
 }
 
 
-forceinline static int LZ4HC_InsertAndGetWiderMatch (LZ4HC_Data_Structure* hc4, const BYTE* ip, const BYTE* startLimit, const BYTE* matchlimit, int longest, const BYTE** matchpos, const BYTE** startpos)
+FORCE_INLINE int LZ4HC_InsertAndGetWiderMatch (LZ4HC_Data_Structure* hc4, const BYTE* ip, const BYTE* startLimit, const BYTE* matchlimit, int longest, const BYTE** matchpos, const BYTE** startpos)
 {
     U16* const  chainTable = hc4->chainTable;
     HTYPE* const HashTable = hc4->hashTable;
@@ -451,7 +496,7 @@ forceinline static int LZ4HC_InsertAndGetWiderMatch (LZ4HC_Data_Structure* hc4,
     LZ4HC_Insert(hc4, ip);
     ref = HASH_POINTER(ip);
 
-    while ((ref >= ip-MAX_DISTANCE) && (nbAttempts))
+    while (((U32)(ip-ref) <= MAX_DISTANCE) && (nbAttempts))
     {
         nbAttempts--;
         if (*(startLimit + longest) == *(ref - delta + longest))
@@ -481,7 +526,7 @@ _endCount:
             const BYTE* ipt = ip + MINMATCH + LZ4HC_CommonLength(ip+MINMATCH, ref+MINMATCH, matchlimit);
 #endif
 
-            while ((startt>startLimit) && (reft > hc4->base) && (startt[-1] == reft[-1])) {startt--; reft--;}
+            while ((startt>startLimit) && (reft > hc4->inputBuffer) && (startt[-1] == reft[-1])) {startt--; reft--;}
 
             if ((ipt-startt) > longest)
             {
@@ -497,16 +542,26 @@ _endCount:
 }
 
 
-forceinline static int LZ4_encodeSequence(const BYTE** ip, BYTE** op, const BYTE** anchor, int ml, const BYTE* ref)
+typedef enum { noLimit = 0, limitedOutput = 1 } limitedOutput_directive;
+
+FORCE_INLINE int LZ4HC_encodeSequence (
+                       const BYTE** ip,
+                       BYTE** op,
+                       const BYTE** anchor,
+                       int matchLength,
+                       const BYTE* ref,
+                       limitedOutput_directive limitedOutputBuffer,
+                       BYTE* oend)
 {
-    int length, len; 
+    int length;
     BYTE* token;
 
     // Encode Literal length
     length = (int)(*ip - *anchor);
     token = (*op)++;
-    if (length>=(int)RUN_MASK) { *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *(*op)++ = 255;  *(*op)++ = (BYTE)len; } 
-    else *token = (length<<ML_BITS);
+    if ((limitedOutputBuffer) && ((*op + length + (2 + 1 + LASTLITERALS) + (length>>8)) > oend)) return 1;   // Check output limit
+    if (length>=(int)RUN_MASK) { int len; *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *(*op)++ = 255;  *(*op)++ = (BYTE)len; } 
+    else *token = (BYTE)(length<<ML_BITS);
 
     // Copy Literals
     LZ4_BLINDCOPY(*anchor, *op, length);
@@ -515,36 +570,39 @@ forceinline static int LZ4_encodeSequence(const BYTE** ip, BYTE** op, const BYTE
     LZ4_WRITE_LITTLEENDIAN_16(*op,(U16)(*ip-ref));
 
     // Encode MatchLength
-    len = (int)(ml-MINMATCH);
-    if (len>=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *(*op)++ = 255; *(*op)++ = 255; } if (len > 254) { len-=255; *(*op)++ = 255; } *(*op)++ = (BYTE)len; } 
-    else *token += len;	
+    length = (int)(matchLength-MINMATCH);
+    if ((limitedOutputBuffer) && (*op + (1 + LASTLITERALS) + (length>>8) > oend)) return 1;   // Check output limit
+    if (length>=(int)ML_MASK) { *token+=ML_MASK; length-=ML_MASK; for(; length > 509 ; length-=510) { *(*op)++ = 255; *(*op)++ = 255; } if (length > 254) { length-=255; *(*op)++ = 255; } *(*op)++ = (BYTE)length; } 
+    else *token += (BYTE)(length);	
 
     // Prepare next loop
-    *ip += ml;
+    *ip += matchLength;
     *anchor = *ip; 
 
     return 0;
 }
 
 
-//****************************
-// Compression CODE
-//****************************
-
-int LZ4_compressHCCtx(LZ4HC_Data_Structure* ctx,
+static int LZ4HC_compress_generic (
+                 void* ctxvoid,
                  const char* source, 
                  char* dest,
-                 int isize)
-{	
+                 int inputSize,
+                 int maxOutputSize,
+                 limitedOutput_directive limit
+                )
+{
+    LZ4HC_Data_Structure* ctx = (LZ4HC_Data_Structure*) ctxvoid;
     const BYTE* ip = (const BYTE*) source;
     const BYTE* anchor = ip;
-    const BYTE* const iend = ip + isize;
+    const BYTE* const iend = ip + inputSize;
     const BYTE* const mflimit = iend - MFLIMIT;
     const BYTE* const matchlimit = (iend - LASTLITERALS);
 
     BYTE* op = (BYTE*) dest;
+    BYTE* const oend = op + maxOutputSize;
 
-    int	ml, ml2, ml3, ml0;
+    int   ml, ml2, ml3, ml0;
     const BYTE* ref=NULL;
     const BYTE* start2=NULL;
     const BYTE* ref2=NULL;
@@ -553,6 +611,11 @@ int LZ4_compressHCCtx(LZ4HC_Data_Structure* ctx,
     const BYTE* start0;
     const BYTE* ref0;
 
+
+    // Ensure blocks follow each other
+    if (ip != ctx->end) return 0;
+    ctx->end += inputSize;
+
     ip++;
 
     // Main Loop
@@ -573,7 +636,7 @@ _Search2:
 
         if (ml2 == ml)  // No better match
         {
-            LZ4_encodeSequence(&ip, &op, &anchor, ml, ref);
+            if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
             continue;
         }
 
@@ -625,9 +688,9 @@ _Search3:
             // ip & ref are known; Now for ml
             if (start2 < ip+ml)  ml = (int)(start2 - ip);
             // Now, encode 2 sequences
-            LZ4_encodeSequence(&ip, &op, &anchor, ml, ref);
+            if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
             ip = start2;
-            LZ4_encodeSequence(&ip, &op, &anchor, ml2, ref2);
+            if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml2, ref2, limit, oend)) return 0;
             continue;
         }
 
@@ -649,7 +712,7 @@ _Search3:
                     }
                 }
 
-                LZ4_encodeSequence(&ip, &op, &anchor, ml, ref);
+                if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
                 ip  = start3;
                 ref = ref3;
                 ml  = ml3;
@@ -688,7 +751,7 @@ _Search3:
                 ml = (int)(start2 - ip);
             }
         }
-        LZ4_encodeSequence(&ip, &op, &anchor, ml, ref);
+        if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
 
         ip = start2;
         ref = ref2;
@@ -705,8 +768,9 @@ _Search3:
     // Encode Last Literals
     {
         int lastRun = (int)(iend - anchor);
+        if ((limit) && (((char*)op - dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize)) return 0;  // Check output limit
         if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun > 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } 
-        else *op++ = (lastRun<<ML_BITS);
+        else *op++ = (BYTE)(lastRun<<ML_BITS);
         memcpy(op, anchor, iend - anchor);
         op += iend-anchor;
     } 
@@ -716,15 +780,38 @@ _Search3:
 }
 
 
-int LZ4_compressHC(const char* source, 
-                 char* dest,
-                 int isize)
+int LZ4_compressHC(const char* source, char* dest, int inputSize)
+{
+    void* ctx = LZ4_createHC(source);
+    int result;
+    if (ctx==NULL) return 0;
+
+    result = LZ4HC_compress_generic (ctx, source, dest, inputSize, 0, noLimit);
+
+    LZ4_freeHC(ctx);
+    return result;
+}
+
+int LZ4_compressHC_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize)
+{
+    return LZ4HC_compress_generic (LZ4HC_Data, source, dest, inputSize, 0, noLimit);
+}
+
+
+int LZ4_compressHC_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize)
 {
-    void* ctx = LZ4HC_Create((const BYTE*)source);
-    int result = LZ4_compressHCCtx(ctx, source, dest, isize);
-    LZ4HC_Free (&ctx);
+    void* ctx = LZ4_createHC(source);
+    int result;
+    if (ctx==NULL) return 0;
 
+    result = LZ4HC_compress_generic (ctx, source, dest, inputSize, maxOutputSize, limitedOutput);
+
+    LZ4_freeHC(ctx);
     return result;
 }
 
+int LZ4_compressHC_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize)
+{
+    return LZ4HC_compress_generic (LZ4HC_Data, source, dest, inputSize, maxOutputSize, limitedOutput);
+}
 

ext/lz4/lz4hc.h

@@ -1,7 +1,7 @@
 /*
    LZ4 HC - High Compression Mode of LZ4
    Header File
-   Copyright (C) 2011-2012, Yann Collet.
+   Copyright (C) 2011-2013, Yann Collet.
    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
 
    Redistribution and use in source and binary forms, with or without
@@ -39,19 +39,70 @@ extern "C" {
 #endif
 
 
-int LZ4_compressHC (const char* source, char* dest, int isize);
-
+int LZ4_compressHC (const char* source, char* dest, int inputSize);
 /*
 LZ4_compressHC :
-	return : the number of bytes in compressed buffer dest
-	note : destination buffer must be already allocated. 
-		To avoid any problem, size it to handle worst cases situations (input data not compressible)
-		Worst case size evaluation is provided by function LZ4_compressBound() (see "lz4.h")
+    return : the number of bytes in compressed buffer dest
+             or 0 if compression fails.
+    note : destination buffer must be already allocated. 
+        To avoid any problem, size it to handle worst cases situations (input data not compressible)
+        Worst case size evaluation is provided by function LZ4_compressBound() (see "lz4.h")
+*/
+
+int LZ4_compressHC_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize);
+/*
+LZ4_compress_limitedOutput() :
+    Compress 'inputSize' bytes from 'source' into an output buffer 'dest' of maximum size 'maxOutputSize'.
+    If it cannot achieve it, compression will stop, and result of the function will be zero.
+    This function never writes outside of provided output buffer.
+
+    inputSize  : Max supported value is 1 GB
+    maxOutputSize : is maximum allowed size into the destination buffer (which must be already allocated)
+    return : the number of output bytes written in buffer 'dest'
+             or 0 if compression fails.
 */
 
 
 /* Note :
-Decompression functions are provided within regular LZ4 source code (see "lz4.h") (BSD license)
+Decompression functions are provided within LZ4 source code (see "lz4.h") (BSD license)
+*/
+
+
+/* Advanced Functions */
+
+void* LZ4_createHC (const char* inputBuffer);
+int   LZ4_compressHC_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize);
+int   LZ4_compressHC_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize);
+char* LZ4_slideInputBufferHC (void* LZ4HC_Data);
+int   LZ4_freeHC (void* LZ4HC_Data);
+
+/* 
+These functions allow the compression of dependent blocks, where each block benefits from prior 64 KB within preceding blocks.
+In order to achieve this, it is necessary to start creating the LZ4HC Data Structure, thanks to the function :
+
+void* LZ4_createHC (const char* inputBuffer);
+The result of the function is the (void*) pointer on the LZ4HC Data Structure.
+This pointer will be needed in all other functions.
+If the pointer returned is NULL, then the allocation has failed, and compression must be aborted.
+The only parameter 'const char* inputBuffer' must, obviously, point at the beginning of input buffer.
+The input buffer must be already allocated, and size at least 192KB.
+'inputBuffer' will also be the 'const char* source' of the first block.
+
+All blocks are expected to lay next to each other within the input buffer, starting from 'inputBuffer'.
+To compress each block, use either LZ4_compressHC_continue() or LZ4_compressHC_limitedOutput_continue().
+Their behavior are identical to LZ4_compressHC() or LZ4_compressHC_limitedOutput(), 
+but require the LZ4HC Data Structure as their first argument, and check that each block starts right after the previous one.
+If next block does not begin immediately after the previous one, the compression will fail (return 0).
+
+When it's no longer possible to lay the next block after the previous one (not enough space left into input buffer), a call to : 
+char* LZ4_slideInputBufferHC(void* LZ4HC_Data);
+must be performed. It will typically copy the latest 64KB of input at the beginning of input buffer.
+Note that, for this function to work properly, minimum size of an input buffer must be 192KB.
+==> The memory position where the next input data block must start is provided as the result of the function.
+
+Compression can then resume, using LZ4_compressHC_continue() or LZ4_compressHC_limitedOutput_continue(), as usual.
+
+When compression is completed, a call to LZ4_freeHC() will release the memory used by the LZ4HC Data Structure.
 */
 
 

tap-mac/tuntap/src/tap/Makefile → ext/tap-mac/tuntap/src/tap/Makefile

@@ -29,8 +29,8 @@ LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker
 
 #CCP = g++
 #CC = gcc
-CCP = $(HOME)/Code/llvm-g++-Xcode4.6.2/bin/llvm-g++
-CC = $(HOME)/Code/llvm-g++-Xcode4.6.2/bin/llvm-gcc
+CCP = ../../../../llvm-g++-Xcode4.6.2/bin/llvm-g++
+CC = ../../../../llvm-g++-Xcode4.6.2/bin/llvm-gcc
 
 all: $(KMOD_BIN) bundle
 

file2lz4c.cpp

@@ -0,0 +1,81 @@
+/*
+ * ZeroTier One - Global Peer to Peer Ethernet
+ * Copyright (C) 2012-2013  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/
+ */
+
+/* Converts files to LZ4-compressed C arrays, used in building installers. */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <iostream>
+
+#include "node/Utils.hpp"
+
+#include "ext/lz4/lz4.h"
+#include "ext/lz4/lz4hc.h"
+
+using namespace ZeroTier;
+
+int main(int argc,char **argv)
+{
+	char tmp[16];
+
+	if (argc != 3) {
+		std::cerr << "Usage: " << argv[0] << " <file> <name of C array>" << std::endl;
+		return -1;
+	}
+
+	std::string buf;
+	if (!Utils::readFile(argv[1],buf)) {
+		std::cerr << "Could not read " << argv[1] << std::endl;
+		return -1;
+	}
+
+	unsigned char *compbuf = new unsigned char[LZ4_compressBound((int)buf.length())];
+	int complen = LZ4_compressHC(buf.data(),(char *)compbuf,(int)buf.length());
+
+	if (complen <= 0) {
+		std::cerr << "Error compressing data." << std::endl;
+		return -1;
+	}
+
+	std::cout << "#define " << argv[2] << "_UNCOMPRESSED_LEN " << buf.length() << std::endl;
+	std::cout << "#define " << argv[2] << "_LZ4_LEN " << complen << std::endl;
+	std::cout << "static const unsigned char " << argv[2] << '[' << argv[2] << "_LZ4_LEN] = {";
+	for(int i=0;i<complen;++i) {
+		if (!(i % 15))
+			std::cout << std::endl << '\t';
+		Utils::snprintf(tmp,sizeof(tmp),"0x%.2x",(unsigned int)compbuf[i]);
+		std::cout << tmp;
+		if (i != (complen - 1))
+			std::cout << ',';
+	}
+	std::cout << std::endl << "};" << std::endl;
+
+	delete [] compbuf;
+	return 0;
+}

idtool.cpp

@@ -1,175 +0,0 @@
-/*
- * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  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 <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <iostream>
-
-#include "node/Identity.hpp"
-#include "node/Utils.hpp"
-#include "node/C25519.hpp"
-
-using namespace ZeroTier;
-
-static void printHelp(char *pn)
-{
-	std::cout << "Usage: " << pn << " <command> [<args>]" << std::endl << std::endl;
-	std::cout << "Commands:" << std::endl;
-	std::cout << "\tgenerate [<identity.secret>] [<identity.public>]" << std::endl;
-	std::cout << "\tvalidate <identity.secret/public>" << std::endl;
-	std::cout << "\tgetpublic <identity.secret>" << std::endl;
-	std::cout << "\tsign <identity.secret> <file>" << std::endl;
-	std::cout << "\tverify <identity.secret/public> <file> <signature>" << std::endl;
-}
-
-static Identity getIdFromArg(char *arg)
-{
-	Identity id;
-	if ((strlen(arg) > 32)&&(arg[10] == ':')) { // identity is a literal on the command line
-		if (id.fromString(arg))
-			return id;
-	} else { // identity is to be read from a file
-		std::string idser;
-		if (Utils::readFile(arg,idser)) {
-			if (id.fromString(idser))
-				return id;
-		}
-	}
-	return Identity();
-}
-
-int main(int argc,char **argv)
-{
-	if (argc < 2) {
-		printHelp(argv[0]);
-		return -1;
-	}
-
-	if (!strcmp(argv[1],"generate")) {
-		Identity id;
-		id.generate();
-		std::string idser = id.toString(true);
-		if (argc >= 3) {
-			if (!Utils::writeFile(argv[2],idser)) {
-				std::cerr << "Error writing to " << argv[2] << std::endl;
-				return -1;
-			} else std::cout << argv[2] << " written" << std::endl;
-			if (argc >= 4) {
-				idser = id.toString(false);
-				if (!Utils::writeFile(argv[3],idser)) {
-					std::cerr << "Error writing to " << argv[3] << std::endl;
-					return -1;
-				} else std::cout << argv[3] << " written" << std::endl;
-			}
-		} else std::cout << idser;
-	} else if (!strcmp(argv[1],"validate")) {
-		if (argc < 3) {
-			printHelp(argv[0]);
-			return -1;
-		}
-
-		Identity id = getIdFromArg(argv[2]);
-		if (!id) {
-			std::cerr << "Identity argument invalid or file unreadable: " << argv[2] << std::endl;
-			return -1;
-		}
-
-		if (!id.locallyValidate()) {
-			std::cerr << argv[2] << " FAILED validation." << std::endl;
-			return -1;
-		} else std::cout << argv[2] << " is a valid identity (full check performed)" << std::endl;
-	} else if (!strcmp(argv[1],"getpublic")) {
-		if (argc < 3) {
-			printHelp(argv[0]);
-			return -1;
-		}
-
-		Identity id = getIdFromArg(argv[2]);
-		if (!id) {
-			std::cerr << "Identity argument invalid or file unreadable: " << argv[2] << std::endl;
-			return -1;
-		}
-
-		std::cout << id.toString(false);
-	} else if (!strcmp(argv[1],"sign")) {
-		if (argc < 4) {
-			printHelp(argv[0]);
-			return -1;
-		}
-
-		Identity id = getIdFromArg(argv[2]);
-		if (!id) {
-			std::cerr << "Identity argument invalid or file unreadable: " << argv[2] << std::endl;
-			return -1;
-		}
-
-		if (!id.hasPrivate()) {
-			std::cerr << argv[2] << " does not contain a private key (must use private to sign)" << std::endl;
-			return -1;
-		}
-
-		std::string inf;
-		if (!Utils::readFile(argv[3],inf)) {
-			std::cerr << argv[3] << " is not readable" << std::endl;
-			return -1;
-		}
-		C25519::Signature signature = id.sign(inf.data(),inf.length());
-		std::cout << Utils::hex(signature.data,signature.size());
-	} else if (!strcmp(argv[1],"verify")) {
-		if (argc < 4) {
-			printHelp(argv[0]);
-			return -1;
-		}
-
-		Identity id = getIdFromArg(argv[2]);
-		if (!id) {
-			std::cerr << "Identity argument invalid or file unreadable: " << argv[2] << std::endl;
-			return -1;
-		}
-
-		std::string inf;
-		if (!Utils::readFile(argv[3],inf)) {
-			std::cerr << argv[3] << " is not readable" << std::endl;
-			return -1;
-		}
-
-		std::string signature(Utils::unhex(argv[4]));
-		if ((signature.length() > ZT_ADDRESS_LENGTH)&&(id.verify(inf.data(),inf.length(),signature.data(),signature.length()))) {
-			std::cout << argv[3] << " signature valid" << std::endl;
-		} else {
-			std::cerr << argv[3] << " signature check FAILED" << std::endl;
-			return -1;
-		}
-	} else {
-		printHelp(argv[0]);
-		return -1;
-	}
-
-	return 0;
-}

installer.cpp

@@ -0,0 +1,277 @@
+/*
+ * ZeroTier One - Global Peer to Peer Ethernet
+ * Copyright (C) 2012-2013  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/
+ */
+
+/*
+ * This can be run to install ZT1 for the first time or to update it. It
+ * carries all payloads internally as LZ4 compressed blobs.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "node/Constants.hpp"
+#include "version.h"
+
+#ifdef __WINDOWS__
+#include <Windows.h>
+#include <tchar.h>
+#include <wchar.h>
+#else
+#include <unistd.h>
+#include <pwd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+#endif
+
+#include "ext/lz4/lz4.h"
+#include "ext/lz4/lz4hc.h"
+
+// Include Lz4 comrpessed blobs -----------------------------------------------
+
+// zerotier-one binary (or zerotier-one.exe for Windows)
+#include "installer-build/zerotier_one.h"
+
+// Unix uninstall script, installed in home for user to remove
+#ifdef __UNIX_LIKE__
+#include "installer-build/uninstall_sh.h"
+#endif
+
+// Linux init.d script
+#ifdef __LINUX__
+#include "installer-build/linux__init_d__zerotier_one.h"
+#endif
+
+// Apple Tap device driver
+#ifdef __APPLE__
+#include "installer-build/tap_mac__Info_plist.h"
+#include "installer-build/tap_mac__tap.h"
+#endif
+
+// Windows Tap device drivers for x86 and x64 (installer will be x86)
+#ifdef __WINDOWS__
+#include "installer-build/tap_windows__x64__ztTap100_sys.h"
+#include "installer-build/tap_windows__x64__ztTap100_inf.h"
+#include "installer-build/tap_windows__x86__ztTap100_sys.h"
+#include "installer-build/tap_windows__x86__ztTap100_inf.h"
+#include "installer-build/tap_windows__devcon32_exe.h"
+#include "installer-build/tap_windows__devcon64_exe.h"
+#endif
+
+// ----------------------------------------------------------------------------
+
+static unsigned char *_unlz4(const void *lz4,int decompressedLen)
+{
+	unsigned char *buf = new unsigned char[decompressedLen];
+	if (LZ4_decompress_fast((const char *)lz4,(char *)buf,decompressedLen) <= 0) {
+		delete [] buf;
+		return (unsigned char *)0;
+	}
+	return buf;
+}
+
+static bool _putBlob(const void *lz4,int decompressedLen,const char *path,bool executable,bool protect,bool preserveOwnership)
+{
+	unsigned char *data = _unlz4(lz4,decompressedLen);
+	if (!data)
+		return false;
+
+#ifdef __WINDOWS__
+	DeleteFileA(path);
+#else
+	struct stat oldModes;
+	bool hasOldModes = (stat(path,&oldModes) == 0);
+	unlink(path);
+#endif
+
+	FILE *f = fopen(path,"wb");
+	if (!f) {
+		delete [] data;
+		return false;
+	}
+
+	if (fwrite(data,decompressedLen,1,f) != 1) {
+		fclose(f);
+		delete [] data;
+#ifdef __WINDOWS__
+		DeleteFileA(path);
+#else
+		unlink(path);
+#endif
+		return false;
+	}
+
+	fclose(f);
+
+#ifdef __WINDOWS__
+#else
+	if (executable) {
+		if (protect)
+			chmod(path,0700);
+		else chmod(path,0755);
+	} else {
+		if (protect)
+			chmod(path,0600);
+		else chmod(path,0644);
+	}
+	if (preserveOwnership&&hasOldModes)
+		chown(path,oldModes.st_uid,oldModes.st_gid);
+	else chown(path,0,0);
+#endif
+
+	delete [] data;
+	return true;
+}
+
+#define putBlob(name,path,exec,prot,pres) _putBlob((name),(name##_UNCOMPRESSED_LEN),(path),(exec),(prot),(pres))
+
+// ----------------------------------------------------------------------------
+
+#ifdef __WINDOWS__
+int _tmain(int argc, _TCHAR* argv[])
+#else
+int main(int argc,char **argv)
+#endif
+{
+#ifdef __UNIX_LIKE__ // -------------------------------------------------------
+
+	char buf[4096];
+
+	if (getuid() != 0) {
+		printf("! ZeroTier One installer must be run as root.\n");
+		return 2;
+	}
+
+	printf("# ZeroTier One installer/updater starting...\n");
+
+	// Create home folder
+	const char *zthome;
+#ifdef __APPLE__
+	mkdir("/Library/Application Support/ZeroTier",0755);
+	chmod("/Library/Application Support/ZeroTier",0755);
+	chown("/Library/Application Support/ZeroTier",0,0);
+	printf("mkdir /Library/Application Support/ZeroTier\n");
+	mkdir(zthome = "/Library/Application Support/ZeroTier/One",0755);
+#else
+	mkdir("/var/lib",0755);
+	printf("mkdir /var/lib\n");
+	mkdir(zthome = "/var/lib/zerotier-one",0755);
+#endif
+	chmod(zthome,0755);
+	chown(zthome,0,0);
+	printf("mkdir %s\n",zthome);
+
+	// Write main ZT1 binary
+	sprintf(buf,"%s/zerotier-one",zthome);
+	if (!putBlob(zerotier_one,buf,true,false,false)) {
+		printf("! unable to write %s\n",buf);
+		return 1;
+	}
+	printf("write %s\n",buf);
+
+	// Create command line interface symlink
+	unlink("/usr/bin/zerotier-cli");
+	symlink(buf,"/usr/bin/zerotier-cli");
+	printf("link %s /usr/bin/zerotier-cli\n",buf);
+
+	// Write uninstall script into home folder
+	sprintf(buf,"%s/uninstall.sh",zthome);
+	if (!putBlob(uninstall_sh,buf,true,false,false)) {
+		printf("! unable to write %s\n",buf);
+		return 1;
+	}
+	printf("write %s\n",buf);
+
+#ifdef __APPLE__
+	// Write tap.kext into home folder
+	sprintf(buf,"%s/tap.kext",zthome);
+	mkdir(buf,0755);
+	chmod(buf,0755);
+	chown(buf,0,0);
+	printf("mkdir %s\n",buf);
+	sprintf(buf,"%s/tap.kext/Contents",zthome);
+	mkdir(buf,0755);
+	chmod(buf,0755);
+	chown(buf,0,0);
+	printf("mkdir %s\n",buf);
+	sprintf(buf,"%s/tap.kext/Contents/MacOS",zthome);
+	mkdir(buf,0755);
+	chmod(buf,0755);
+	chown(buf,0,0);
+	printf("mkdir %s\n",buf);
+	sprintf(buf,"%s/tap.kext/Contents/Info.plist",zthome);
+	if (!putBlob(tap_mac__Info_plist,buf,false,false,false)) {
+		printf("! unable to write %s\n",buf);
+		return 1;
+	}
+	printf("write %s\n",buf);
+	sprintf(buf,"%s/tap.kext/Contents/MacOS/tap",zthome);
+	if (!putBlob(tap_mac__tap,buf,true,false,false)) {
+		printf("! unable to write %s\n",buf);
+		return 1;
+	}
+	printf("write %s\n",buf);
+
+	// Write or update GUI application into /Applications
+#endif
+
+#ifdef __LINUX__
+	// Write Linux init script
+	sprintf(buf,"/etc/init.d/zerotier-one");
+	if (!putBlob(linux__init_d__zerotier_one,buf,true,false,false)) {
+		printf("! unable to write %s\n",buf);
+		return 1;
+	}
+	printf("write %s\n",buf);
+
+	symlink("/etc/init.d/zerotier-one","/etc/rc0.d/K89zerotier-one");
+	printf("link /etc/init.d/zerotier-one /etc/rc0.d/K89zerotier-one\n");
+	symlink("/etc/init.d/zerotier-one","/etc/rc2.d/S11zerotier-one");
+	printf("link /etc/init.d/zerotier-one /etc/rc2.d/S11zerotier-one\n");
+	symlink("/etc/init.d/zerotier-one","/etc/rc3.d/S11zerotier-one");
+	printf("link /etc/init.d/zerotier-one /etc/rc3.d/S11zerotier-one\n");
+	symlink("/etc/init.d/zerotier-one","/etc/rc4.d/S11zerotier-one");
+	printf("link /etc/init.d/zerotier-one /etc/rc4.d/S11zerotier-one\n");
+	symlink("/etc/init.d/zerotier-one","/etc/rc5.d/S11zerotier-one");
+	printf("link /etc/init.d/zerotier-one /etc/rc5.d/S11zerotier-one\n");
+	symlink("/etc/init.d/zerotier-one","/etc/rc6.d/S11zerotier-one");
+	printf("link /etc/init.d/zerotier-one /etc/rc6.d/S11zerotier-one\n");
+#endif
+
+	printf("# Done!\n");
+
+#endif // __UNIX_LIKE__ -------------------------------------------------------
+
+#ifdef __WINDOWS__ // ---------------------------------------------------------
+
+#endif // __WINDOWS__ ---------------------------------------------------------
+
+	return 0;
+}

main.cpp

@@ -44,6 +44,7 @@
 #else
 #include <unistd.h>
 #include <pwd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -53,6 +54,9 @@
 #include "node/Defaults.hpp"
 #include "node/Utils.hpp"
 #include "node/Node.hpp"
+#include "node/Condition.hpp"
+#include "node/C25519.hpp"
+#include "node/Identity.hpp"
 
 using namespace ZeroTier;
 
@@ -62,13 +66,308 @@ static void printHelp(const char *cn,FILE *out)
 {
 	fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S"(c)2012-2013 ZeroTier Networks LLC"ZT_EOL_S,Node::versionMajor(),Node::versionMinor(),Node::versionRevision());
 	fprintf(out,"Licensed under the GNU General Public License v3"ZT_EOL_S""ZT_EOL_S);
+#ifdef ZT_AUTO_UPDATE
+	fprintf(out,"Auto-update enabled build, will update from URL:"ZT_EOL_S);
+	fprintf(out,"  %s"ZT_EOL_S,ZT_DEFAULTS.updateLatestNfoURL.c_str());
+	fprintf(out,"Update authentication signing authorities: "ZT_EOL_S);
+	int no = 0;
+	for(std::map< Address,Identity >::const_iterator sa(ZT_DEFAULTS.updateAuthorities.begin());sa!=ZT_DEFAULTS.updateAuthorities.end();++sa) {
+		if (no == 0)
+			fprintf(out,"  %s",sa->first.toString().c_str());
+		else fprintf(out,", %s",sa->first.toString().c_str());
+		if (++no == 6) {
+			fprintf(out,ZT_EOL_S);
+			no = 0;
+		}
+	}
+	fprintf(out,ZT_EOL_S""ZT_EOL_S);
+#else
+	fprintf(out,"Auto-updates not enabled on this build. You must update manually."ZT_EOL_S""ZT_EOL_S);
+#endif
 	fprintf(out,"Usage: %s [-switches] [home directory]"ZT_EOL_S""ZT_EOL_S,cn);
 	fprintf(out,"Available switches:"ZT_EOL_S);
-	fprintf(out," -h                - Display this help"ZT_EOL_S);
-	fprintf(out," -p<port>          - Bind to this port for network I/O"ZT_EOL_S);
-	fprintf(out," -c<port>          - Bind to this port for local control packets"ZT_EOL_S);
+	fprintf(out,"  -h                - Display this help"ZT_EOL_S);
+	fprintf(out,"  -v                - Show version"ZT_EOL_S);
+	fprintf(out,"  -p<port>          - Bind to this port for network I/O"ZT_EOL_S);
+	fprintf(out,"  -c<port>          - Bind to this port for local control packets"ZT_EOL_S);
+	fprintf(out,"  -q                - Send a query to a running service (zerotier-cli)"ZT_EOL_S);
+	fprintf(out,"  -i                - Run idtool command (zerotier-idtool)"ZT_EOL_S);
+}
+
+namespace ZeroTierCLI { // ---------------------------------------------------
+
+static void printHelp(FILE *out,const char *exename)
+{
+	fprintf(out,"Usage: %s [-switches] <command>"ZT_EOL_S,exename);
+	fprintf(out,ZT_EOL_S);
+	fprintf(out,"Available switches:"ZT_EOL_S);
+	fprintf(out,"  -c<port>         - Communicate with daemon over this local port"ZT_EOL_S);
+	fprintf(out,"  -t<token>        - Specify token on command line"ZT_EOL_S);
+	fprintf(out,"  -T<file>         - Read token from file"ZT_EOL_S);
+	fprintf(out,ZT_EOL_S);
+	fprintf(out,"Use the 'help' command to get help from ZeroTier One itself."ZT_EOL_S);
+}
+
+static volatile unsigned int numResults = 0;
+static Condition doneCondition;
+
+static void resultHandler(void *arg,unsigned long id,const char *line)
+{
+	++numResults;
+	if (strlen(line))
+		fprintf(stdout,"%s"ZT_EOL_S,line);
+	else doneCondition.signal();
+}
+
+// Runs instead of rest of main() if process is called zerotier-cli or if
+// -q is specified as an option.
+#ifdef __WINDOWS__
+static int main(int argc,_TCHAR* argv[])
+#else
+static int main(int argc,char **argv)
+#endif
+{
+	if (argc <= 1) {
+		printHelp(stdout,argv[0]);
+		return -1;
+	}
+
+	std::string authToken;
+	std::string command;
+	bool pastSwitches = false;
+	unsigned int controlPort = 0;
+	for(int i=1;i<argc;++i) {
+		if ((argv[i][0] == '-')&&(!pastSwitches)) {
+			if (strlen(argv[i]) <= 1) {
+				printHelp(stdout,argv[0]);
+				return -1;
+			}
+			switch(argv[i][1]) {
+				case 'q': // does nothing, for invocation without binary path name aliasing
+					if (argv[i][2]) {
+						printHelp(argv[0],stderr);
+						return 0;
+					}
+					break;
+				case 'c':
+					controlPort = Utils::strToUInt(argv[i] + 2);
+					break;
+				case 't':
+					authToken.assign(argv[i] + 2);
+					break;
+				case 'T':
+					if (!Utils::readFile(argv[i] + 2,authToken)) {
+						fprintf(stdout,"FATAL ERROR: unable to read token from '%s'"ZT_EOL_S,argv[i] + 2);
+						return -2;
+					}
+					break;
+				default:
+					return -1;
+			}
+		} else {
+			pastSwitches = true;
+			if (command.length())
+				command.push_back(' ');
+			command.append(argv[i]);
+		}
+	}
+
+	if (!command.length()) {
+		printHelp(stdout,argv[0]);
+		return -1;
+	}
+
+	if (!authToken.length()) {
+		const char *home = getenv("HOME");
+		if (home) {
+			std::string dotZeroTierAuthToken(home);
+			dotZeroTierAuthToken.push_back(ZT_PATH_SEPARATOR);
+			dotZeroTierAuthToken.append(".zerotierOneAuthToken");
+			if (!Utils::readFile(dotZeroTierAuthToken.c_str(),authToken)) {
+#ifndef __WINDOWS__
+#ifdef __APPLE__
+				const char *systemAuthTokenPath = "/Library/Application Support/ZeroTier/One/authtoken.secret";
+#else
+				const char *systemAuthTokenPath = "/var/lib/zerotier-one/authtoken.secret";
+#endif
+				if (!Utils::readFile(systemAuthTokenPath,authToken)) {
+					fprintf(stdout,"FATAL ERROR: no token specified on command line and could not read '%s' or '%s'"ZT_EOL_S,dotZeroTierAuthToken.c_str(),systemAuthTokenPath);
+					return -2;
+				}
+#else // __WINDOWS__
+				fprintf(stdout,"FATAL ERROR: no token specified on command line and could not read '%s'"ZT_EOL_S,dotZeroTierAuthToken.c_str());
+				return -2;
+#endif // __WINDOWS__
+			}
+		}
+	}
+	if (!authToken.length()) {
+		fprintf(stdout,"FATAL ERROR: could not find auth token"ZT_EOL_S);
+		return -2;
+	}
+
+	Node::LocalClient client(authToken.c_str(),controlPort,&resultHandler,(void *)0);
+	client.send(command.c_str());
+
+	doneCondition.wait(1000);
+
+	if (!numResults) {
+		fprintf(stdout,"ERROR: no results received. Is ZeroTier One running?"ZT_EOL_S);
+		return -1;
+	}
+
+	return 0;
+}
+
+} // namespace ZeroTierCLI ---------------------------------------------------
+
+namespace ZeroTierIdTool { // ------------------------------------------------
+
+static void printHelp(FILE *out,const char *pn)
+{
+	fprintf(out,"Usage: %s <command> [<args>]"ZT_EOL_S""ZT_EOL_S"Commands:"ZT_EOL_S,pn);
+	fprintf(out,"  generate [<identity.secret>] [<identity.public>]"ZT_EOL_S);
+	fprintf(out,"  validate <identity.secret/public>"ZT_EOL_S);
+	fprintf(out,"  getpublic <identity.secret>"ZT_EOL_S);
+	fprintf(out,"  sign <identity.secret> <file>"ZT_EOL_S);
+	fprintf(out,"  verify <identity.secret/public> <file> <signature>"ZT_EOL_S);
+}
+
+static Identity getIdFromArg(char *arg)
+{
+	Identity id;
+	if ((strlen(arg) > 32)&&(arg[10] == ':')) { // identity is a literal on the command line
+		if (id.fromString(arg))
+			return id;
+	} else { // identity is to be read from a file
+		std::string idser;
+		if (Utils::readFile(arg,idser)) {
+			if (id.fromString(idser))
+				return id;
+		}
+	}
+	return Identity();
 }
 
+// Runs instead of rest of main() if process is called zerotier-idtool or if
+// -i is specified as an option.
+#ifdef __WINDOWS__
+static int main(int argc,_TCHAR* argv[])
+#else
+static int main(int argc,char **argv)
+#endif
+{
+	if (argc < 2) {
+		printHelp(stderr,argv[0]);
+		return -1;
+	}
+
+	if (!strcmp(argv[1],"generate")) {
+		Identity id;
+		id.generate();
+		std::string idser = id.toString(true);
+		if (argc >= 3) {
+			if (!Utils::writeFile(argv[2],idser)) {
+				fprintf(stderr,"Error writing to %s"ZT_EOL_S,argv[2]);
+				return -1;
+			} else printf("%s written"ZT_EOL_S,argv[2]);
+			if (argc >= 4) {
+				idser = id.toString(false);
+				if (!Utils::writeFile(argv[3],idser)) {
+					fprintf(stderr,"Error writing to %s"ZT_EOL_S,argv[3]);
+					return -1;
+				} else printf("%s written"ZT_EOL_S,argv[3]);
+			}
+		} else printf("%s",idser.c_str());
+	} else if (!strcmp(argv[1],"validate")) {
+		if (argc < 3) {
+			printHelp(stderr,argv[0]);
+			return -1;
+		}
+
+		Identity id = getIdFromArg(argv[2]);
+		if (!id) {
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
+			return -1;
+		}
+
+		if (!id.locallyValidate()) {
+			fprintf(stderr,"%s FAILED validation."ZT_EOL_S,argv[2]);
+			return -1;
+		} else printf("%s is a valid identity"ZT_EOL_S,argv[2]);
+	} else if (!strcmp(argv[1],"getpublic")) {
+		if (argc < 3) {
+			printHelp(stderr,argv[0]);
+			return -1;
+		}
+
+		Identity id = getIdFromArg(argv[2]);
+		if (!id) {
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
+			return -1;
+		}
+
+		printf("%s",id.toString(false).c_str());
+	} else if (!strcmp(argv[1],"sign")) {
+		if (argc < 4) {
+			printHelp(stderr,argv[0]);
+			return -1;
+		}
+
+		Identity id = getIdFromArg(argv[2]);
+		if (!id) {
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
+			return -1;
+		}
+
+		if (!id.hasPrivate()) {
+			fprintf(stderr,"%s does not contain a private key (must use private to sign)"ZT_EOL_S,argv[2]);
+			return -1;
+		}
+
+		std::string inf;
+		if (!Utils::readFile(argv[3],inf)) {
+			fprintf(stderr,"%s is not readable"ZT_EOL_S,argv[3]);
+			return -1;
+		}
+		C25519::Signature signature = id.sign(inf.data(),inf.length());
+		printf("%s",Utils::hex(signature.data,signature.size()).c_str());
+	} else if (!strcmp(argv[1],"verify")) {
+		if (argc < 4) {
+			printHelp(stderr,argv[0]);
+			return -1;
+		}
+
+		Identity id = getIdFromArg(argv[2]);
+		if (!id) {
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
+			return -1;
+		}
+
+		std::string inf;
+		if (!Utils::readFile(argv[3],inf)) {
+			fprintf(stderr,"%s is not readable"ZT_EOL_S,argv[3]);
+			return -1;
+		}
+
+		std::string signature(Utils::unhex(argv[4]));
+		if ((signature.length() > ZT_ADDRESS_LENGTH)&&(id.verify(inf.data(),inf.length(),signature.data(),signature.length()))) {
+			printf("%s signature valid"ZT_EOL_S,argv[3]);
+		} else {
+			fprintf(stderr,"%s signature check FAILED"ZT_EOL_S,argv[3]);
+			return -1;
+		}
+	} else {
+		printHelp(stderr,argv[0]);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+} // namespace ZeroTierIdTool ------------------------------------------------
+
 #ifdef __UNIX_LIKE__
 static void sighandlerQuit(int sig)
 {
@@ -119,6 +418,11 @@ int main(int argc,char **argv)
 	SetConsoleCtrlHandler(&_handlerRoutine,TRUE);
 #endif
 
+	if ((strstr(argv[0],"zerotier-cli"))||(strstr(argv[0],"ZEROTIER-CLI")))
+		return ZeroTierCLI::main(argc,argv);
+	if ((strstr(argv[0],"zerotier-idtool"))||(strstr(argv[0],"ZEROTIER-IDTOOL")))
+		return ZeroTierIdTool::main(argc,argv);
+
 	const char *homeDir = (const char *)0;
 	unsigned int port = 0;
 	unsigned int controlPort = 0;
@@ -129,16 +433,29 @@ int main(int argc,char **argv)
 					port = Utils::strToUInt(argv[i] + 2);
 					if (port > 65535) {
 						printHelp(argv[0],stderr);
-						return -1;
+						return 1;
 					}
 					break;
+				case 'v':
+					printf("%s"ZT_EOL_S,Node::versionString());
+					return 0;
 				case 'c':
 					controlPort = Utils::strToUInt(argv[i] + 2);
 					if (controlPort > 65535) {
 						printHelp(argv[0],stderr);
-						return -1;
+						return 1;
 					}
 					break;
+				case 'q':
+					if (argv[i][2]) {
+						printHelp(argv[0],stderr);
+						return 0;
+					} else return ZeroTierCLI::main(argc,argv);
+				case 'i':
+					if (argv[i][2]) {
+						printHelp(argv[0],stderr);
+						return 0;
+					} else return ZeroTierIdTool::main(argc,argv);
 				case 'h':
 				case '?':
 				default:
@@ -159,24 +476,55 @@ int main(int argc,char **argv)
 		homeDir = ZT_DEFAULTS.defaultHomePath.c_str();
 
 #ifdef __UNIX_LIKE__
+	if (getuid()) {
+		fprintf(stderr,"%s: must be run as root (uid==0)\n",argv[0]);
+		return 1;
+	}
 	mkdir(homeDir,0755); // will fail if it already exists
+	{
+		char pidpath[4096];
+		Utils::snprintf(pidpath,sizeof(pidpath),"%s/zerotier-one.pid",homeDir);
+		FILE *pf = fopen(pidpath,"w");
+		if (pf) {
+			fprintf(pf,"%ld",(long)getpid());
+			fclose(pf);
+		}
+	}
 #endif
 
 	int exitCode = 0;
 
-	node = new Node(homeDir,port,controlPort);
-	const char *termReason = (char *)0;
-	switch(node->run()) {
-		case Node::NODE_UNRECOVERABLE_ERROR:
-			exitCode = -1;
-			termReason = node->reasonForTermination();
-			fprintf(stderr,"%s: abnormal termination: %s\n",argv[0],(termReason) ? termReason : "(unknown reason)");
-			break;
-		default:
-			break;
+	try {
+		node = new Node(homeDir,port,controlPort);
+		switch(node->run()) {
+			case Node::NODE_RESTART_FOR_UPGRADE: {
+#ifdef __UNIX_LIKE__
+				const char *upgPath = node->reasonForTermination();
+				if (upgPath)
+					execl(upgPath,upgPath,"-s",(char *)0); // -s = (re)start after install/upgrade
+				exitCode = 2;
+				fprintf(stderr,"%s: abnormal termination: unable to execute update at %s\n",argv[0],(upgPath) ? upgPath : "(unknown path)");
+#endif
+			}	break;
+			case Node::NODE_UNRECOVERABLE_ERROR: {
+				exitCode = 3;
+				const char *termReason = node->reasonForTermination();
+				fprintf(stderr,"%s: abnormal termination: %s\n",argv[0],(termReason) ? termReason : "(unknown reason)");
+			}	break;
+			default:
+				break;
+		}
+		delete node;
+		node = (Node *)0;
+	} catch ( ... ) {}
+
+#ifdef __UNIX_LIKE__
+	{
+		char pidpath[4096];
+		Utils::snprintf(pidpath,sizeof(pidpath),"%s/zerotier-one.pid",homeDir);
+		Utils::rm(pidpath);
 	}
-	delete node;
-	node = (Node *)0;
+#endif
 
 	return exitCode;
 }

Makefile.linux → make-linux.mk

@@ -5,6 +5,10 @@ INCLUDES=
 DEFS=
 LIBS=
 
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
+endif
+
 # Uncomment for a release optimized build
 CFLAGS=-Wall -O3 -fno-unroll-loops -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 STRIP=strip --strip-all
@@ -21,15 +25,13 @@ CXXFLAGS=$(CFLAGS) -fno-rtti
 
 include objects.mk
 
-all:	one cli
+all:	one
 
 one:	$(OBJS)
 	$(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS)
 	$(STRIP) zerotier-one
-
-cli:	$(OBJS)
-	$(CXX) $(CXXFLAGS) -o zerotier-cli cli.cpp $(OBJS) $(LIBS)
-	$(STRIP) zerotier-cli
+	ln -sf zerotier-one zerotier-cli
+	ln -sf zerotier-one zerotier-idtool
 
 selftest:	$(OBJS)
 	$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.cpp $(OBJS) $(LIBS)
@@ -39,5 +41,13 @@ idtool:	$(OBJS)
 	$(CXX) $(CXXFLAGS) -o zerotier-idtool idtool.cpp $(OBJS) $(LIBS)
 	$(STRIP) zerotier-idtool
 
+file2lz4c: ext/lz4/lz4hc.o FORCE
+	$(CXX) $(CXXFLAGS) -o file2lz4c file2lz4c.cpp node/Utils.cpp node/Salsa20.cpp ext/lz4/lz4hc.o
+
+installer: one FORCE
+	./buildinstaller.sh
+
 clean:
-	rm -f $(OBJS) zerotier-*
+	rm -rf $(OBJS) file2lz4c zerotier-* zt1-*-install installer-build build-ZeroTierUI-*
+
+FORCE:

Makefile.mac → make-mac.mk

@@ -5,8 +5,12 @@ INCLUDES=
 DEFS=
 LIBS=-lm
 
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
+endif
+
 # Uncomment for a release optimized universal binary build
-CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -pthread -mmacosx-version-min=10.6 -DNDEBUG $(INCLUDES) $(DEFS)
+CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -pthread -mmacosx-version-min=10.6 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 STRIP=strip
 
 # Uncomment for a debug build
@@ -17,33 +21,28 @@ CXXFLAGS=$(CFLAGS) -fno-rtti
 
 include objects.mk
 
-all: one cli
+all: one
 
 one:	$(OBJS)
 	$(CXX) $(CXXFLAGS) -o zerotier-one main.cpp $(OBJS) $(LIBS)
 	$(STRIP) zerotier-one
-
-cli:	$(OBJS)
-	$(CXX) $(CXXFLAGS) -o zerotier-cli cli.cpp $(OBJS) $(LIBS)
-	$(STRIP) zerotier-cli
+	ln -sf zerotier-one zerotier-cli
+	ln -sf zerotier-one zerotier-idtool
 
 selftest: $(OBJS)
 	$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.cpp $(OBJS) $(LIBS)
 	$(STRIP) zerotier-selftest
 
-idtool: $(OBJS)
-	$(CXX) $(CXXFLAGS) -o zerotier-idtool idtool.cpp $(OBJS) $(LIBS)
-	$(STRIP) zerotier-idtool
-
 install-mac-tap: FORCE
 	mkdir -p /Library/Application\ Support/ZeroTier/One
 	rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext
 	cp -R ext/bin/tap-mac//tap.kext /Library/Application\ Support/ZeroTier/One
 	chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
 
+file2lz4c: ext/lz4/lz4hc.o FORCE
+	$(CXX) $(CXXFLAGS) -o file2lz4c file2lz4c.cpp node/Utils.cpp node/Salsa20.cpp ext/lz4/lz4hc.o
+
 clean:
-	rm -rf *.dSYM
-	rm -f $(OBJS) zerotier-*
-	cd tap-mac/tuntap ; make clean
+	rm -rf *.dSYM build-ZeroTierUI-* $(OBJS) file2lz4c zerotier-* installer-build zt1-*-install
 
 FORCE:

netconf-service/README.txt

@@ -0,0 +1,16 @@
+This is the netconf service, which can be built and run by placing it in the
+services.d subfolder of the ZeroTier One home directory.
+
+Users probably won't be interested in this. It's for running a "netconf
+master," which handles certificate issuing, static IP assignment, and other
+things for a network. The ZeroTier address of the netconf master forms the
+first 40 bits of a hexadecimal network ID, permitting the master to be
+located and queried.
+
+Masters currently don't support multi-homing, but they can easily be made
+fault tolerant via fail-over. If the master node goes down, it can be
+started elsewhere with the same ZT1 identity. (The underlying database would
+also have to be fault tolerant.)
+
+For this to work it requires a MySQL backend with a properly structured
+database.

node/Address.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ADDRESS_HPP
-#define _ZT_ADDRESS_HPP
+#ifndef ZT_ADDRESS_HPP
+#define ZT_ADDRESS_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/Array.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ARRAY_HPP
-#define _ZT_ARRAY_HPP
+#ifndef ZT_ARRAY_HPP
+#define ZT_ARRAY_HPP
 
 #include <string>
 #include <algorithm>

node/AtomicCounter.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ATOMICCOUNTER_HPP
-#define _ZT_ATOMICCOUNTER_HPP
+#ifndef ZT_ATOMICCOUNTER_HPP
+#define ZT_ATOMICCOUNTER_HPP
 
 #include "Mutex.hpp"
 #include "NonCopyable.hpp"

node/BandwidthAccount.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_BWACCOUNT_HPP
-#define _ZT_BWACCOUNT_HPP
+#ifndef ZT_BWACCOUNT_HPP
+#define ZT_BWACCOUNT_HPP
 
 #include <stdint.h>
 #include <math.h>

node/Buffer.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_BUFFER_HPP
-#define _ZT_BUFFER_HPP
+#ifndef ZT_BUFFER_HPP
+#define ZT_BUFFER_HPP
 
 #include <string.h>
 #include <stdint.h>

node/C25519.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_C25519_HPP
-#define _ZT_C25519_HPP
+#ifndef ZT_C25519_HPP
+#define ZT_C25519_HPP
 
 #include "Array.hpp"
 #include "Utils.hpp"

node/CMWC4096.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CMWC4096_HPP
-#define _ZT_CMWC4096_HPP
+#ifndef ZT_CMWC4096_HPP
+#define ZT_CMWC4096_HPP
 
 #include <stdint.h>
 #include "Utils.hpp"

node/CertificateOfMembership.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CERTIFICATEOFMEMBERSHIP_HPP
-#define _ZT_CERTIFICATEOFMEMBERSHIP_HPP
+#ifndef ZT_CERTIFICATEOFMEMBERSHIP_HPP
+#define ZT_CERTIFICATEOFMEMBERSHIP_HPP
 
 #include <stdint.h>
 #include <string.h>

node/Condition.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CONDITION_HPP
-#define _ZT_CONDITION_HPP
+#ifndef ZT_CONDITION_HPP
+#define ZT_CONDITION_HPP
 
 #include "Constants.hpp"
 #include "NonCopyable.hpp"

node/Constants.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CONSTANTS_HPP
-#define _ZT_CONSTANTS_HPP
+#ifndef ZT_CONSTANTS_HPP
+#define ZT_CONSTANTS_HPP
 
 //
 // This include file also auto-detects and canonicalizes some environment
@@ -54,6 +54,7 @@
 
 // OSX and iOS are unix-like OSes far as we're concerned
 #ifdef __APPLE__
+#include <TargetConditionals.h>
 #ifndef __UNIX_LIKE__
 #define __UNIX_LIKE__
 #endif
@@ -329,4 +330,14 @@ error_no_byte_order_defined;
  */
 #define ZT_RENDEZVOUS_NAT_T_DELAY 500
 
+/**
+ * Minimum interval between attempts to do a software update
+ */
+#define ZT_UPDATE_MIN_INTERVAL 120000
+
+/**
+ * Update HTTP timeout in seconds
+ */
+#define ZT_UPDATE_HTTP_TIMEOUT 30
+
 #endif

node/Defaults.cpp

@@ -98,12 +98,60 @@ static inline std::string _mkDefaultHomePath()
 #endif
 }
 
+static inline std::map< Address,Identity > _mkUpdateAuth()
+{
+	std::map< Address,Identity > ua;
+
+	{ // 0001
+		Identity id("e9bc3707b5:0:c4cef17bde99eadf9748c4fd11b9b06dc5cd8eb429227811d2c336e6b96a8d329e8abd0a4f45e47fe1bcebf878c004c822d952ff77fc2833af4c74e65985c435");
+		ua[id.address()] = id;
+	}
+	{ // 0002
+		Identity id("56520eaf93:0:7d858b47988b34399a9a31136de07b46104d7edb4a98fa1d6da3e583d3a33e48be531532b886f0b12cd16794a66ab9220749ec5112cbe96296b18fe0cc79ca05");
+		ua[id.address()] = id;
+	}
+	{ // 0003
+		Identity id("7c195de2e0:0:9f659071c960f9b0f0b96f9f9ecdaa27c7295feed9c79b7db6eedcc11feb705e6dd85c70fa21655204d24c897865b99eb946b753a2bbcf2be5f5e006ae618c54");
+		ua[id.address()] = id;
+	}
+	{ // 0004
+		Identity id("415f4cfde7:0:54118e87777b0ea5d922c10b337c4f4bd1db7141845bd54004b3255551a6e356ba6b9e1e85357dbfafc45630b8faa2ebf992f31479e9005f0472685f2d8cbd6e");
+		ua[id.address()] = id;
+	}
+
+	return ua;
+}
+
+static inline const char *_mkUpdateUrl()
+{
+#if defined(__LINUX__) && ( defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__i386) )
+	if (sizeof(void *) == 8)
+		return "http://download.zerotier.com/update/linux/x64/latest.nfo";
+	else return "http://download.zerotier.com/update/linux/x86/latest.nfo";
+#define GOT_UPDATE_URL
+#endif
+
+#ifdef __APPLE__
+	// TODO: iOS?
+	return "http://download.zerotier.com/update/mac/combined/latest.nfo";
+#define GOT_UPDATE_URL
+#endif
+
+	// TODO: Windows
+
+#ifndef GOT_UPDATE_URL
+	return "";
+#endif
+}
+
 Defaults::Defaults() :
 #ifdef ZT_TRACE_MULTICAST
 	multicastTraceWatcher(ZT_TRACE_MULTICAST),
 #endif
 	defaultHomePath(_mkDefaultHomePath()),
-	supernodes(_mkSupernodeMap())
+	supernodes(_mkSupernodeMap()),
+	updateAuthorities(_mkUpdateAuth()),
+	updateLatestNfoURL(_mkUpdateUrl())
 {
 }
 

node/Defaults.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_DEFAULTS_HPP
-#define _ZT_DEFAULTS_HPP
+#ifndef ZT_DEFAULTS_HPP
+#define ZT_DEFAULTS_HPP
 
 #include <stdexcept>
 #include <string>
@@ -67,6 +67,22 @@ public:
 	 * Supernodes on the ZeroTier network
 	 */
 	const std::map< Identity,std::vector<InetAddress> > supernodes;
+
+	/**
+	 * Identities permitted to sign software updates
+	 *
+	 * ZTN can keep multiple signing identities and rotate them, keeping some in
+	 * "cold storage" and obsoleting others gradually.
+	 *
+	 * If you don't build with ZT_OFFICIAL_BUILD, this isn't used since your
+	 * build will not auto-update.
+	 */
+	const std::map< Address,Identity > updateAuthorities;
+
+	/**
+	 * URL to latest .nfo for software updates
+	 */
+	const std::string updateLatestNfoURL;
 };
 
 extern const Defaults ZT_DEFAULTS;

node/Demarc.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_DEMARC_HPP
-#define _ZT_DEMARC_HPP
+#ifndef ZT_DEMARC_HPP
+#define ZT_DEMARC_HPP
 
 #include <stdlib.h>
 #include <stdint.h>

node/Dictionary.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_DICTIONARY_HPP
-#define _ZT_DICTIONARY_HPP
+#ifndef ZT_DICTIONARY_HPP
+#define ZT_DICTIONARY_HPP
 
 #include <string>
 #include <map>

node/EthernetTap.cpp

@@ -693,7 +693,7 @@ void EthernetTap::threadMain()
 				// data until we have at least a frame.
 				r += n;
 				if (r > 14) {
-					if (r > (_mtu + 14)) // sanity check for weird TAP behavior on some platforms
+					if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms
 						r = _mtu + 14;
 					for(int i=0;i<6;++i)
 						to.data[i] = (unsigned char)getBuf[i];

node/EthernetTap.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ETHERNETTAP_HPP
-#define _ZT_ETHERNETTAP_HPP
+#ifndef ZT_ETHERNETTAP_HPP
+#define ZT_ETHERNETTAP_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/HttpClient.cpp

@@ -0,0 +1,311 @@
+/*
+ * ZeroTier One - Global Peer to Peer Ethernet
+ * Copyright (C) 2012-2013  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 <vector>
+#include <utility>
+#include <algorithm>
+
+#include "Constants.hpp"
+#include "HttpClient.hpp"
+#include "Thread.hpp"
+#include "Utils.hpp"
+#include "NonCopyable.hpp"
+#include "Defaults.hpp"
+
+#ifdef __UNIX_LIKE__
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <sys/select.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#endif
+
+namespace ZeroTier {
+
+const std::map<std::string,std::string> HttpClient::NO_HEADERS;
+
+#ifdef __UNIX_LIKE__
+
+// The *nix implementation calls 'curl' externally rather than linking to it.
+// This makes it an optional dependency that can be avoided in tiny systems
+// provided you don't want to have automatic software updates... or want to
+// do them via another method.
+
+#ifdef __APPLE__
+// TODO: get proxy configuration
+#endif
+
+// Paths where "curl" may be found on the system
+#define NUM_CURL_PATHS 5
+static const char *CURL_PATHS[NUM_CURL_PATHS] = { "/usr/bin/curl","/bin/curl","/usr/local/bin/curl","/usr/sbin/curl","/sbin/curl" };
+
+// Maximum message length
+#define CURL_MAX_MESSAGE_LENGTH (1024 * 1024 * 64)
+
+// Internal private thread class that performs request, notifies handler,
+// and then commits suicide by deleting itself.
+class P_Req : NonCopyable
+{
+public:
+	P_Req(const char *method,const std::string &url,const std::map<std::string,std::string> &headers,unsigned int timeout,void (*handler)(void *,int,const std::string &,bool,const std::string &),void *arg) :
+		_url(url),
+		_headers(headers),
+		_timeout(timeout),
+		_handler(handler),
+		_arg(arg)
+	{
+		_myThread = Thread::start(this);
+	}
+
+	void threadMain()
+	{
+		char *curlArgs[1024];
+		char buf[16384];
+		fd_set readfds,writefds,errfds;
+		struct timeval tv;
+
+		std::string curlPath;
+		for(int i=0;i<NUM_CURL_PATHS;++i) {
+			if (Utils::fileExists(CURL_PATHS[i])) {
+				curlPath = CURL_PATHS[i];
+				break;
+			}
+		}
+		if (!curlPath.length()) {
+			_handler(_arg,-1,_url,false,"unable to locate 'curl' binary in /usr/bin, /bin, /usr/local/bin, /usr/sbin, or /sbin");
+			delete this;
+			return;
+		}
+
+		if (!_url.length()) {
+			_handler(_arg,-1,_url,false,"cannot fetch empty URL");
+			delete this;
+			return;
+		}
+
+		curlArgs[0] = const_cast <char *>(curlPath.c_str());
+		curlArgs[1] = const_cast <char *>("-D");
+		curlArgs[2] = const_cast <char *>("-"); // append headers before output
+		int argPtr = 3;
+		std::vector<std::string> headerArgs;
+		for(std::map<std::string,std::string>::const_iterator h(_headers.begin());h!=_headers.end();++h) {
+			headerArgs.push_back(h->first);
+			headerArgs.back().append(": ");
+			headerArgs.back().append(h->second);
+		}
+		for(std::vector<std::string>::iterator h(headerArgs.begin());h!=headerArgs.end();++h) {
+			if (argPtr >= (1024 - 4)) // leave room for terminating NULL and URL
+				break;
+			curlArgs[argPtr++] = const_cast <char *>("-H");
+			curlArgs[argPtr++] = const_cast <char *>(h->c_str());
+		}
+		curlArgs[argPtr++] = const_cast <char *>(_url.c_str());
+		curlArgs[argPtr] = (char *)0;
+
+		int curlStdout[2];
+		int curlStderr[2];
+		::pipe(curlStdout);
+		::pipe(curlStderr);
+
+		long pid = (long)vfork();
+		if (pid < 0) {
+			// fork() failed
+			::close(curlStdout[0]);
+			::close(curlStdout[1]);
+			::close(curlStderr[0]);
+			::close(curlStderr[1]);
+			_handler(_arg,-1,_url,false,"unable to fork()");
+			delete this;
+			return;
+		} else if (pid > 0) {
+			// fork() succeeded, in parent process
+			::close(curlStdout[1]);
+			::close(curlStderr[1]);
+			fcntl(curlStdout[0],F_SETFL,O_NONBLOCK);
+			fcntl(curlStderr[0],F_SETFL,O_NONBLOCK);
+
+			int exitCode = -1;
+			unsigned long long timesOutAt = Utils::now() + ((unsigned long long)_timeout * 1000ULL);
+			bool timedOut = false;
+			bool tooLong = false;
+			for(;;) {
+				FD_ZERO(&readfds);
+				FD_ZERO(&writefds);
+				FD_ZERO(&errfds);
+				FD_SET(curlStdout[0],&readfds);
+				FD_SET(curlStderr[0],&readfds);
+				FD_SET(curlStdout[0],&errfds);
+				FD_SET(curlStderr[0],&errfds);
+				tv.tv_sec = 1;
+				tv.tv_usec = 0;
+				select(std::max(curlStdout[0],curlStderr[0])+1,&readfds,&writefds,&errfds,&tv);
+
+				if (FD_ISSET(curlStdout[0],&readfds)) {
+					int n = (int)::read(curlStdout[0],buf,sizeof(buf));
+					if (n > 0) {
+						_body.append(buf,n);
+						// Reset timeout when data is read...
+						timesOutAt = Utils::now() + ((unsigned long long)_timeout * 1000ULL);
+					} else if (n < 0)
+						break;
+					if (_body.length() > CURL_MAX_MESSAGE_LENGTH) {
+						::kill(pid,SIGKILL);
+						tooLong = true;
+						break;
+					}
+				}
+				if (FD_ISSET(curlStderr[0],&readfds))
+					::read(curlStderr[0],buf,sizeof(buf));
+				if (FD_ISSET(curlStdout[0],&errfds)||FD_ISSET(curlStderr[0],&errfds))
+					break;
+
+				if (Utils::now() >= timesOutAt) {
+					::kill(pid,SIGKILL);
+					timedOut = true;
+					break;
+				}
+
+				if (waitpid(pid,&exitCode,WNOHANG) > 0) {
+					for(;;) {
+						// Drain output...
+						int n = (int)::read(curlStdout[0],buf,sizeof(buf));
+						if (n <= 0)
+							break;
+						else {
+							_body.append(buf,n);
+							if (_body.length() > CURL_MAX_MESSAGE_LENGTH) {
+								tooLong = true;
+								break;
+							}
+						}
+					}
+					pid = 0;
+					break;
+				}
+			}
+
+			if (pid > 0)
+				waitpid(pid,&exitCode,0);
+
+			::close(curlStdout[0]);
+			::close(curlStderr[0]);
+
+			if (timedOut)
+				_handler(_arg,-1,_url,false,"connection timed out");
+			else if (tooLong)
+				_handler(_arg,-1,_url,false,"response too long");
+			else if (exitCode)
+				_handler(_arg,-1,_url,false,"connection failed (curl returned non-zero exit code)");
+			else {
+				unsigned long idx = 0;
+
+				// Grab status line and headers, which will prefix output on
+				// success and will end with an empty line.
+				std::vector<std::string> headers;
+				headers.push_back(std::string());
+				while (idx < _body.length()) {
+					char c = _body[idx++];
+					if (c == '\n') {
+						if (!headers.back().length()) {
+							headers.pop_back();
+							break;
+						} else headers.push_back(std::string());
+					} else if (c != '\r')
+						headers.back().push_back(c);
+				}
+				if (headers.empty()||(!headers.front().length())) {
+					_handler(_arg,-1,_url,false,"HTTP response empty");
+					delete this;
+					return;
+				}
+
+				// Parse first line -- HTTP status code and response
+				size_t scPos = headers.front().find(' ');
+				if (scPos == std::string::npos) {
+					_handler(_arg,-1,_url,false,"invalid HTTP response (no status line)");
+					delete this;
+					return;
+				}
+				++scPos;
+				unsigned int rcode = Utils::strToUInt(headers.front().substr(scPos,3).c_str());
+				if ((!rcode)||(rcode > 999)) {
+					_handler(_arg,-1,_url,false,"invalid HTTP response (invalid response code)");
+					delete this;
+					return;
+				}
+
+				// Serve up the resulting data to the handler
+				if (rcode == 200)
+					_handler(_arg,rcode,_url,false,_body.substr(idx));
+				else if ((scPos + 4) < headers.front().length())
+					_handler(_arg,rcode,_url,false,headers.front().substr(scPos+4));
+				else _handler(_arg,rcode,_url,false,"(no status message from server)");
+			}
+
+			delete this;
+			return;
+		} else {
+			// fork() succeeded, in child process
+			::dup2(curlStdout[1],STDOUT_FILENO);
+			::close(curlStdout[1]);
+			::dup2(curlStderr[1],STDERR_FILENO);
+			::close(curlStderr[1]);
+			::execv(curlPath.c_str(),curlArgs);
+			::exit(-1); // only reached if execv() fails
+		}
+	}
+
+	const std::string _url;
+	std::string _body;
+	std::map<std::string,std::string> _headers;
+	unsigned int _timeout;
+	void (*_handler)(void *,int,const std::string &,bool,const std::string &);
+	void *_arg;
+	Thread _myThread;
+};
+
+HttpClient::Request HttpClient::_do(
+	const char *method,
+	const std::string &url,
+	const std::map<std::string,std::string> &headers,
+	unsigned int timeout,
+	void (*handler)(void *,int,const std::string &,bool,const std::string &),
+	void *arg)
+{
+	return (HttpClient::Request)(new P_Req(method,url,headers,timeout,handler,arg));
+}
+
+#endif
+
+} // namespace ZeroTier

node/HttpClient.hpp

@@ -0,0 +1,90 @@
+/*
+ * ZeroTier One - Global Peer to Peer Ethernet
+ * Copyright (C) 2012-2013  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/
+ */
+
+#ifndef ZT_HTTPCLIENT_HPP
+#define ZT_HTTPCLIENT_HPP
+
+#include <string>
+#include <map>
+
+#include "Constants.hpp"
+
+namespace ZeroTier {
+
+/**
+ * HTTP client that does queries in the background
+ *
+ * The handler method takes the following arguments: an arbitrary pointer, an
+ * HTTP response code, the URL queried, whether or not the message body was
+ * stored on disk, and the message body.
+ *
+ * If stored on disk, the body string contains the path and the file must be
+ * moved or deleted by the receiver when it's done. If an error occurs, the
+ * response code will be negative and the body will be the error message.
+ *
+ * All headers in the returned headers map will have their header names
+ * converted to lower case, e.g. "content-type".
+ *
+ * Currently only the "http" transport is guaranteed to be supported on all
+ * platforms.
+ */
+class HttpClient
+{
+public:
+	typedef void * Request;
+
+	/**
+	 * Empty map for convenience use
+	 */
+	static const std::map<std::string,std::string> NO_HEADERS;
+
+	/**
+	 * Request a URL using the GET method
+	 */
+	static inline Request GET(
+		const std::string &url,
+		const std::map<std::string,std::string> &headers,
+		unsigned int timeout,
+		void (*handler)(void *,int,const std::string &,bool,const std::string &),
+		void *arg)
+	{
+		return _do("GET",url,headers,timeout,handler,arg);
+	}
+
+private:
+	static Request _do(
+		const char *method,
+		const std::string &url,
+		const std::map<std::string,std::string> &headers,
+		unsigned int timeout,
+		void (*handler)(void *,int,const std::string &,bool,const std::string &),
+		void *arg);
+};
+
+} // namespace ZeroTier
+
+#endif

node/Identity.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_IDENTITY_HPP
-#define _ZT_IDENTITY_HPP
+#ifndef ZT_IDENTITY_HPP
+#define ZT_IDENTITY_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/InetAddress.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_INETADDRESS_HPP
-#define _ZT_INETADDRESS_HPP
+#ifndef ZT_INETADDRESS_HPP
+#define ZT_INETADDRESS_HPP
 
 #include <stdlib.h>
 #include <string.h>

node/Logger.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_LOGGER_HPP
-#define _ZT_LOGGER_HPP
+#ifndef ZT_LOGGER_HPP
+#define ZT_LOGGER_HPP
 
 #include <stdio.h>
 

node/MAC.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MAC_HPP
-#define _ZT_MAC_HPP
+#ifndef ZT_MAC_HPP
+#define ZT_MAC_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/MulticastGroup.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MULTICASTGROUP_HPP
-#define _ZT_MULTICASTGROUP_HPP
+#ifndef ZT_MULTICASTGROUP_HPP
+#define ZT_MULTICASTGROUP_HPP
 
 #include <stdint.h>
 

node/Multicaster.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MULTICASTER_HPP
-#define _ZT_MULTICASTER_HPP
+#ifndef ZT_MULTICASTER_HPP
+#define ZT_MULTICASTER_HPP
 
 #include <stdint.h>
 #include <string.h>

node/Mutex.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MUTEX_HPP
-#define _ZT_MUTEX_HPP
+#ifndef ZT_MUTEX_HPP
+#define ZT_MUTEX_HPP
 
 #include "Constants.hpp"
 #include "NonCopyable.hpp"