diff --git a/.gitignore b/.gitignore index 3aa462cef..1cdc1ba81 100755 --- a/.gitignore +++ b/.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 diff --git a/BUILDING.txt b/BUILDING.txt index 761a50de3..53c9d1a0c 100644 --- a/BUILDING.txt +++ b/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. diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..ac50884cd --- /dev/null +++ b/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 diff --git a/ZeroTierUI/Info.plist b/ZeroTierUI/Info.plist new file mode 100644 index 000000000..06f680c64 --- /dev/null +++ b/ZeroTierUI/Info.plist @@ -0,0 +1,20 @@ + + + + + NSPrincipalClass + NSApplication + CFBundleIconFile + zt1icon.icns + CFBundlePackageType + APPL + CFBundleGetInfoString + ZeroTier One (Mac GUI) + CFBundleSignature + ???? + CFBundleExecutable + ZeroTier One + CFBundleIdentifier + com.zerotier.ZeroTierOne + + diff --git a/ZeroTierUI/ZeroTierUI.pro b/ZeroTierUI/ZeroTierUI.pro new file mode 100644 index 000000000..0bfcb819b --- /dev/null +++ b/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 diff --git a/ZeroTierUI/ZeroTierUI.rc b/ZeroTierUI/ZeroTierUI.rc new file mode 100644 index 000000000..2c5365c0f --- /dev/null +++ b/ZeroTierUI/ZeroTierUI.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "zt1icon.ico" diff --git a/ZeroTierUI/aboutwindow.cpp b/ZeroTierUI/aboutwindow.cpp new file mode 100644 index 000000000..1a2b22907 --- /dev/null +++ b/ZeroTierUI/aboutwindow.cpp @@ -0,0 +1,31 @@ +#include "aboutwindow.h" +#include "ui_aboutwindow.h" + +#include +#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); +} diff --git a/ZeroTierUI/aboutwindow.h b/ZeroTierUI/aboutwindow.h new file mode 100644 index 000000000..6c883b9ba --- /dev/null +++ b/ZeroTierUI/aboutwindow.h @@ -0,0 +1,25 @@ +#ifndef AboutWindow_H +#define AboutWindow_H + +#include + +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 diff --git a/ZeroTierUI/aboutwindow.ui b/ZeroTierUI/aboutwindow.ui new file mode 100644 index 000000000..84aab4347 --- /dev/null +++ b/ZeroTierUI/aboutwindow.ui @@ -0,0 +1,271 @@ + + + AboutWindow + + + + 0 + 0 + 508 + 261 + + + + About ZeroTier One + + + + :/img/zt1icon.png:/img/zt1icon.png + + + true + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 128 + 128 + + + + + 128 + 128 + + + + + + + Qt::PlainText + + + :/img/zt1icon.png + + + true + + + Qt::NoTextInteraction + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 0 + 0 + + + + + 50 + false + + + + ZeroTier One GUI +(c)2012-2013 ZeroTier Networks LLC + +Author(s): Adam Ierymenko +Version: 1.0 + + + Qt::PlainText + + + Qt::AlignHCenter|Qt::AlignTop + + + Qt::NoTextInteraction + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Uninstall + + + false + + + + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + true + + + + + + + + + + + buttonBox + accepted() + AboutWindow + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AboutWindow + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist new file mode 100644 index 000000000..0f32d0efe --- /dev/null +++ b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist @@ -0,0 +1,50 @@ + + + + + CFBundleAllowMixedLocalizations + + CFBundleDevelopmentRegion + English + CFBundleExecutable + applet + CFBundleIconFile + applet + CFBundleIdentifier + com.zerotier.one.ZeroTierOneMacAuthenticateScript + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ZeroTier One (Authenticate) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + aplt + LSMinimumSystemVersionByArchitecture + + x86_64 + 10.6 + + LSRequiresCarbon + + NSHumanReadableCopyright + (c) 2013 ZeroTier Networks LLC + WindowState + + dividerCollapsed + + eventLogLevel + -1 + name + ScriptWindowState + positionOfDivider + 333 + savedFrame + 7 181 602 597 0 0 1280 778 + selectedTabView + result + + + diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet new file mode 100755 index 000000000..8057b9e3b Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet differ diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/PkgInfo b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/PkgInfo new file mode 100644 index 000000000..3253614c4 --- /dev/null +++ b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/PkgInfo @@ -0,0 +1 @@ +APPLaplt \ No newline at end of file diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/Scripts/main.scpt b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/Scripts/main.scpt new file mode 100644 index 000000000..cb578574d Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/Scripts/main.scpt differ diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/applet.icns b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/applet.icns new file mode 100644 index 000000000..0cdd17086 Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/applet.icns differ diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/applet.rsrc b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/applet.rsrc new file mode 100644 index 000000000..a528ee8a9 Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/applet.rsrc differ diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/description.rtfd/TXT.rtf b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/description.rtfd/TXT.rtf new file mode 100644 index 000000000..09700b2f2 --- /dev/null +++ b/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;} +} \ No newline at end of file diff --git a/ZeroTierUI/main.cpp b/ZeroTierUI/main.cpp new file mode 100644 index 000000000..a080bdd29 --- /dev/null +++ b/ZeroTierUI/main.cpp @@ -0,0 +1,11 @@ +#include "mainwindow.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + + return a.exec(); +} diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp new file mode 100644 index 000000000..6e972c73c --- /dev/null +++ b/ZeroTierUI/mainwindow.cpp @@ -0,0 +1,272 @@ +#include "mainwindow.h" +#include "aboutwindow.h" +#include "network.h" +#include "ui_mainwindow.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// 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 > 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 >::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 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 > byNwid; + for(unsigned long i=1;iztMessage.size();++i) { + std::vector l(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[i])); + // 200 listnetworks + if ((l.size() == 9)&&(l[2].length() == 16)) + byNwid[l[2]] = l; + } + + std::map< std::string,std::pair > existingByNwid; + for(int r=0;rnetworkListWidget->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 >::iterator i(existingByNwid.begin());i!=existingByNwid.end();++i) { + if (byNwid.count(i->first)) { + std::vector &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 >::iterator i(byNwid.begin());i!=byNwid.end();++i) { + if (!existingByNwid.count(i->first)) { + std::vector &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;iztMessage.size();++i) { + std::vector 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); +} diff --git a/ZeroTierUI/mainwindow.h b/ZeroTierUI/mainwindow.h new file mode 100644 index 000000000..66a0b350c --- /dev/null +++ b/ZeroTierUI/mainwindow.h @@ -0,0 +1,61 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include +#include + +#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 &m) : + QEvent(QEvent::User), + ztMessage(m) + { + } + + std::vector 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 diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui new file mode 100644 index 000000000..c51036246 --- /dev/null +++ b/ZeroTierUI/mainwindow.ui @@ -0,0 +1,245 @@ + + + MainWindow + + + + 0 + 0 + 668 + 300 + + + + ZeroTier One + + + + :/img/zt1icon.png:/img/zt1icon.png + + + + + 6 + + + 6 + + + 6 + + + 6 + + + 6 + + + + + Qt::NoFocus + + + Qt::ScrollBarAlwaysOff + + + false + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::NoSelection + + + QAbstractItemView::SelectRows + + + QAbstractItemView::ScrollPerPixel + + + + + + + + 0 + 0 + + + + + 6 + + + QLayout::SetDefaultConstraint + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + Courier + 12 + + + + Click to Copy Address to Clipboard + + + border: 0; + + + 0000000000 (OFFLINE, v0.0.0, 0 peers) + + + Qt::ToolButtonTextOnly + + + + + + + + 0 + 0 + + + + + Courier + 12 + + + + Enter Hexadecimal Network ID + + + true + + + (Numeric ID of Network to Join) + + + + + + + + 0 + 0 + + + + + Courier + 12 + 50 + false + false + + + + Join Network + + + false + + + + + + Join + + + Qt::ToolButtonTextOnly + + + + + + + + + + + + 0 + 0 + 668 + 22 + + + + Qt::LeftToRight + + + + Help + + + + + + File + + + + + + + + + + About + + + + + Exit + + + + + + + + + + actionExit + triggered() + MainWindow + close() + + + -1 + -1 + + + 333 + 149 + + + + + diff --git a/ZeroTierUI/network.cpp b/ZeroTierUI/network.cpp new file mode 100644 index 000000000..e23bc6baa --- /dev/null +++ b/ZeroTierUI/network.cpp @@ -0,0 +1,106 @@ +#include "network.h" +#include "mainwindow.h" +#include "ui_network.h" + +#include +#include +#include +#include +#include +#include +#include + +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;iipListWidget->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()); +} diff --git a/ZeroTierUI/network.h b/ZeroTierUI/network.h new file mode 100644 index 000000000..a50354afc --- /dev/null +++ b/ZeroTierUI/network.h @@ -0,0 +1,37 @@ +#ifndef NETWORK_H +#define NETWORK_H + +#include + +#include + +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 diff --git a/ZeroTierUI/network.ui b/ZeroTierUI/network.ui new file mode 100644 index 000000000..e6dc65241 --- /dev/null +++ b/ZeroTierUI/network.ui @@ -0,0 +1,427 @@ + + + Network + + + + 0 + 0 + 580 + 253 + + + + + 0 + 0 + + + + Network + + + + + + + 6 + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 0 + 0 + + + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::AlignHCenter|Qt::AlignTop + + + 6 + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Network ID: + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Click to Copy Network ID to Clipboard + + + border: 0; padding: 0; margin: 0; text-align: left; + + + 0000000000000000 + + + true + + + + + + + Name: + + + Qt::PlainText + + + + + + + + 75 + true + + + + ? + + + Qt::PlainText + + + + + + + Type: + + + Qt::PlainText + + + + + + + + 75 + true + + + + ? + + + Qt::PlainText + + + + + + + Status: + + + Qt::PlainText + + + + + + + Device: + + + Qt::PlainText + + + + + + + + 75 + true + + + + ? + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 12 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 75 + true + + + + ? + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 10 + + + + (configuration is 0 seconds old) + + + Qt::PlainText + + + + + + + + + + + + + + 0 + 0 + + + + + 3 + + + QLayout::SetNoConstraint + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + false + + + + IP Address Assignments + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + Courier + 12 + + + + Qt::NoFocus + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::ScrollPerPixel + + + true + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 10 + false + + + + padding: 0.1em; margin:0; + + + Leave Network + + + + + + + + + + + + + + diff --git a/ZeroTierUI/resources.qrc b/ZeroTierUI/resources.qrc new file mode 100644 index 000000000..a788ae7f8 --- /dev/null +++ b/ZeroTierUI/resources.qrc @@ -0,0 +1,5 @@ + + + zt1icon.png + + diff --git a/ZeroTierUI/zt1icon.icns b/ZeroTierUI/zt1icon.icns new file mode 100644 index 000000000..ce07eb9ea Binary files /dev/null and b/ZeroTierUI/zt1icon.icns differ diff --git a/ZeroTierUI/zt1icon.ico b/ZeroTierUI/zt1icon.ico new file mode 100644 index 000000000..eb29c09bc Binary files /dev/null and b/ZeroTierUI/zt1icon.ico differ diff --git a/ZeroTierUI/zt1icon.png b/ZeroTierUI/zt1icon.png new file mode 100644 index 000000000..bc2651670 Binary files /dev/null and b/ZeroTierUI/zt1icon.png differ diff --git a/attic/update-dummy/update-dummy.nfo b/attic/update-dummy/update-dummy.nfo new file mode 100644 index 000000000..2aa173e0d --- /dev/null +++ b/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 diff --git a/attic/update-dummy/update-dummy.sh b/attic/update-dummy/update-dummy.sh new file mode 100644 index 000000000..cafb6f90a --- /dev/null +++ b/attic/update-dummy/update-dummy.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Dummy updater -- run with opts: $*" +exit 0 diff --git a/buildinstaller.sh b/buildinstaller.sh new file mode 100755 index 000000000..7eb2c243e --- /dev/null +++ b/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 diff --git a/cli.cpp b/cli.cpp deleted file mode 100644 index 66dbd6f31..000000000 --- a/cli.cpp +++ /dev/null @@ -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 . - * - * -- - * - * 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 -#include -#include - -#ifndef __WINDOWS__ -#include -#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] "ZT_EOL_S,exename); - fprintf(out,ZT_EOL_S); - fprintf(out,"Available switches:"ZT_EOL_S); - fprintf(out," -c - Communicate with daemon over this local port"ZT_EOL_S); - fprintf(out," -t - Specify token on command line"ZT_EOL_S); - fprintf(out," -T - 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>/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 diff --git a/ext/installfiles/linux/uninstall.sh b/ext/installfiles/linux/uninstall.sh new file mode 100755 index 000000000..18b8a50b7 --- /dev/null +++ b/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 diff --git a/ext/installfiles/mac/check_for_updates.sh b/ext/installfiles/mac/check_for_updates.sh new file mode 100755 index 000000000..05a7907cf --- /dev/null +++ b/ext/installfiles/mac/check_for_updates.sh @@ -0,0 +1,2 @@ +#!/bin/bash + diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh new file mode 100755 index 000000000..4fa26d00b --- /dev/null +++ b/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 diff --git a/ext/lz4/bench.c b/ext/lz4/bench.c deleted file mode 100644 index d18581163..000000000 --- a/ext/lz4/bench.c +++ /dev/null @@ -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 // malloc -#include // fprintf, fopen, ftello64 -#include // stat64 -#include // stat64 - -// Use ftime() if gettimeofday() is not available on your target -#if defined(BMK_LEGACY_TIMER) -# include // timeb, ftime -#else -# include // 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 -#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 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 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 %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 %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; -} - - - diff --git a/ext/lz4/bench.h b/ext/lz4/bench.h deleted file mode 100644 index a55c3ce29..000000000 --- a/ext/lz4/bench.h +++ /dev/null @@ -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 diff --git a/ext/lz4/fuzzer.c b/ext/lz4/fuzzer.c deleted file mode 100644 index 11697fd03..000000000 --- a/ext/lz4/fuzzer.c +++ /dev/null @@ -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 -#include // fgets, sscanf -#include // 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; -} diff --git a/ext/lz4/lz4.c b/ext/lz4/lz4.c index 1f2eafde3..5668521fb 100644 --- a/ext/lz4/lz4.c +++ b/ext/lz4/lz4.c @@ -1,6 +1,6 @@ /* LZ4 - Fast LZ compression algorithm - 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 @@ -27,8 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. You can contact the author at : - - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html - LZ4 source repository : http://code.google.com/p/lz4/ + - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c */ //************************************** @@ -41,19 +41,20 @@ // Default value is 14, for 16KB, which nicely fits into Intel x86 L1 cache #define MEMORY_USAGE 14 -// BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE : -// This will provide a small boost to performance for big endian cpu, but the resulting compressed stream will be incompatible with little-endian CPU. -// You can set this option to 1 in situations where data will remain within closed environment -// This option is useless on Little_Endian CPU (such as x86) -//#define BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE 1 - +// HEAPMODE : +// Select how default compression functions will allocate memory for their hash table, +// in memory stack (0:default, fastest), or in memory heap (1:requires memory allocation (malloc)). +#define HEAPMODE 0 //************************************** // 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 @@ -69,7 +70,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 @@ -78,7 +79,7 @@ #endif // Unaligned memory access is automatically enabled for "common" CPU, such as x86. -// For others CPU, the compiler will be more cautious, and insert extra code to ensure aligned access is respected +// For others CPU, such as ARM, the compiler may be more cautious, inserting unnecessary extra code to ensure aligned access property // If you know your target CPU supports unaligned memory access, you want to force this option manually to improve performance #if defined(__ARM_FEATURE_UNALIGNED) # define LZ4_FORCE_UNALIGNED_ACCESS 1 @@ -89,27 +90,39 @@ # define LZ4_FORCE_SW_BITCOUNT #endif +// BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE : +// This option may provide a small boost to performance for some big endian cpu, although probably modest. +// You may set this option to 1 if data will remain within closed environment. +// This option is useless on Little_Endian CPU (such as x86) +//#define BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE 1 + //************************************** // 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 -#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) - -#ifdef _MSC_VER // Visual Studio -# include // For Visual 2005 -# if LZ4_ARCH64 // 64-bit +#ifdef _MSC_VER // Visual Studio +# define FORCE_INLINE static __forceinline +# include // 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 +#else +# ifdef __GNUC__ +# define FORCE_INLINE static inline __attribute__((always_inline)) +# else +# define FORCE_INLINE static inline +# endif #endif #ifdef _MSC_VER @@ -118,6 +131,8 @@ # define lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) #endif +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) + #if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__) # define expect(expr,value) (__builtin_expect ((expr),(value)) ) #else @@ -128,72 +143,89 @@ #define unlikely(expr) expect((expr) != 0, 0) +//************************************** +// Memory routines +//************************************** +#include // malloc, calloc, free +#define ALLOCATOR(n,s) calloc(n,s) +#define FREEMEM free +#include // memset, memcpy +#define MEM_INIT memset + + //************************************** // Includes //************************************** -#include // for malloc -#include // for 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 + typedef uint8_t BYTE; + typedef uint16_t U16; + typedef uint32_t U32; + typedef int32_t S32; + typedef uint64_t U64; #else -# include -# 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; - -#ifndef LZ4_FORCE_UNALIGNED_ACCESS -# pragma pack(pop) +#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) +# if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +# pragma pack(1) +# else +# pragma pack(push, 1) +# endif #endif -#define A64(x) (((U64_S *)(x))->v) -#define A32(x) (((U32_S *)(x))->v) -#define A16(x) (((U16_S *)(x))->v) +typedef struct { U16 v; } _PACKED U16_S; +typedef struct { U32 v; } _PACKED U32_S; +typedef struct { U64 v; } _PACKED U64_S; +typedef struct {size_t v;} _PACKED size_t_S; + +#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) +# if defined(__SUNPRO_C) || defined(__SUNPRO_CC) +# pragma pack(0) +# else +# pragma pack(pop) +# endif +#endif + +#define A16(x) (((U16_S *)(x))->v) +#define A32(x) (((U32_S *)(x))->v) +#define A64(x) (((U64_S *)(x))->v) +#define AARCH(x) (((size_t_S *)(x))->v) //************************************** // Constants //************************************** +#define LZ4_HASHLOG (MEMORY_USAGE-2) +#define HASHTABLESIZE (1 << MEMORY_USAGE) +#define HASHNBCELLS4 (1 << LZ4_HASHLOG) + #define MINMATCH 4 -#define HASH_LOG (MEMORY_USAGE-2) -#define HASHTABLESIZE (1 << HASH_LOG) -#define HASH_MASK (HASHTABLESIZE - 1) - -// NOTCOMPRESSIBLE_DETECTIONLEVEL : -// Decreasing this value will make the algorithm skip faster data segments considered "incompressible" -// This may decrease compression ratio dramatically, but will be faster on incompressible data -// Increasing this value will make the algorithm search more before declaring a segment "incompressible" -// This could improve compression a bit, but will be slower on incompressible data -// The default value (6) is recommended -#define NOTCOMPRESSIBLE_DETECTIONLEVEL 6 -#define SKIPSTRENGTH (NOTCOMPRESSIBLE_DETECTIONLEVEL>2?NOTCOMPRESSIBLE_DETECTIONLEVEL:2) -#define STACKLIMIT 13 -#define HEAPMODE (HASH_LOG>STACKLIMIT) // Defines if memory is allocated into the stack (local variable), or into the heap (malloc()). #define COPYLENGTH 8 #define LASTLITERALS 5 #define MFLIMIT (COPYLENGTH+MINMATCH) -#define MINLENGTH (MFLIMIT+1) +const int LZ4_minLength = (MFLIMIT+1); + +#define LZ4_64KLIMIT ((1<<16) + (MFLIMIT-1)) +#define SKIPSTRENGTH 6 // Increasing this value will make the compression run slower on incompressible data #define MAXD_LOG 16 #define MAX_DISTANCE ((1 << MAXD_LOG) - 1) @@ -203,26 +235,43 @@ typedef struct _U64_S { U64 v; } U64_S; #define RUN_BITS (8-ML_BITS) #define RUN_MASK ((1U<> ((MINMATCH*8)-HASH_LOG)) -#define LZ4_HASH_VALUE(p) LZ4_HASH_FUNCTION(A32(p)) -#define LZ4_WILDCOPY(s,d,e) do { LZ4_COPYPACKET(s,d) } while (d=e; //**************************** @@ -259,100 +296,131 @@ struct refTables //**************************** #if LZ4_ARCH64 -static inline 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(LZ4_BIG_ENDIAN) +# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) unsigned long r = 0; _BitScanReverse64( &r, val ); return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +# elif defined(__GNUC__) && (GCC_VERSION >= 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 -#else - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) +# endif +# else +# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) unsigned long r = 0; _BitScanForward64( &r, val ); return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +# elif defined(__GNUC__) && (GCC_VERSION >= 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 + return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58]; +# endif +# endif } #else -static inline 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(LZ4_BIG_ENDIAN) +# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) unsigned long r = 0; _BitScanReverse( &r, val ); return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +# elif defined(__GNUC__) && (GCC_VERSION >= 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 -#else - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) +# endif +# else +# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) unsigned long r; _BitScanForward( &r, val ); return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +# elif defined(__GNUC__) && (GCC_VERSION >= 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 } #endif - -//****************************** +//**************************** // Compression functions -//****************************** +//**************************** +FORCE_INLINE int LZ4_hashSequence(U32 sequence, tableType_t tableType) +{ + if (tableType == byU16) + return (((sequence) * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1))); + else + return (((sequence) * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG)); +} -// LZ4_compressCtx : -// ----------------- -// Compress 'isize' 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. -// return : the number of bytes written in buffer 'dest', or 0 if the compression fails +FORCE_INLINE int LZ4_hashPosition(const BYTE* p, tableType_t tableType) { return LZ4_hashSequence(A32(p), tableType); } -static inline int LZ4_compressCtx(void** ctx, +FORCE_INLINE void LZ4_putPositionOnHash(const BYTE* p, U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase) +{ + switch (tableType) + { + case byPtr: { const BYTE** hashTable = (const BYTE**) tableBase; hashTable[h] = p; break; } + case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = (U32)(p-srcBase); break; } + case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = (U16)(p-srcBase); break; } + } +} + +FORCE_INLINE void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase) +{ + U32 h = LZ4_hashPosition(p, tableType); + LZ4_putPositionOnHash(p, h, tableBase, tableType, srcBase); +} + +FORCE_INLINE const BYTE* LZ4_getPositionOnHash(U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase) +{ + if (tableType == byPtr) { const BYTE** hashTable = (const BYTE**) tableBase; return hashTable[h]; } + if (tableType == byU32) { U32* hashTable = (U32*) tableBase; return hashTable[h] + srcBase; } + { U16* hashTable = (U16*) tableBase; return hashTable[h] + srcBase; } // default, to ensure a return +} + +FORCE_INLINE const BYTE* LZ4_getPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase) +{ + U32 h = LZ4_hashPosition(p, tableType); + return LZ4_getPositionOnHash(h, tableBase, tableType, srcBase); +} + + +FORCE_INLINE int LZ4_compress_generic( + void* ctx, const char* source, char* dest, - int isize, - int maxOutputSize) -{ -#if HEAPMODE - struct refTables *srt = (struct refTables *) (*ctx); - HTYPE* HashTable; -#else - HTYPE HashTable[HASHTABLESIZE] = {0}; -#endif + int inputSize, + int maxOutputSize, - const BYTE* ip = (BYTE*) source; - INITBASE(base); - const BYTE* anchor = ip; - const BYTE* const iend = ip + isize; + limitedOutput_directive limitedOutput, + tableType_t tableType, + prefix64k_directive prefix) +{ + const BYTE* ip = (const BYTE*) source; + const BYTE* const base = (prefix==withPrefix) ? ((LZ4_Data_Structure*)ctx)->base : (const BYTE*) source; + const BYTE* const lowLimit = ((prefix==withPrefix) ? ((LZ4_Data_Structure*)ctx)->bufferStart : (const BYTE*)source); + const BYTE* anchor = (const BYTE*) source; + const BYTE* const iend = ip + inputSize; const BYTE* const mflimit = iend - MFLIMIT; -#define matchlimit (iend - LASTLITERALS) + const BYTE* const matchlimit = iend - LASTLITERALS; BYTE* op = (BYTE*) dest; BYTE* const oend = op + maxOutputSize; @@ -361,25 +429,16 @@ static inline int LZ4_compressCtx(void** ctx, const int skipStrength = SKIPSTRENGTH; U32 forwardH; - - // Init - if (isizehashTable); - memset((void*)HashTable, 0, sizeof(srt->hashTable)); -#else - (void) ctx; -#endif - + // Init conditions + if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) return 0; // Unsupported input size, too large (or negative) + if ((prefix==withPrefix) && (ip != ((LZ4_Data_Structure*)ctx)->nextBlock)) return 0; // must continue from end of previous block + if (prefix==withPrefix) ((LZ4_Data_Structure*)ctx)->nextBlock=iend; // do it now, due to potential early exit + if ((tableType == byU16) && (inputSize>=LZ4_64KLIMIT)) return 0; // Size too large (not within 64K limit) + if (inputSize mflimit) { goto _last_literals; } - forwardH = LZ4_HASH_VALUE(forwardIp); - ref = base + HashTable[h]; - HashTable[h] = ip - base; + forwardH = LZ4_hashPosition(forwardIp, tableType); + ref = LZ4_getPositionOnHash(h, ctx, tableType, base); + LZ4_putPositionOnHash(ip, h, ctx, tableType, base); - } while ((ref < ip - MAX_DISTANCE) || (A32(ref) != A32(ip))); + } while ((ref + MAX_DISTANCE < ip) || (A32(ref) != A32(ip))); // Catch up - while ((ip>anchor) && (ref>(BYTE*)source) && unlikely(ip[-1]==ref[-1])) { ip--; ref--; } + while ((ip>anchor) && (ref > lowLimit) && unlikely(ip[-1]==ref[-1])) { ip--; ref--; } // Encode Literal length length = (int)(ip - anchor); token = op++; - if unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) > oend) return 0; // Check output limit -#ifdef _MSC_VER + if ((limitedOutput) && unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) > oend)) return 0; // Check output limit if (length>=(int)RUN_MASK) { int len = length-RUN_MASK; *token=(RUN_MASK<254) - { - do { *op++ = 255; len -= 255; } while (len>254); - *op++ = (BYTE)len; - memcpy(op, anchor, length); - op += length; - goto _next_match; - } - else + for(; len >= 255 ; len-=255) *op++ = 255; *op++ = (BYTE)len; } - else *token = (length<=(int)RUN_MASK) - { - int len; - *token=(RUN_MASK< 254 ; len-=255) *op++ = 255; - *op++ = (BYTE)len; - } - else *token = (length<>8) > oend) return 0; // Check output limit + if ((limitedOutput) && unlikely(op + (1 + LASTLITERALS) + (length>>8) > oend)) return 0; // 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; } + if (length >= 255) { length-=255; *op++ = 255; } *op++ = (BYTE)length; } - else *token += length; + else *token += (BYTE)(length); // Test end of chunk if (ip > mflimit) { anchor = ip; break; } // Fill table - HashTable[LZ4_HASH_VALUE(ip-2)] = ip - 2 - base; + LZ4_putPosition(ip-2, ctx, tableType, base); // Test next position - ref = base + HashTable[LZ4_HASH_VALUE(ip)]; - HashTable[LZ4_HASH_VALUE(ip)] = ip - base; - if ((ref > ip - (MAX_DISTANCE + 1)) && (A32(ref) == A32(ip))) { token = op++; *token=0; goto _next_match; } + ref = LZ4_getPosition(ip, ctx, tableType, base); + LZ4_putPosition(ip, ctx, tableType, base); + if ((ref + MAX_DISTANCE >= ip) && (A32(ref) == A32(ip))) { token = op++; *token=0; goto _next_match; } // Prepare next loop anchor = ip++; - forwardH = LZ4_HASH_VALUE(ip); + forwardH = LZ4_hashPosition(ip, tableType); } _last_literals: // Encode Last Literals { int lastRun = (int)(iend - anchor); - if (((char*)op - dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize) return 0; - if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK< 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } - else *op++ = (lastRun< (U32)maxOutputSize)) return 0; // Check output limit + if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<= 255 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } + else *op++ = (BYTE)(lastRun<> ((MINMATCH*8)-HASHLOG64K)) -#define LZ4_HASH64K_VALUE(p) LZ4_HASH64K_FUNCTION(A32(p)) -static inline int LZ4_compress64kCtx(void** ctx, - const char* source, - char* dest, - int isize, - int maxOutputSize) +int LZ4_compress(const char* source, char* dest, int inputSize) { -#if HEAPMODE - struct refTables *srt = (struct refTables *) (*ctx); - U16* HashTable; +#if (HEAPMODE) + void* ctx = ALLOCATOR(HASHNBCELLS4, 4); // Aligned on 4-bytes boundaries #else - U16 HashTable[HASH64KTABLESIZE] = {0}; + U32 ctx[1U<<(MEMORY_USAGE-2)] = {0}; // Ensure data is aligned on 4-bytes boundaries #endif - - const BYTE* ip = (BYTE*) source; - const BYTE* anchor = ip; - const BYTE* const base = ip; - const BYTE* const iend = ip + isize; - const BYTE* const mflimit = iend - MFLIMIT; -#define matchlimit (iend - LASTLITERALS) - - BYTE* op = (BYTE*) dest; - BYTE* const oend = op + maxOutputSize; - - int len, length; - const int skipStrength = SKIPSTRENGTH; - U32 forwardH; - - - // Init - if (isizehashTable); - memset((void*)HashTable, 0, sizeof(srt->hashTable)); -#else - (void) ctx; -#endif - - - // First Byte - ip++; forwardH = LZ4_HASH64K_VALUE(ip); - - // Main Loop - for ( ; ; ) - { - int findMatchAttempts = (1U << skipStrength) + 3; - const BYTE* forwardIp = ip; - const BYTE* ref; - BYTE* token; - - // Find a match - do { - U32 h = forwardH; - int step = findMatchAttempts++ >> skipStrength; - ip = forwardIp; - forwardIp = ip + step; - - if (forwardIp > mflimit) { goto _last_literals; } - - forwardH = LZ4_HASH64K_VALUE(forwardIp); - ref = base + HashTable[h]; - HashTable[h] = (U16)(ip - base); - - } while (A32(ref) != A32(ip)); - - // Catch up - while ((ip>anchor) && (ref>(BYTE*)source) && (ip[-1]==ref[-1])) { ip--; ref--; } - - // Encode Literal length - length = (int)(ip - anchor); - token = op++; - if unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) > oend) return 0; // Check output limit -#ifdef _MSC_VER - if (length>=(int)RUN_MASK) - { - int len = length-RUN_MASK; - *token=(RUN_MASK<254) - { - do { *op++ = 255; len -= 255; } while (len>254); - *op++ = (BYTE)len; - memcpy(op, anchor, length); - op += length; - goto _next_match; - } - else - *op++ = (BYTE)len; - } - else *token = (length<=(int)RUN_MASK) { *token=(RUN_MASK< 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; } - else *token = (length<>8) > oend) return 0; // Check output limit - 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; - - // Test end of chunk - if (ip > mflimit) { anchor = ip; break; } - - // Fill table - HashTable[LZ4_HASH64K_VALUE(ip-2)] = (U16)(ip - 2 - base); - - // Test next position - ref = base + HashTable[LZ4_HASH64K_VALUE(ip)]; - HashTable[LZ4_HASH64K_VALUE(ip)] = (U16)(ip - base); - if (A32(ref) == A32(ip)) { token = op++; *token=0; goto _next_match; } - - // Prepare next loop - anchor = ip++; - forwardH = LZ4_HASH64K_VALUE(ip); - } - -_last_literals: - // Encode Last Literals - { - int lastRun = (int)(iend - anchor); - if (op + lastRun + 1 + (lastRun-RUN_MASK+255)/255 > oend) return 0; - if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK< 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } - else *op++ = (lastRun<hashTable, 0, sizeof(lz4ds->hashTable)); + lz4ds->bufferStart = base; + lz4ds->base = base; + lz4ds->nextBlock = base; +} + + +void* LZ4_create (const char* inputBuffer) +{ + void* lz4ds = ALLOCATOR(1, sizeof(LZ4_Data_Structure)); + LZ4_init ((LZ4_Data_Structure*)lz4ds, (const BYTE*)inputBuffer); + return lz4ds; +} + + +int LZ4_free (void* LZ4_Data) +{ + FREEMEM(LZ4_Data); + return (0); +} + + +char* LZ4_slideInputBuffer (void* LZ4_Data) +{ + LZ4_Data_Structure* lz4ds = (LZ4_Data_Structure*)LZ4_Data; + size_t delta = lz4ds->nextBlock - (lz4ds->bufferStart + 64 KB); + + if ( (lz4ds->base - delta > lz4ds->base) // underflow control + || ((size_t)(lz4ds->nextBlock - lz4ds->base) > 0xE0000000) ) // close to 32-bits limit + { + size_t deltaLimit = (lz4ds->nextBlock - 64 KB) - lz4ds->base; + int nH; + + for (nH=0; nH < HASHNBCELLS4; nH++) + { + if ((size_t)(lz4ds->hashTable[nH]) < deltaLimit) lz4ds->hashTable[nH] = 0; + else lz4ds->hashTable[nH] -= (U32)deltaLimit; + } + memcpy((void*)(lz4ds->bufferStart), (const void*)(lz4ds->nextBlock - 64 KB), 64 KB); + lz4ds->base = lz4ds->bufferStart; + lz4ds->nextBlock = lz4ds->base + 64 KB; + } + else + { + memcpy((void*)(lz4ds->bufferStart), (const void*)(lz4ds->nextBlock - 64 KB), 64 KB); + lz4ds->nextBlock -= delta; + lz4ds->base -= delta; + } + + return (char*)(lz4ds->nextBlock); +} //**************************** // Decompression functions //**************************** -// Note : The decoding functions LZ4_uncompress() and LZ4_uncompress_unknownOutputSize() -// are safe against "buffer overflow" attack type. -// They will never write nor read outside of the provided output buffers. -// LZ4_uncompress_unknownOutputSize() also insures that it will never read outside of the input buffer. -// A corrupted input will produce an error result, a negative int, indicating the position of the error within input stream. - -int LZ4_uncompress(const char* source, +// This generic decompression function cover all use cases. +// It shall be instanciated several times, using different sets of directives +// Note that it is essential this generic function is really inlined, +// in order to remove useless branches during compilation optimisation. +FORCE_INLINE int LZ4_decompress_generic( + const char* source, char* dest, - int osize) + int inputSize, // + int outputSize, // If endOnInput==endOnInputSize, this value is the max size of Output Buffer. + + int endOnInput, // endOnOutputSize, endOnInputSize + int prefix64k, // noPrefix, withPrefix + int partialDecoding, // full, partial + int targetOutputSize // only used if partialDecoding==partial + ) { // Local Variables const BYTE* restrict ip = (const BYTE*) source; const BYTE* ref; + const BYTE* const iend = ip + inputSize; BYTE* op = (BYTE*) dest; - BYTE* const oend = op + osize; + BYTE* const oend = op + outputSize; BYTE* cpy; + BYTE* oexit = op + targetOutputSize; - unsigned token; + const size_t dec32table[] = {0, 3, 2, 3, 0, 0, 0, 0}; // static reduces speed for LZ4_decompress_safe() on GCC64 + static const size_t dec64table[] = {0, 0, 0, (size_t)-1, 0, 1, 2, 3}; - size_t dec32table[] = {0, 3, 2, 3, 0, 0, 0, 0}; -#if LZ4_ARCH64 - size_t dec64table[] = {0, 0, 0, -1, 0, 1, 2, 3}; -#endif + + // Special cases + if ((partialDecoding) && (oexit> oend-MFLIMIT)) oexit = oend-MFLIMIT; // targetOutputSize too high => decode everything + if ((endOnInput) && unlikely(outputSize==0)) return ((inputSize==1) && (*ip==0)) ? 0 : -1; // Empty output buffer + if ((!endOnInput) && unlikely(outputSize==0)) return (*ip==0?1:-1); // Main Loop while (1) - { - size_t length; - - // get runlength - token = *ip++; - if ((length=(token>>ML_BITS)) == RUN_MASK) { size_t len; for (;(len=*ip++)==255;length+=255){} length += len; } - - // copy literals - cpy = op+length; - if (cpy>oend-COPYLENGTH) - { - if (cpy != oend) goto _output_error; // Error : not enough place for another match (min 4) + 5 literals - memcpy(op, ip, length); - ip += length; - break; // EOF - } - LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy; - - // get offset - LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2; - if unlikely(ref < (BYTE* const)dest) goto _output_error; // Error : offset outside destination buffer - - // get matchlength - if ((length=(token&ML_MASK)) == ML_MASK) { for (;*ip==255;length+=255) {ip++;} length += *ip++; } - - // copy repeated sequence - if unlikely((op-ref)oend-(COPYLENGTH)-(STEPSIZE-4)) - { - if (cpy > oend-LASTLITERALS) goto _output_error; // Error : last 5 bytes must be literals - LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH)); - while(op>ML_BITS)) == RUN_MASK) + if ((length=(token>>ML_BITS)) == RUN_MASK) { - int s=255; - while (likely(ipoend-MFLIMIT) || (ip+length>iend-(2+1+LASTLITERALS))) + if (((endOnInput) && ((cpy>(partialDecoding?oexit:oend-MFLIMIT)) || (ip+length>iend-(2+1+LASTLITERALS))) ) + || ((!endOnInput) && (cpy>oend-COPYLENGTH))) { - if (cpy > oend) goto _output_error; // Error : writes beyond output buffer - if (ip+length != iend) goto _output_error; // Error : LZ4 format requires to consume all input at this stage (no match within the last 11 bytes, and at least 8 remaining input bytes for another match+literals) + if (partialDecoding) + { + if (cpy > oend) goto _output_error; // Error : write attempt beyond end of output buffer + if ((endOnInput) && (ip+length > iend)) goto _output_error; // Error : read attempt beyond end of input buffer + } + else + { + if ((!endOnInput) && (cpy != oend)) goto _output_error; // Error : block decoding must stop exactly there + if ((endOnInput) && ((ip+length != iend) || (cpy > oend))) goto _output_error; // Error : input must be consumed + } memcpy(op, ip, length); + ip += length; op += length; break; // Necessarily EOF, due to parsing restrictions } - LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy; + LZ4_WILDCOPY(op, ip, cpy); ip -= (op-cpy); op = cpy; // get offset LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2; - if unlikely(ref < (BYTE* const)dest) goto _output_error; // Error : offset outside of destination buffer + if ((prefix64k==noPrefix) && unlikely(ref < (BYTE* const)dest)) goto _output_error; // Error : offset outside destination buffer // get matchlength - if ((length=(token&ML_MASK)) == ML_MASK) + if ((length=(token&ML_MASK)) == ML_MASK) { - while likely(ipoend-(COPYLENGTH+(STEPSIZE-4))) + if unlikely(cpy>oend-COPYLENGTH-(STEPSIZE-4)) { if (cpy > oend-LASTLITERALS) goto _output_error; // Error : last 5 bytes must be literals - LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH)); + LZ4_SECURECOPY(op, ref, (oend-COPYLENGTH)); while(op (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) - 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() +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) + 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) } diff --git a/ext/lz4/lz4_format_description.txt b/ext/lz4/lz4_format_description.txt deleted file mode 100644 index a170ddefa..000000000 --- a/ext/lz4/lz4_format_description.txt +++ /dev/null @@ -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. - diff --git a/ext/lz4/lz4demo.c b/ext/lz4/lz4demo.c deleted file mode 100644 index 85edcf001..000000000 --- a/ext/lz4/lz4demo.c +++ /dev/null @@ -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 // fprintf, fopen, fread, _fileno(?) -#include // malloc -#include // strcmp -#include // clock -#ifdef _WIN32 -#include // _setmode -#include // _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='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 - -} diff --git a/ext/lz4/lz4hc.c b/ext/lz4/lz4hc.c index 7324492ec..db6b484ab 100644 --- a/ext/lz4/lz4hc.c +++ b/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 // calloc, free +#define ALLOCATOR(s) calloc(1,s) +#define FREEMEM free +#include // 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 // For Visual 2005 -# if LZ4_ARCH64 // 64-bit +#ifdef _MSC_VER // Visual Studio +# define FORCE_INLINE static __forceinline +# include // 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 // calloc, free -#include // 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 + typedef uint8_t BYTE; + typedef uint16_t U16; + typedef uint32_t U32; + typedef int32_t S32; + typedef uint64_t U64; #else -#include -#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> ((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; ihashTable[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< 254 ; len-=255) *(*op)++ = 255; *(*op)++ = (BYTE)len; } - else *token = (length<>8)) > oend)) return 1; // Check output limit + if (length>=(int)RUN_MASK) { int len; *token=(RUN_MASK< 254 ; len-=255) *(*op)++ = 255; *(*op)++ = (BYTE)len; } + else *token = (BYTE)(length<=(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< 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } - else *op++ = (lastRun< 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. */ diff --git a/tap-mac/README.txt b/ext/tap-mac/README.txt similarity index 100% rename from tap-mac/README.txt rename to ext/tap-mac/README.txt diff --git a/tap-mac/tuntap/Changelog b/ext/tap-mac/tuntap/Changelog similarity index 100% rename from tap-mac/tuntap/Changelog rename to ext/tap-mac/tuntap/Changelog diff --git a/tap-mac/tuntap/Makefile b/ext/tap-mac/tuntap/Makefile similarity index 100% rename from tap-mac/tuntap/Makefile rename to ext/tap-mac/tuntap/Makefile diff --git a/tap-mac/tuntap/README b/ext/tap-mac/tuntap/README similarity index 100% rename from tap-mac/tuntap/README rename to ext/tap-mac/tuntap/README diff --git a/tap-mac/tuntap/README.zerotier-build b/ext/tap-mac/tuntap/README.zerotier-build similarity index 100% rename from tap-mac/tuntap/README.zerotier-build rename to ext/tap-mac/tuntap/README.zerotier-build diff --git a/tap-mac/tuntap/src/lock.cc b/ext/tap-mac/tuntap/src/lock.cc similarity index 100% rename from tap-mac/tuntap/src/lock.cc rename to ext/tap-mac/tuntap/src/lock.cc diff --git a/tap-mac/tuntap/src/lock.h b/ext/tap-mac/tuntap/src/lock.h similarity index 100% rename from tap-mac/tuntap/src/lock.h rename to ext/tap-mac/tuntap/src/lock.h diff --git a/tap-mac/tuntap/src/mem.cc b/ext/tap-mac/tuntap/src/mem.cc similarity index 100% rename from tap-mac/tuntap/src/mem.cc rename to ext/tap-mac/tuntap/src/mem.cc diff --git a/tap-mac/tuntap/src/mem.h b/ext/tap-mac/tuntap/src/mem.h similarity index 100% rename from tap-mac/tuntap/src/mem.h rename to ext/tap-mac/tuntap/src/mem.h diff --git a/tap-mac/tuntap/src/tap/Info.plist b/ext/tap-mac/tuntap/src/tap/Info.plist similarity index 100% rename from tap-mac/tuntap/src/tap/Info.plist rename to ext/tap-mac/tuntap/src/tap/Info.plist diff --git a/tap-mac/tuntap/src/tap/Makefile b/ext/tap-mac/tuntap/src/tap/Makefile similarity index 94% rename from tap-mac/tuntap/src/tap/Makefile rename to ext/tap-mac/tuntap/src/tap/Makefile index 58e582da0..ee1f5457f 100644 --- a/tap-mac/tuntap/src/tap/Makefile +++ b/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 diff --git a/tap-mac/tuntap/src/tap/kmod.cc b/ext/tap-mac/tuntap/src/tap/kmod.cc similarity index 100% rename from tap-mac/tuntap/src/tap/kmod.cc rename to ext/tap-mac/tuntap/src/tap/kmod.cc diff --git a/tap-mac/tuntap/src/tap/tap.cc b/ext/tap-mac/tuntap/src/tap/tap.cc similarity index 100% rename from tap-mac/tuntap/src/tap/tap.cc rename to ext/tap-mac/tuntap/src/tap/tap.cc diff --git a/tap-mac/tuntap/src/tap/tap.h b/ext/tap-mac/tuntap/src/tap/tap.h similarity index 100% rename from tap-mac/tuntap/src/tap/tap.h rename to ext/tap-mac/tuntap/src/tap/tap.h diff --git a/tap-mac/tuntap/src/tuntap.cc b/ext/tap-mac/tuntap/src/tuntap.cc similarity index 100% rename from tap-mac/tuntap/src/tuntap.cc rename to ext/tap-mac/tuntap/src/tuntap.cc diff --git a/tap-mac/tuntap/src/tuntap.h b/ext/tap-mac/tuntap/src/tuntap.h similarity index 100% rename from tap-mac/tuntap/src/tuntap.h rename to ext/tap-mac/tuntap/src/tuntap.h diff --git a/tap-mac/tuntap/src/tuntap_mgr.cc b/ext/tap-mac/tuntap/src/tuntap_mgr.cc similarity index 100% rename from tap-mac/tuntap/src/tuntap_mgr.cc rename to ext/tap-mac/tuntap/src/tuntap_mgr.cc diff --git a/tap-mac/tuntap/src/util.h b/ext/tap-mac/tuntap/src/util.h similarity index 100% rename from tap-mac/tuntap/src/util.h rename to ext/tap-mac/tuntap/src/util.h diff --git a/tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings b/ext/tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings similarity index 100% rename from tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings rename to ext/tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings diff --git a/tap-mac/tuntap/startup_item/tap/StartupParameters.plist b/ext/tap-mac/tuntap/startup_item/tap/StartupParameters.plist similarity index 100% rename from tap-mac/tuntap/startup_item/tap/StartupParameters.plist rename to ext/tap-mac/tuntap/startup_item/tap/StartupParameters.plist diff --git a/tap-mac/tuntap/startup_item/tap/tap b/ext/tap-mac/tuntap/startup_item/tap/tap similarity index 100% rename from tap-mac/tuntap/startup_item/tap/tap rename to ext/tap-mac/tuntap/startup_item/tap/tap diff --git a/tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings b/ext/tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings similarity index 100% rename from tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings rename to ext/tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings diff --git a/tap-mac/tuntap/startup_item/tun/StartupParameters.plist b/ext/tap-mac/tuntap/startup_item/tun/StartupParameters.plist similarity index 100% rename from tap-mac/tuntap/startup_item/tun/StartupParameters.plist rename to ext/tap-mac/tuntap/startup_item/tun/StartupParameters.plist diff --git a/tap-mac/tuntap/startup_item/tun/tun b/ext/tap-mac/tuntap/startup_item/tun/tun similarity index 100% rename from tap-mac/tuntap/startup_item/tun/tun rename to ext/tap-mac/tuntap/startup_item/tun/tun diff --git a/file2lz4c.cpp b/file2lz4c.cpp new file mode 100644 index 000000000..aa0acd0b6 --- /dev/null +++ b/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 . + * + * -- + * + * 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 +#include +#include +#include +#include + +#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] << " " << 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. - * - * -- - * - * 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 -#include -#include -#include -#include - -#include "node/Identity.hpp" -#include "node/Utils.hpp" -#include "node/C25519.hpp" - -using namespace ZeroTier; - -static void printHelp(char *pn) -{ - std::cout << "Usage: " << pn << " []" << std::endl << std::endl; - std::cout << "Commands:" << std::endl; - std::cout << "\tgenerate [] []" << std::endl; - std::cout << "\tvalidate " << std::endl; - std::cout << "\tgetpublic " << std::endl; - std::cout << "\tsign " << std::endl; - std::cout << "\tverify " << 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; -} diff --git a/installer.cpp b/installer.cpp new file mode 100644 index 000000000..90cc8c052 --- /dev/null +++ b/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 . + * + * -- + * + * 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 +#include +#include +#include + +#include "node/Constants.hpp" +#include "version.h" + +#ifdef __WINDOWS__ +#include +#include +#include +#else +#include +#include +#include +#include +#include +#include +#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; +} diff --git a/main.cpp b/main.cpp index 8bf1bd009..0ba758142 100644 --- a/main.cpp +++ b/main.cpp @@ -44,6 +44,7 @@ #else #include #include +#include #include #include #include @@ -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 - Bind to this port for network I/O"ZT_EOL_S); - fprintf(out," -c - 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 - Bind to this port for network I/O"ZT_EOL_S); + fprintf(out," -c - 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] "ZT_EOL_S,exename); + fprintf(out,ZT_EOL_S); + fprintf(out,"Available switches:"ZT_EOL_S); + fprintf(out," -c - Communicate with daemon over this local port"ZT_EOL_S); + fprintf(out," -t - Specify token on command line"ZT_EOL_S); + fprintf(out," -T - 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 []"ZT_EOL_S""ZT_EOL_S"Commands:"ZT_EOL_S,pn); + fprintf(out," generate [] []"ZT_EOL_S); + fprintf(out," validate "ZT_EOL_S); + fprintf(out," getpublic "ZT_EOL_S); + fprintf(out," sign "ZT_EOL_S); + fprintf(out," verify "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; } diff --git a/Makefile.linux b/make-linux.mk similarity index 66% rename from Makefile.linux rename to make-linux.mk index 8035a8811..cb4631d96 100644 --- a/Makefile.linux +++ b/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: diff --git a/Makefile.mac b/make-mac.mk similarity index 67% rename from Makefile.mac rename to make-mac.mk index 841ea6cbf..84b989947 100644 --- a/Makefile.mac +++ b/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: diff --git a/netconf-service/README.txt b/netconf-service/README.txt new file mode 100644 index 000000000..6ec7eebac --- /dev/null +++ b/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. diff --git a/node/Address.hpp b/node/Address.hpp index b28284b0f..7247260cc 100644 --- a/node/Address.hpp +++ b/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 #include diff --git a/node/Array.hpp b/node/Array.hpp index d48c2f52c..c31626b29 100644 --- a/node/Array.hpp +++ b/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 #include diff --git a/node/AtomicCounter.hpp b/node/AtomicCounter.hpp index ebc70817a..1aecaa65a 100644 --- a/node/AtomicCounter.hpp +++ b/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" diff --git a/node/BandwidthAccount.hpp b/node/BandwidthAccount.hpp index be180cfca..98c7dd20b 100644 --- a/node/BandwidthAccount.hpp +++ b/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 #include diff --git a/node/Buffer.hpp b/node/Buffer.hpp index 1767ae049..e8308306f 100644 --- a/node/Buffer.hpp +++ b/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 #include diff --git a/node/C25519.hpp b/node/C25519.hpp index 79edfa065..2a594f725 100644 --- a/node/C25519.hpp +++ b/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" diff --git a/node/CMWC4096.hpp b/node/CMWC4096.hpp index 293518615..01c57e15e 100644 --- a/node/CMWC4096.hpp +++ b/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 #include "Utils.hpp" diff --git a/node/CertificateOfMembership.hpp b/node/CertificateOfMembership.hpp index 76e1cfbc6..6f78734eb 100644 --- a/node/CertificateOfMembership.hpp +++ b/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 #include diff --git a/node/Condition.hpp b/node/Condition.hpp index 4b2d32cac..728799d9e 100644 --- a/node/Condition.hpp +++ b/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" diff --git a/node/Constants.hpp b/node/Constants.hpp index 8e252f2a5..21c8a0eca 100644 --- a/node/Constants.hpp +++ b/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 #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 diff --git a/node/Defaults.cpp b/node/Defaults.cpp index 35a677f28..2588c85f6 100644 --- a/node/Defaults.cpp +++ b/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()) { } diff --git a/node/Defaults.hpp b/node/Defaults.hpp index 5f8701948..9d6d4bcf6 100644 --- a/node/Defaults.hpp +++ b/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 #include @@ -67,6 +67,22 @@ public: * Supernodes on the ZeroTier network */ const std::map< Identity,std::vector > 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; diff --git a/node/Demarc.hpp b/node/Demarc.hpp index fc283fef4..0bbdef44d 100644 --- a/node/Demarc.hpp +++ b/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 #include diff --git a/node/Dictionary.hpp b/node/Dictionary.hpp index a0a64cec4..214c00943 100644 --- a/node/Dictionary.hpp +++ b/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 #include diff --git a/node/EthernetTap.cpp b/node/EthernetTap.cpp index fadd8e502..44118c2a8 100644 --- a/node/EthernetTap.cpp +++ b/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]; diff --git a/node/EthernetTap.hpp b/node/EthernetTap.hpp index 3db413920..68a365bf0 100644 --- a/node/EthernetTap.hpp +++ b/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 #include diff --git a/node/HttpClient.cpp b/node/HttpClient.cpp new file mode 100644 index 000000000..d4e760182 --- /dev/null +++ b/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 . + * + * -- + * + * 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 +#include +#include + +#include +#include +#include + +#include "Constants.hpp" +#include "HttpClient.hpp" +#include "Thread.hpp" +#include "Utils.hpp" +#include "NonCopyable.hpp" +#include "Defaults.hpp" + +#ifdef __UNIX_LIKE__ +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +namespace ZeroTier { + +const std::map 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 &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(curlPath.c_str()); + curlArgs[1] = const_cast ("-D"); + curlArgs[2] = const_cast ("-"); // append headers before output + int argPtr = 3; + std::vector headerArgs; + for(std::map::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::iterator h(headerArgs.begin());h!=headerArgs.end();++h) { + if (argPtr >= (1024 - 4)) // leave room for terminating NULL and URL + break; + curlArgs[argPtr++] = const_cast ("-H"); + curlArgs[argPtr++] = const_cast (h->c_str()); + } + curlArgs[argPtr++] = const_cast (_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 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 _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 &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 diff --git a/node/HttpClient.hpp b/node/HttpClient.hpp new file mode 100644 index 000000000..4f5c9bc71 --- /dev/null +++ b/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 . + * + * -- + * + * 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 +#include + +#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 NO_HEADERS; + + /** + * Request a URL using the GET method + */ + static inline Request GET( + const std::string &url, + const std::map &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 &headers, + unsigned int timeout, + void (*handler)(void *,int,const std::string &,bool,const std::string &), + void *arg); +}; + +} // namespace ZeroTier + +#endif diff --git a/node/Identity.hpp b/node/Identity.hpp index cb911b92f..f6b1f8766 100644 --- a/node/Identity.hpp +++ b/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 #include diff --git a/node/InetAddress.hpp b/node/InetAddress.hpp index 54fbc395e..d90574e5d 100644 --- a/node/InetAddress.hpp +++ b/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 #include diff --git a/node/Logger.hpp b/node/Logger.hpp index de71ed39a..b99df3920 100644 --- a/node/Logger.hpp +++ b/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 diff --git a/node/MAC.hpp b/node/MAC.hpp index 87363a444..f0bca937a 100644 --- a/node/MAC.hpp +++ b/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 #include diff --git a/node/MulticastGroup.hpp b/node/MulticastGroup.hpp index 426ef0480..32f8c0edc 100644 --- a/node/MulticastGroup.hpp +++ b/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 diff --git a/node/Multicaster.hpp b/node/Multicaster.hpp index 16ae7218e..164bfd79d 100644 --- a/node/Multicaster.hpp +++ b/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 #include diff --git a/node/Mutex.hpp b/node/Mutex.hpp index b01302937..509b60bed 100644 --- a/node/Mutex.hpp +++ b/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" diff --git a/node/Network.hpp b/node/Network.hpp index a219cdf2c..f41e75021 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_NETWORK_HPP -#define _ZT_NETWORK_HPP +#ifndef ZT_NETWORK_HPP +#define ZT_NETWORK_HPP #include diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index a833006fe..823363bdc 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_NETWORKCONFIG_HPP -#define _ZT_NETWORKCONFIG_HPP +#ifndef ZT_NETWORKCONFIG_HPP +#define ZT_NETWORKCONFIG_HPP #include diff --git a/node/Node.cpp b/node/Node.cpp index fe8cfb18f..dd0e47edf 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -68,6 +68,7 @@ #include "CMWC4096.hpp" #include "SHA512.hpp" #include "Service.hpp" +#include "SoftwareUpdater.hpp" #ifdef __WINDOWS__ #include @@ -182,6 +183,11 @@ unsigned long Node::LocalClient::send(const char *command) } } +std::vector Node::LocalClient::splitLine(const char *line) +{ + return Utils::split(line," ","\\","\""); +} + struct _NodeImpl { RuntimeEnvironment renv; @@ -205,6 +211,7 @@ struct _NodeImpl #ifndef __WINDOWS__ delete renv.netconfService; #endif + delete renv.updater; delete renv.nc; delete renv.sysEnv; delete renv.topology; @@ -424,6 +431,10 @@ Node::ReasonForTermination Node::run() return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,foo); } _r->node = this; +#ifdef ZT_AUTO_UPDATE + if (ZT_DEFAULTS.updateLatestNfoURL.length()) + _r->updater = new SoftwareUpdater(_r); +#endif // Bind local port for core I/O if (!_r->demarc->bindLocalUdp(impl->port)) { @@ -462,6 +473,7 @@ Node::ReasonForTermination Node::run() // Core I/O loop try { + std::string shutdownIfUnreadablePath(_r->homePath + ZT_PATH_SEPARATOR_S + "shutdownIfUnreadable"); uint64_t lastNetworkAutoconfCheck = Utils::now() - 5000; // check autoconf again after 5s for startup uint64_t lastPingCheck = 0; uint64_t lastClean = Utils::now(); // don't need to do this immediately @@ -471,6 +483,13 @@ Node::ReasonForTermination Node::run() long lastDelayDelta = 0; while (impl->reasonForTermination == NODE_RUNNING) { + if (Utils::fileExists(shutdownIfUnreadablePath.c_str(),false)) { + FILE *tmpf = fopen(shutdownIfUnreadablePath.c_str(),"r"); + if (!tmpf) + return impl->terminateBecause(Node::NODE_NORMAL_TERMINATION,"shutdownIfUnreadable was not readable"); + fclose(tmpf); + } + uint64_t now = Utils::now(); bool resynchronize = false; @@ -610,15 +629,6 @@ unsigned int Node::versionMajor() throw() { return ZEROTIER_ONE_VERSION_MAJOR; } unsigned int Node::versionMinor() throw() { return ZEROTIER_ONE_VERSION_MINOR; } unsigned int Node::versionRevision() throw() { return ZEROTIER_ONE_VERSION_REVISION; } -// Scanned for by loader and/or updater to determine a binary's version -const unsigned char EMBEDDED_VERSION_STAMP[20] = { - 0x6d,0xfe,0xff,0x01,0x90,0xfa,0x89,0x57,0x88,0xa1,0xaa,0xdc,0xdd,0xde,0xb0,0x33, - ZEROTIER_ONE_VERSION_MAJOR, - ZEROTIER_ONE_VERSION_MINOR, - (unsigned char)(((unsigned int)ZEROTIER_ONE_VERSION_REVISION) & 0xff), /* little-endian */ - (unsigned char)((((unsigned int)ZEROTIER_ONE_VERSION_REVISION) >> 8) & 0xff) -}; - } // namespace ZeroTier extern "C" { diff --git a/node/Node.hpp b/node/Node.hpp index 238b5fce5..2736713fe 100644 --- a/node/Node.hpp +++ b/node/Node.hpp @@ -25,8 +25,11 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_NODE_HPP -#define _ZT_NODE_HPP +#ifndef ZT_NODE_HPP +#define ZT_NODE_HPP + +#include +#include namespace ZeroTier { @@ -70,6 +73,16 @@ public: */ unsigned long send(const char *command) throw(); + inline unsigned long send(const std::string &command) throw() { return send(command.c_str()); } + + /** + * Split a line of results by space + * + * @param line Line to split + * @return Vector of fields + */ + static std::vector splitLine(const char *line); + static inline std::vector splitLine(const std::string &line) { return splitLine(line.c_str()); } private: // LocalClient is not copyable @@ -84,9 +97,24 @@ public: */ enum ReasonForTermination { + /** + * Node is currently in run() + */ NODE_RUNNING = 0, + + /** + * Node is shutting down for normal reasons, including a signal + */ NODE_NORMAL_TERMINATION = 1, - NODE_RESTART_FOR_RECONFIGURATION = 2, + + /** + * An upgrade is available. Its path is in reasonForTermination(). + */ + NODE_RESTART_FOR_UPGRADE = 2, + + /** + * A serious unrecoverable error has occurred. + */ NODE_UNRECOVERABLE_ERROR = 3 }; @@ -140,7 +168,7 @@ public: /** * Get the ZeroTier version in major.minor.revision string format - * + * * @return Version in string form */ static const char *versionString() @@ -158,14 +186,6 @@ private: void *const _impl; // private implementation }; -/** - * An embedded version code that can be searched for in the binary - * - * This shouldn't be used by users, but is exported to make certain that - * the linker actually includes it in the image. - */ -extern const unsigned char EMBEDDED_VERSION_STAMP[20]; - } // namespace ZeroTier extern "C" { diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp index 027f65ce3..770f1f6f1 100644 --- a/node/NodeConfig.cpp +++ b/node/NodeConfig.cpp @@ -56,6 +56,7 @@ #include "Poly1305.hpp" #include "SHA512.hpp" #include "Node.hpp" +#include "SoftwareUpdater.hpp" namespace ZeroTier { @@ -184,6 +185,7 @@ std::vector NodeConfig::execute(const char *command) _P("200 help join "); _P("200 help leave "); _P("200 help terminate []"); + _P("200 help updatecheck"); } else if (cmd[0] == "info") { bool isOnline = false; uint64_t now = Utils::now(); @@ -200,7 +202,7 @@ std::vector NodeConfig::execute(const char *command) _r->topology->eachPeer(_DumpPeerStatistics(r)); } else if (cmd[0] == "listnetworks") { Mutex::Lock _l(_networks_m); - _P("200 listnetworks "); + _P("200 listnetworks "); for(std::map< uint64_t,SharedPtr >::const_iterator nw(_networks.begin());nw!=_networks.end();++nw) { std::string tmp; std::set ips(nw->second->tap().ips()); @@ -211,9 +213,17 @@ std::vector NodeConfig::execute(const char *command) } SharedPtr nconf(nw->second->config2()); - _P("200 listnetworks %.16llx %s %s %s %s", + + long long age = (nconf) ? ((long long)Utils::now() - (long long)nconf->timestamp()) : (long long)0; + if (age < 0) + age = 0; + age /= 1000; + + _P("200 listnetworks %.16llx %s %s %lld %s %s %s", (unsigned long long)nw->first, + ((nconf) ? nconf->name().c_str() : "?"), Network::statusString(nw->second->status()), + age, ((nconf) ? (nconf->isOpen() ? "public" : "private") : "?"), nw->second->tap().deviceName().c_str(), ((tmp.length() > 0) ? tmp.c_str() : "-")); @@ -260,6 +270,13 @@ std::vector NodeConfig::execute(const char *command) if (cmd.size() > 1) _r->node->terminate(Node::NODE_NORMAL_TERMINATION,cmd[1].c_str()); else _r->node->terminate(Node::NODE_NORMAL_TERMINATION,(const char *)0); + } else if (cmd[0] == "updatecheck") { + if (_r->updater) { + _P("200 checking for software updates now at: %s",ZT_DEFAULTS.updateLatestNfoURL.c_str()); + _r->updater->checkNow(); + } else { + _P("500 software updates are not enabled"); + } } else { _P("404 %s No such command. Use 'help' for help.",cmd[0].c_str()); } diff --git a/node/NodeConfig.hpp b/node/NodeConfig.hpp index 0e7e4c989..2612cf6aa 100644 --- a/node/NodeConfig.hpp +++ b/node/NodeConfig.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_NODECONFIG_HPP -#define _ZT_NODECONFIG_HPP +#ifndef ZT_NODECONFIG_HPP +#define ZT_NODECONFIG_HPP #include diff --git a/node/NonCopyable.hpp b/node/NonCopyable.hpp index 26536a36d..e39deba87 100644 --- a/node/NonCopyable.hpp +++ b/node/NonCopyable.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _NONCOPYABLE_HPP__ -#define _NONCOPYABLE_HPP__ +#ifndef ZT_NONCOPYABLE_HPP__ +#define ZT_NONCOPYABLE_HPP__ namespace ZeroTier { diff --git a/node/Packet.hpp b/node/Packet.hpp index 56920f6f4..6f3f9117a 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_N_PACKET_HPP -#define _ZT_N_PACKET_HPP +#ifndef ZT_N_PACKET_HPP +#define ZT_N_PACKET_HPP #include #include @@ -615,52 +615,7 @@ public: * It does not generate an OK or ERROR message, and is treated only as * a hint to refresh now. */ - VERB_NETWORK_CONFIG_REFRESH = 12, - - /* Request information about a shared file: - * <[1] flags, currently unused and must be 0> - * <[2] 16-bit length of filename> - * <[...] name of file being requested> - * - * OK response payload (indicates that we have and will share): - * <[1] flags, currently unused and must be 0> - * <[2] 16-bit length of filename> - * <[...] name of file being requested> - * <[64] full length SHA-512 hash of file contents> - * <[4] 32-bit length of file in bytes> - * <[5] Signing ZeroTier One identity address> - * <[2] 16-bit length of signature of SHA-512 hash> - * <[...] signature of SHA-512 hash> - * - * ERROR response payload: - * <[2] 16-bit length of filename> - * <[...] name of file being requested> - * - * Support is optional. Nodes should return UNSUPPORTED_OPERATION if - * not supported or enabled. - */ - VERB_FILE_INFO_REQUEST = 13, - - /* Request a piece of a shared file - * <[16] first 16 bytes of SHA-512 of file being requested> - * <[4] 32-bit index of desired chunk> - * <[2] 16-bit length of desired chunk> - * - * OK response payload: - * <[16] first 16 bytes of SHA-512 of file being requested> - * <[4] 32-bit index of desired chunk> - * <[2] 16-bit length of desired chunk> - * <[...] the chunk> - * - * ERROR response payload: - * <[16] first 16 bytes of SHA-512 of file being requested> - * <[4] 32-bit index of desired chunk> - * <[2] 16-bit length of desired chunk> - * - * Support is optional. Nodes should return UNSUPPORTED_OPERATION if - * not supported or enabled. - */ - VERB_FILE_BLOCK_REQUEST = 14 + VERB_NETWORK_CONFIG_REFRESH = 12 }; /** diff --git a/node/PacketDecoder.hpp b/node/PacketDecoder.hpp index cb3522ff2..72b052900 100644 --- a/node/PacketDecoder.hpp +++ b/node/PacketDecoder.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_PACKETDECODER_HPP -#define _ZT_PACKETDECODER_HPP +#ifndef ZT_PACKETDECODER_HPP +#define ZT_PACKETDECODER_HPP #include diff --git a/node/Peer.hpp b/node/Peer.hpp index 0a8a7b572..de5df08f4 100644 --- a/node/Peer.hpp +++ b/node/Peer.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_PEER_HPP -#define _ZT_PEER_HPP +#ifndef ZT_PEER_HPP +#define ZT_PEER_HPP #include diff --git a/node/Poly1305.hpp b/node/Poly1305.hpp index 94e6078d2..8baa448f8 100644 --- a/node/Poly1305.hpp +++ b/node/Poly1305.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_POLY1305_HPP -#define _ZT_POLY1305_HPP +#ifndef ZT_POLY1305_HPP +#define ZT_POLY1305_HPP namespace ZeroTier { diff --git a/node/RuntimeEnvironment.hpp b/node/RuntimeEnvironment.hpp index 3d73ca567..05e106769 100644 --- a/node/RuntimeEnvironment.hpp +++ b/node/RuntimeEnvironment.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_RUNTIMEENVIRONMENT_HPP -#define _ZT_RUNTIMEENVIRONMENT_HPP +#ifndef ZT_RUNTIMEENVIRONMENT_HPP +#define ZT_RUNTIMEENVIRONMENT_HPP #include @@ -46,6 +46,7 @@ class CMWC4096; class Service; class Node; class Multicaster; +class SoftwareUpdater; /** * Holds global state for an instance of ZeroTier::Node @@ -71,26 +72,36 @@ public: demarc((Demarc *)0), topology((Topology *)0), sysEnv((SysEnv *)0), - nc((NodeConfig *)0) + nc((NodeConfig *)0), + updater((SoftwareUpdater *)0) #ifndef __WINDOWS__ ,netconfService((Service *)0) #endif { } + // Full path to home folder std::string homePath; - // signal() to prematurely interrupt main loop wait + // Main loop waits on this condition when it delays between runs, so + // signaling this will prematurely wake it. Condition mainLoopWaitCondition; + // This node's identity Identity identity; + // Indicates that we are shutting down -- this is hacky, want to factor out volatile bool shutdownInProgress; - // Order matters a bit here. These are constructed in this order - // and then deleted in the opposite order on Node exit. + /* + * Order matters a bit here. These are constructed in this order + * and then deleted in the opposite order on Node exit. The order ensures + * that things that are needed are there before they're needed. + * + * These are constant and never null after startup unless indicated. + */ - Logger *log; // may be null + Logger *log; // null if logging is disabled CMWC4096 *prng; Multicaster *mc; Switch *sw; @@ -99,8 +110,9 @@ public: SysEnv *sysEnv; NodeConfig *nc; Node *node; + SoftwareUpdater *updater; // null if software updates are not enabled #ifndef __WINDOWS__ - Service *netconfService; // may be null + Service *netconfService; // null if no netconf service running #endif }; diff --git a/node/SHA512.hpp b/node/SHA512.hpp index 565eb097d..721933cb3 100644 --- a/node/SHA512.hpp +++ b/node/SHA512.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_SHA512_HPP -#define _ZT_SHA512_HPP +#ifndef ZT_SHA512_HPP +#define ZT_SHA512_HPP #define ZT_SHA512_DIGEST_LEN 64 diff --git a/node/Salsa20.hpp b/node/Salsa20.hpp index 9f34ba786..e09e2aaa7 100644 --- a/node/Salsa20.hpp +++ b/node/Salsa20.hpp @@ -4,8 +4,8 @@ * This therefore is public domain. */ -#ifndef _ZT_SALSA20_HPP -#define _ZT_SALSA20_HPP +#ifndef ZT_SALSA20_HPP +#define ZT_SALSA20_HPP #include diff --git a/node/Service.hpp b/node/Service.hpp index d8467cd14..22e53d62d 100644 --- a/node/Service.hpp +++ b/node/Service.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_SERVICE_HPP -#define _ZT_SERVICE_HPP +#ifndef ZT_SERVICE_HPP +#define ZT_SERVICE_HPP #include #include diff --git a/node/SharedPtr.hpp b/node/SharedPtr.hpp index 834d0a2ea..f7604c06b 100644 --- a/node/SharedPtr.hpp +++ b/node/SharedPtr.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_SHAREDPTR_HPP -#define _ZT_SHAREDPTR_HPP +#ifndef ZT_SHAREDPTR_HPP +#define ZT_SHAREDPTR_HPP #include "Mutex.hpp" #include "AtomicCounter.hpp" diff --git a/node/SoftwareUpdater.cpp b/node/SoftwareUpdater.cpp new file mode 100644 index 000000000..c515d5db9 --- /dev/null +++ b/node/SoftwareUpdater.cpp @@ -0,0 +1,189 @@ +/* + * 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 . + * + * -- + * + * 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 +#include +#include + +#include "../version.h" + +#include "SoftwareUpdater.hpp" +#include "Dictionary.hpp" +#include "C25519.hpp" +#include "Identity.hpp" +#include "Logger.hpp" +#include "RuntimeEnvironment.hpp" +#include "Thread.hpp" +#include "Node.hpp" + +#ifdef __UNIX_LIKE__ +#include +#include +#include +#include +#endif + +namespace ZeroTier { + +SoftwareUpdater::SoftwareUpdater(const RuntimeEnvironment *renv) : + _r(renv), + _myVersion(packVersion(ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION)), + _lastUpdateAttempt(0), + _status(UPDATE_STATUS_IDLE), + _die(false), + _lock() +{ +} + +SoftwareUpdater::~SoftwareUpdater() +{ + _die = true; + for(;;) { + _lock.lock(); + bool ip = (_status != UPDATE_STATUS_IDLE); + _lock.unlock(); + if (ip) + Thread::sleep(500); + else break; + } +} + +void SoftwareUpdater::_cbHandleGetLatestVersionInfo(void *arg,int code,const std::string &url,bool onDisk,const std::string &body) +{ + SoftwareUpdater *upd = (SoftwareUpdater *)arg; + const RuntimeEnvironment *_r = (const RuntimeEnvironment *)upd->_r; + Mutex::Lock _l(upd->_lock); + + if ((upd->_die)||(upd->_status != UPDATE_STATUS_GETTING_NFO)) { + upd->_status = UPDATE_STATUS_IDLE; + return; + } + + if (code != 200) { + LOG("unable to check for software updates, response code %d (%s)",code,body.c_str()); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + + try { + Dictionary nfo(body); + const unsigned int vMajor = Utils::strToUInt(nfo.get("vMajor").c_str()); + const unsigned int vMinor = Utils::strToUInt(nfo.get("vMinor").c_str()); + const unsigned int vRevision = Utils::strToUInt(nfo.get("vRevision").c_str()); + const Address signedBy(nfo.get("signedBy")); + const std::string signature(Utils::unhex(nfo.get("ed25519"))); + const std::string &url = nfo.get("url"); + + if (signature.length() != ZT_C25519_SIGNATURE_LEN) { + LOG("software update aborted: .nfo file invalid: bad Ed25519 signature"); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + if ((url.length() <= 7)||(url.substr(0,7) != "http://")) { + LOG("software update aborted: .nfo file invalid: update URL must begin with http://"); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + if (packVersion(vMajor,vMinor,vRevision) <= upd->_myVersion) { + LOG("software update aborted: .nfo file invalid: version on web site <= my version"); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + + if (!ZT_DEFAULTS.updateAuthorities.count(signedBy)) { + LOG("software update aborted: .nfo file specifies unknown signing authority"); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + + upd->_status = UPDATE_STATUS_GETTING_FILE; + upd->_signedBy = signedBy; + upd->_signature = signature; + + HttpClient::GET(url,HttpClient::NO_HEADERS,ZT_UPDATE_HTTP_TIMEOUT,&_cbHandleGetLatestVersionBinary,arg); + } catch ( ... ) { + LOG("software update check failed: .nfo file invalid: fields missing or invalid dictionary format"); + upd->_status = UPDATE_STATUS_IDLE; + } +} + +void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const std::string &url,bool onDisk,const std::string &body) +{ + SoftwareUpdater *upd = (SoftwareUpdater *)arg; + const RuntimeEnvironment *_r = (const RuntimeEnvironment *)upd->_r; + Mutex::Lock _l(upd->_lock); + + std::map< Address,Identity >::const_iterator updateAuthority = ZT_DEFAULTS.updateAuthorities.find(upd->_signedBy); + if (updateAuthority == ZT_DEFAULTS.updateAuthorities.end()) { // sanity check, shouldn't happen + LOG("software update aborted: .nfo file specifies unknown signing authority"); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + + // The all-important authenticity check... :) + if (!updateAuthority->second.verify(body.data(),body.length(),upd->_signature.data(),upd->_signature.length())) { + LOG("software update aborted: update fetched from '%s' failed certificate check against signer %s",url.c_str(),updateAuthority->first.toString().c_str()); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + +#ifdef __UNIX_LIKE__ + size_t lastSlash = url.rfind('/'); + if (lastSlash == std::string::npos) { // sanity check, shouldn't happen + LOG("software update aborted: invalid URL"); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + std::string updatesDir(_r->homePath + ZT_PATH_SEPARATOR_S + "updates.d"); + std::string updatePath(updatesDir + ZT_PATH_SEPARATOR_S + url.substr(lastSlash + 1)); + mkdir(updatesDir.c_str(),0755); + + int fd = ::open(updatePath.c_str(),O_WRONLY|O_CREAT|O_TRUNC,0755); + if (fd <= 0) { + LOG("software update aborted: unable to open %s for writing",updatePath.c_str()); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + if ((long)::write(fd,body.data(),body.length()) != (long)body.length()) { + LOG("software update aborted: unable to write to %s",updatePath.c_str()); + upd->_status = UPDATE_STATUS_IDLE; + return; + } + ::close(fd); + ::chmod(updatePath.c_str(),0755); + + upd->_status = UPDATE_STATUS_IDLE; + + _r->node->terminate(Node::NODE_RESTART_FOR_UPGRADE,updatePath.c_str()); +#endif + +#ifdef __WINDOWS__ + todo; +#endif +} + +} // namespace ZeroTier diff --git a/node/SoftwareUpdater.hpp b/node/SoftwareUpdater.hpp new file mode 100644 index 000000000..5e47bbead --- /dev/null +++ b/node/SoftwareUpdater.hpp @@ -0,0 +1,124 @@ +/* + * 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 . + * + * -- + * + * 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_SOFTWAREUPDATER_HPP +#define ZT_SOFTWAREUPDATER_HPP + +#include + +#include "Constants.hpp" +#include "Mutex.hpp" +#include "Utils.hpp" +#include "HttpClient.hpp" +#include "Defaults.hpp" + +namespace ZeroTier { + +class RuntimeEnvironment; + +/** + * Software updater + */ +class SoftwareUpdater +{ +public: + SoftwareUpdater(const RuntimeEnvironment *renv); + ~SoftwareUpdater(); + + /** + * Called on each version message from a peer + * + * If a peer has a newer version, that causes an update to be started. + * + * @param vmaj Peer's major version + * @param vmin Peer's minor version + * @param rev Peer's revision + */ + inline void sawRemoteVersion(unsigned int vmaj,unsigned int vmin,unsigned int rev) + { + const uint64_t tmp = packVersion(vmaj,vmin,rev); + if (tmp > _myVersion) { + Mutex::Lock _l(_lock); + if ((_status == UPDATE_STATUS_IDLE)&&(!_die)&&(ZT_DEFAULTS.updateLatestNfoURL.length())) { + const uint64_t now = Utils::now(); + if ((now - _lastUpdateAttempt) >= ZT_UPDATE_MIN_INTERVAL) { + _lastUpdateAttempt = now; + _status = UPDATE_STATUS_GETTING_NFO; + HttpClient::GET(ZT_DEFAULTS.updateLatestNfoURL,HttpClient::NO_HEADERS,ZT_UPDATE_HTTP_TIMEOUT,&_cbHandleGetLatestVersionInfo,this); + } + } + } + } + + /** + * Check for updates now regardless of last check time or version + */ + inline void checkNow() + { + Mutex::Lock _l(_lock); + if (_status == UPDATE_STATUS_IDLE) { + _lastUpdateAttempt = Utils::now(); + _status = UPDATE_STATUS_GETTING_NFO; + HttpClient::GET(ZT_DEFAULTS.updateLatestNfoURL,HttpClient::NO_HEADERS,ZT_UPDATE_HTTP_TIMEOUT,&_cbHandleGetLatestVersionInfo,this); + } + } + + /** + * Pack three-component version into a 64-bit integer + * + * @param vmaj Major version (0..65535) + * @param vmin Minor version (0..65535) + * @param rev Revision (0..65535) + * @return Version packed into an easily comparable 64-bit integer + */ + static inline uint64_t packVersion(unsigned int vmaj,unsigned int vmin,unsigned int rev) + throw() + { + return ( ((uint64_t)(vmaj & 0xffff) << 32) | ((uint64_t)(vmin & 0xffff) << 16) | (uint64_t)(rev & 0xffff) ); + } + +private: + static void _cbHandleGetLatestVersionInfo(void *arg,int code,const std::string &url,bool onDisk,const std::string &body); + static void _cbHandleGetLatestVersionBinary(void *arg,int code,const std::string &url,bool onDisk,const std::string &body); + + const RuntimeEnvironment *_r; + const uint64_t _myVersion; + volatile uint64_t _lastUpdateAttempt; + volatile enum { + UPDATE_STATUS_IDLE, + UPDATE_STATUS_GETTING_NFO, + UPDATE_STATUS_GETTING_FILE + } _status; + volatile bool _die; + Address _signedBy; + std::string _signature; + Mutex _lock; +}; + +} // namespace ZeroTier + +#endif diff --git a/node/Switch.hpp b/node/Switch.hpp index 68e3c6c40..6b3b8e6e9 100644 --- a/node/Switch.hpp +++ b/node/Switch.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_N_SWITCH_HPP -#define _ZT_N_SWITCH_HPP +#ifndef ZT_N_SWITCH_HPP +#define ZT_N_SWITCH_HPP #include #include diff --git a/node/SysEnv.hpp b/node/SysEnv.hpp index 21c25713e..4f4a4f168 100644 --- a/node/SysEnv.hpp +++ b/node/SysEnv.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_SYSENV_HPP -#define _ZT_SYSENV_HPP +#ifndef ZT_SYSENV_HPP +#define ZT_SYSENV_HPP #include diff --git a/node/Thread.hpp b/node/Thread.hpp index d295fea38..8adf79d34 100644 --- a/node/Thread.hpp +++ b/node/Thread.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_THREAD_HPP -#define _ZT_THREAD_HPP +#ifndef ZT_THREAD_HPP +#define ZT_THREAD_HPP #include diff --git a/node/Topology.hpp b/node/Topology.hpp index 09dec86e0..312377bc3 100644 --- a/node/Topology.hpp +++ b/node/Topology.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_TOPOLOGY_HPP -#define _ZT_TOPOLOGY_HPP +#ifndef ZT_TOPOLOGY_HPP +#define ZT_TOPOLOGY_HPP #include #include diff --git a/node/UdpSocket.hpp b/node/UdpSocket.hpp index d8467f641..cbd9de868 100644 --- a/node/UdpSocket.hpp +++ b/node/UdpSocket.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_UDPSOCKET_HPP -#define _ZT_UDPSOCKET_HPP +#ifndef ZT_UDPSOCKET_HPP +#define ZT_UDPSOCKET_HPP #include diff --git a/node/Utils.cpp b/node/Utils.cpp index c565d8c47..c0886859d 100644 --- a/node/Utils.cpp +++ b/node/Utils.cpp @@ -50,9 +50,6 @@ namespace ZeroTier { const char Utils::HEXCHARS[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' }; -static const char *DAY_NAMES[7] = { "Sun","Mon","Tue","Wed","Thu","Fri","Sat" }; -static const char *MONTH_NAMES[12] = { "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" }; - std::map Utils::listDirectory(const char *path) { std::map r; @@ -62,7 +59,8 @@ std::map Utils::listDirectory(const char *path) WIN32_FIND_DATAA ffd; if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(),&ffd)) != INVALID_HANDLE_VALUE) { do { - r[std::string(ffd.cFileName)] = ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0); + if ((strcmp(ffd.cFileName,"."))&&(strcmp(ffd.cFileName,".."))) + r[std::string(ffd.cFileName)] = ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0); } while (FindNextFileA(hFind,&ffd)); FindClose(hFind); } @@ -153,7 +151,6 @@ unsigned int Utils::unhex(const char *hex,void *buf,unsigned int len) } unsigned int Utils::unhex(const char *hex,unsigned int hexlen,void *buf,unsigned int len) - throw() { int n = 1; unsigned char c,b = 0; @@ -193,7 +190,7 @@ void Utils::getSecureRandom(void *buf,unsigned int bytes) Mutex::Lock _l(randomLock); - // A Salsa20 instance is used to mangle whatever our base + // A Salsa20/8 instance is used to further mangle whatever our base // random source happens to be. if (!randInitialized) { randInitialized = true; @@ -210,7 +207,7 @@ void Utils::getSecureRandom(void *buf,unsigned int bytes) { int fd = ::open("/dev/urandom",O_RDONLY); if (fd < 0) { - fprintf(stderr,"FATAL ERROR: unable to open /dev/urandom: %s"ZT_EOL_S,strerror(errno)); + fprintf(stderr,"FATAL ERROR: unable to open /dev/urandom"ZT_EOL_S); exit(-1); } if ((int)::read(fd,randbuf,sizeof(randbuf)) != (int)sizeof(randbuf)) { @@ -222,17 +219,20 @@ void Utils::getSecureRandom(void *buf,unsigned int bytes) #else #ifdef __WINDOWS__ { - char ktmp[32]; - char ivtmp[8]; - for(int i=0;i<32;++i) ktmp[i] = (char)rand(); - for(int i=0;i<8;++i) ivtmp[i] = (char)rand(); - double now = Utils::nowf(); - memcpy(ktmp,&now,sizeof(now)); - DWORD tmp = GetCurrentProcessId(); - memcpy(ktmp + sizeof(now),&tmp,sizeof(tmp)); - tmp = GetTickCount(); - memcpy(ktmp + sizeof(now) + sizeof(DWORD),&tmp,sizeof(tmp)); - Salsa20 s20tmp(ktmp,256,ivtmp,8); + struct { + double nowf; + DWORD processId; + DWORD tickCount; + uint64_t nowi; + char padding[32]; + } keyMaterial; + keyMaterial.nowf = Utils::nowf(); + keyMaterial.processId = GetCurrentProcessId(); + keyMaterial.tickCount = GetTickCount(); + keyMaterial.nowi = Utils::now(); + for(int i=0;itm_year; ++i) - res += is_leap(i) ? 366 : 365; - - for (i = 0; i < tm->tm_mon; ++i) - res += ndays[is_leap(tm->tm_year)][i]; - res += tm->tm_mday - 1; - res *= 24; - res += tm->tm_hour; - res *= 60; - res += tm->tm_min; - res *= 60; - res += tm->tm_sec; - return res; -} -#endif - -uint64_t Utils::fromRfc1123(const char *tstr) +int64_t Utils::getFileSize(const char *path) { - struct tm t; - char wdays[128],mons[128]; - - int l = (int)strlen(tstr); - if ((l < 29)||(l > 64)) - return 0; - int assigned = sscanf(tstr,"%3s, %02d %3s %4d %02d:%02d:%02d GMT",wdays,&t.tm_mday,mons,&t.tm_year,&t.tm_hour,&t.tm_min,&t.tm_sec); - if (assigned != 7) - return 0; - - wdays[3] = '\0'; - for(t.tm_wday=0;t.tm_wday<7;++t.tm_wday) { -#ifdef __WINDOWS__ - if (!_stricmp(DAY_NAMES[t.tm_wday],wdays)) - break; -#else - if (!strcasecmp(DAY_NAMES[t.tm_wday],wdays)) - break; -#endif - } - if (t.tm_wday == 7) - return 0; - mons[3] = '\0'; - for(t.tm_mon=0;t.tm_mon<12;++t.tm_mon) { -#ifdef __WINDOWS__ - if (!_stricmp(MONTH_NAMES[t.tm_mday],mons)) - break; -#else - if (!strcasecmp(MONTH_NAMES[t.tm_mday],mons)) - break; -#endif - } - if (t.tm_mon == 12) - return 0; - - t.tm_wday = 0; // ignored by timegm - t.tm_yday = 0; // ignored by timegm - t.tm_isdst = 0; // ignored by timegm - - time_t utc = timegm(&t); - - return ((utc > 0) ? (1000ULL * (uint64_t)utc) : 0ULL); + struct stat s; + if (stat(path,&s)) + return -1; + if (S_ISREG(s.st_mode)) + return s.st_size; + return -1; } bool Utils::readFile(const char *path,std::string &buf) diff --git a/node/Utils.hpp b/node/Utils.hpp index 6a56ba9db..5be60e157 100644 --- a/node/Utils.hpp +++ b/node/Utils.hpp @@ -25,8 +25,8 @@ * LLC. Start here: http://www.zerotier.com/ */ -#ifndef _ZT_UTILS_HPP -#define _ZT_UTILS_HPP +#ifndef ZT_UTILS_HPP +#define ZT_UTILS_HPP #include #include @@ -41,9 +41,6 @@ #include "Constants.hpp" -#include "../ext/lz4/lz4.h" -#include "../ext/lz4/lz4hc.h" - #ifdef __WINDOWS__ #include #include @@ -53,11 +50,6 @@ #include #endif -/** - * Maximum compression/decompression block size (do not change) - */ -#define ZT_COMPRESSION_BLOCK_SIZE 16777216 - namespace ZeroTier { /** @@ -108,23 +100,24 @@ public: return (unlink(path) == 0); #endif } - static inline bool rm(const std::string &path) - throw() - { - return rm(path.c_str()); - } + static inline bool rm(const std::string &path) throw() { return rm(path.c_str()); } /** * List a directory's contents + * + * Keys in returned map are filenames only and don't include the leading + * path. Pseudo-paths like . and .. are not returned. Values are true if + * the item is a directory, false if it's a file. More detailed attributes + * aren't supported since the code that uses this doesn't need them. * * @param path Path to list - * @param files Set to fill with files - * @param directories Set to fill with directories * @return Map of entries and whether or not they are also directories (empty on failure) */ static std::map listDirectory(const char *path); /** + * Convert binary data to hexadecimal + * * @param data Data to convert to hex * @param len Length of data * @return Hexadecimal string @@ -133,6 +126,11 @@ public: static inline std::string hex(const std::string &data) { return hex(data.data(),(unsigned int)data.length()); } /** + * Convert hexadecimal to binary data + * + * This ignores all non-hex characters, just stepping over them and + * continuing. Upper and lower case are supported for letters a-f. + * * @param hex Hexadecimal ASCII code (non-hex chars are ignored) * @return Binary data */ @@ -140,6 +138,11 @@ public: static inline std::string unhex(const std::string &hex) { return unhex(hex.c_str()); } /** + * Convert hexadecimal to binary data + * + * This ignores all non-hex characters, just stepping over them and + * continuing. Upper and lower case are supported for letters a-f. + * * @param hex Hexadecimal ASCII * @param buf Buffer to fill * @param len Length of buffer @@ -149,16 +152,25 @@ public: static inline unsigned int unhex(const std::string &hex,void *buf,unsigned int len) { return unhex(hex.c_str(),buf,len); } /** + * Convert hexadecimal to binary data + * + * This ignores all non-hex characters, just stepping over them and + * continuing. Upper and lower case are supported for letters a-f. + * * @param hex Hexadecimal ASCII * @param hexlen Length of hex ASCII * @param buf Buffer to fill * @param len Length of buffer * @return Number of bytes actually written to buffer */ - static unsigned int unhex(const char *hex,unsigned int hexlen,void *buf,unsigned int len) - throw(); + static unsigned int unhex(const char *hex,unsigned int hexlen,void *buf,unsigned int len); /** + * Generate secure random bytes + * + * This will try to use whatever OS sources of entropy are available. It's + * guarded by an internal mutex so it's thread-safe. + * * @param buf Buffer to fill * @param bytes Number of random bytes to generate */ @@ -188,193 +200,16 @@ public: /** * @param path Path to check + * @param followLinks Follow links (on platforms with that concept) * @return True if file or directory exists at path location */ - static inline bool fileExists(const char *path) - { - return (getLastModified(path) != 0); - } + static bool fileExists(const char *path,bool followLinks = true); /** - * @param t64 Time in ms since epoch - * @return RFC1123 date string + * @param path Path to file + * @return File size or -1 if nonexistent or other failure */ - static std::string toRfc1123(uint64_t t64); - - /** - * @param tstr Time in RFC1123 string format - * @return Time in ms since epoch - */ - static uint64_t fromRfc1123(const char *tstr); - static inline uint64_t fromRfc1123(const std::string &tstr) { return fromRfc1123(tstr.c_str()); } - - /** - * String append output function object for use with compress/decompress - */ - class StringAppendOutput - { - public: - StringAppendOutput(std::string &s) : _s(s) {} - inline void operator()(const void *data,unsigned int len) { _s.append((const char *)data,len); } - private: - std::string &_s; - }; - - /** - * STDIO FILE append output function object for compress/decompress - * - * Throws std::runtime_error on write error. - */ - class FILEAppendOutput - { - public: - FILEAppendOutput(FILE *f) : _f(f) {} - inline void operator()(const void *data,unsigned int len) - throw(std::runtime_error) - { - if ((int)fwrite(data,1,len,_f) != (int)len) - throw std::runtime_error("write failed"); - } - private: - FILE *_f; - }; - - /** - * Compress data - * - * O must be a function or function object that takes the following - * arguments: (const void *data,unsigned int len) - * - * @param in Input iterator that reads bytes (char, uint8_t, etc.) - * @param out Output iterator that writes bytes - */ - template - static inline void compress(I begin,I end,O out) - { - unsigned int bufLen = LZ4_compressBound(ZT_COMPRESSION_BLOCK_SIZE); - char *buf = new char[bufLen * 2]; - char *buf2 = buf + bufLen; - - try { - I inp(begin); - for(;;) { - unsigned int readLen = 0; - while ((readLen < ZT_COMPRESSION_BLOCK_SIZE)&&(inp != end)) { - buf[readLen++] = (char)*inp; - ++inp; - } - if (!readLen) - break; - - uint32_t l = hton((uint32_t)readLen); - out((const void *)&l,4); // original size - - if (readLen < 32) { // don't bother compressing itty bitty blocks - l = 0; // stored - out((const void *)&l,4); - out((const void *)buf,readLen); - continue; - } - - int lz4CompressedLen = LZ4_compressHC(buf,buf2,(int)readLen); - if ((lz4CompressedLen <= 0)||(lz4CompressedLen >= (int)readLen)) { - l = 0; // stored - out((const void *)&l,4); - out((const void *)buf,readLen); - continue; - } - - l = hton((uint32_t)lz4CompressedLen); // lz4 only - out((const void *)&l,4); - out((const void *)buf2,(unsigned int)lz4CompressedLen); - } - - delete [] buf; - } catch ( ... ) { - delete [] buf; - throw; - } - } - - /** - * Decompress data - * - * O must be a function or function object that takes the following - * arguments: (const void *data,unsigned int len) - * - * @param in Input iterator that reads bytes (char, uint8_t, etc.) - * @param out Output iterator that writes bytes - * @return False on decompression error - */ - template - static inline bool decompress(I begin,I end,O out) - { - volatile char i32c[4]; - void *const i32cp = (void *)i32c; - unsigned int bufLen = LZ4_compressBound(ZT_COMPRESSION_BLOCK_SIZE); - char *buf = new char[bufLen * 2]; - char *buf2 = buf + bufLen; - - try { - I inp(begin); - while (inp != end) { - i32c[0] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - i32c[1] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - i32c[2] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - i32c[3] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - unsigned int originalSize = ntoh(*((const uint32_t *)i32cp)); - i32c[0] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - i32c[1] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - i32c[2] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - i32c[3] = (char)*inp; if (++inp == end) { delete [] buf; return false; } - uint32_t _compressedSize = ntoh(*((const uint32_t *)i32cp)); - unsigned int compressedSize = _compressedSize & 0x7fffffff; - - if (compressedSize) { - if (compressedSize > bufLen) { - delete [] buf; - return false; - } - unsigned int readLen = 0; - while ((readLen < compressedSize)&&(inp != end)) { - buf[readLen++] = (char)*inp; - ++inp; - } - if (readLen != compressedSize) { - delete [] buf; - return false; - } - - if (LZ4_uncompress_unknownOutputSize(buf,buf2,compressedSize,bufLen) != (int)originalSize) { - delete [] buf; - return false; - } else out((const void *)buf2,(unsigned int)originalSize); - } else { // stored - if (originalSize > bufLen) { - delete [] buf; - return false; - } - unsigned int readLen = 0; - while ((readLen < originalSize)&&(inp != end)) { - buf[readLen++] = (char)*inp; - ++inp; - } - if (readLen != originalSize) { - delete [] buf; - return false; - } - - out((const void *)buf,(unsigned int)originalSize); - } - } - - delete [] buf; - return true; - } catch ( ... ) { - delete [] buf; - throw; - } - } + static int64_t getFileSize(const char *path); /** * @return Current time in milliseconds since epoch @@ -678,6 +513,7 @@ public: return ((*aptr & mask) == (*aptr & mask)); } + // Byte swappers for big/little endian conversion static inline uint8_t hton(uint8_t n) throw() { return n; } static inline int8_t hton(int8_t n) throw() { return n; } static inline uint16_t hton(uint16_t n) throw() { return htons(n); } diff --git a/objects.mk b/objects.mk index 547033f93..317e9e842 100644 --- a/objects.mk +++ b/objects.mk @@ -6,6 +6,7 @@ OBJS=\ node/Defaults.o \ node/Demarc.o \ node/EthernetTap.o \ + node/HttpClient.o \ node/Identity.o \ node/InetAddress.o \ node/Logger.o \ @@ -20,6 +21,7 @@ OBJS=\ node/Poly1305.o \ node/Salsa20.o \ node/Service.o \ + node/SoftwareUpdater.o \ node/SHA512.o \ node/Switch.o \ node/SysEnv.o \ diff --git a/selftest.cpp b/selftest.cpp index ba362bd3c..66e1b75ed 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -52,6 +52,7 @@ #include "node/C25519.hpp" #include "node/Poly1305.hpp" #include "node/CertificateOfMembership.hpp" +#include "node/HttpClient.hpp" #ifdef __WINDOWS__ #include @@ -63,6 +64,60 @@ using namespace ZeroTier; static unsigned char fuzzbuf[1048576]; +static Condition webDoneCondition; +static std::string webSha512ShouldBe; +static void testHttpHandler(void *arg,int code,const std::string &url,bool onDisk,const std::string &body) +{ + unsigned char sha[64]; + if (code == 200) { + SHA512::hash(sha,body.data(),body.length()); + if (webSha512ShouldBe == Utils::hex(sha,64)) + std::cout << "got " << body.length() << " bytes, response code " << code << ", SHA-512 OK" << std::endl; + else std::cout << "got " << body.length() << " bytes, response code " << code << ", SHA-512 FAILED!" << std::endl; + } else std::cout << "ERROR " << code << ": " << body << std::endl; + webDoneCondition.signal(); +} + +static int testHttp() +{ + webSha512ShouldBe = "221b348c8278ad2063c158fb15927c35dc6bb42880daf130d0574025f88ec350811c34fae38a014b576d3ef5c98af32bb540e68204810db87a51fa9b239ea567"; + std::cout << "[http] fetching http://download.zerotier.com/dev/1k ... "; std::cout.flush(); + HttpClient::GET("http://download.zerotier.com/dev/1k",HttpClient::NO_HEADERS,30,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + webSha512ShouldBe = "342e1a058332aad2d7a5412c1d9cd4ad02b4038178ca0c3ed9d34e3cf0905c118b684e5d2a935a158195d453d7d69e9c6e201e252620fb53f29611794a5d4b0c"; + std::cout << "[http] fetching http://download.zerotier.com/dev/2k ... "; std::cout.flush(); + HttpClient::GET("http://download.zerotier.com/dev/2k",HttpClient::NO_HEADERS,30,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + webSha512ShouldBe = "439562e1471dd6bdb558cb680f38dd7742e521497e280cb1456a31f74b9216b7d98145b3896c2f68008e6ac0c1662a4cb70562caeac294c5d01f378b22a21292"; + std::cout << "[http] fetching http://download.zerotier.com/dev/4k ... "; std::cout.flush(); + HttpClient::GET("http://download.zerotier.com/dev/4k",HttpClient::NO_HEADERS,30,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + webSha512ShouldBe = "fbd3901a9956158b9d290efa1af4fff459d8c03187c98b0e630d10a19fab61940e668652257763973f6cde34f2aa81574f9a50b1979b675b45ddd18d69a4ceb8"; + std::cout << "[http] fetching http://download.zerotier.com/dev/8k ... "; std::cout.flush(); + HttpClient::GET("http://download.zerotier.com/dev/8k",HttpClient::NO_HEADERS,30,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + webSha512ShouldBe = "098ae593f8c3a962f385f9f008ec2116ad22eea8bc569fc88a06a0193480fdfb27470345c427116d19179fb2a74df21d95fe5f1df575a9f2d10d99595708b765"; + std::cout << "[http] fetching http://download.zerotier.com/dev/4m ... "; std::cout.flush(); + HttpClient::GET("http://download.zerotier.com/dev/4m",HttpClient::NO_HEADERS,30,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + webSha512ShouldBe = ""; + std::cout << "[http] fetching http://download.zerotier.com/dev/NOEXIST ... "; std::cout.flush(); + HttpClient::GET("http://download.zerotier.com/dev/NOEXIST",HttpClient::NO_HEADERS,30,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + webSha512ShouldBe = ""; + std::cout << "[http] fetching http://1.1.1.1/SHOULD_TIME_OUT ... "; std::cout.flush(); + HttpClient::GET("http://1.1.1.1/SHOULD_TIME_OUT",HttpClient::NO_HEADERS,4,&testHttpHandler,(void *)0); + webDoneCondition.wait(); + + return 0; +} + static int testCrypto() { unsigned char buf1[16384]; @@ -562,6 +617,7 @@ int main(int argc,char **argv) srand((unsigned int)time(0)); + r |= testHttp(); r |= testCrypto(); r |= testPacket(); r |= testOther(); diff --git a/version.h b/version.h index 9247ba5ed..03a5cdc14 100644 --- a/version.h +++ b/version.h @@ -41,6 +41,6 @@ /** * Revision: 16-bit (0-65535) */ -#define ZEROTIER_ONE_VERSION_REVISION 2 +#define ZEROTIER_ONE_VERSION_REVISION 3 #endif diff --git a/vsprojects/InstallerUpdater/App.config b/vsprojects/InstallerUpdater/App.config deleted file mode 100644 index 8e1564635..000000000 --- a/vsprojects/InstallerUpdater/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/vsprojects/InstallerUpdater/InstallerUpdater.csproj b/vsprojects/InstallerUpdater/InstallerUpdater.csproj deleted file mode 100644 index 6c2631863..000000000 --- a/vsprojects/InstallerUpdater/InstallerUpdater.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - Debug - AnyCPU - {B2A5CD75-E0FF-42A3-833A-0C6B0278CFEA} - WinExe - Properties - InstallerUpdater - InstallerUpdater - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - Form - - - MainForm.cs - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - \ No newline at end of file diff --git a/vsprojects/InstallerUpdater/MainForm.Designer.cs b/vsprojects/InstallerUpdater/MainForm.Designer.cs deleted file mode 100644 index 573a083ef..000000000 --- a/vsprojects/InstallerUpdater/MainForm.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace InstallerUpdater -{ - partial class MainForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Text = "Form1"; - } - - #endregion - } -} - diff --git a/vsprojects/InstallerUpdater/MainForm.cs b/vsprojects/InstallerUpdater/MainForm.cs deleted file mode 100644 index f671dfb69..000000000 --- a/vsprojects/InstallerUpdater/MainForm.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace InstallerUpdater -{ - public partial class MainForm : Form - { - public MainForm() - { - InitializeComponent(); - } - } -} diff --git a/vsprojects/InstallerUpdater/Program.cs b/vsprojects/InstallerUpdater/Program.cs deleted file mode 100644 index d7f1996ea..000000000 --- a/vsprojects/InstallerUpdater/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace InstallerUpdater -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); - } - } -} diff --git a/vsprojects/InstallerUpdater/Properties/AssemblyInfo.cs b/vsprojects/InstallerUpdater/Properties/AssemblyInfo.cs deleted file mode 100644 index 03edc8bdd..000000000 --- a/vsprojects/InstallerUpdater/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("InstallerUpdater")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("InstallerUpdater")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8ae5142c-2de0-430e-aff7-b2487042615d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/vsprojects/InstallerUpdater/Properties/Resources.Designer.cs b/vsprojects/InstallerUpdater/Properties/Resources.Designer.cs deleted file mode 100644 index 3fb330e28..000000000 --- a/vsprojects/InstallerUpdater/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18052 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace InstallerUpdater.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("InstallerUpdater.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/vsprojects/InstallerUpdater/Properties/Resources.resx b/vsprojects/InstallerUpdater/Properties/Resources.resx deleted file mode 100644 index af7dbebba..000000000 --- a/vsprojects/InstallerUpdater/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/vsprojects/InstallerUpdater/Properties/Settings.Designer.cs b/vsprojects/InstallerUpdater/Properties/Settings.Designer.cs deleted file mode 100644 index 8713e48d3..000000000 --- a/vsprojects/InstallerUpdater/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18052 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace InstallerUpdater.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/vsprojects/InstallerUpdater/Properties/Settings.settings b/vsprojects/InstallerUpdater/Properties/Settings.settings deleted file mode 100644 index 39645652a..000000000 --- a/vsprojects/InstallerUpdater/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/vsprojects/Service/App.config b/vsprojects/Service/App.config deleted file mode 100644 index 8e1564635..000000000 --- a/vsprojects/Service/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/vsprojects/Service/Program.cs b/vsprojects/Service/Program.cs deleted file mode 100644 index 579e5bfec..000000000 --- a/vsprojects/Service/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.ServiceProcess; -using System.Text; -using System.Threading.Tasks; - -namespace Service -{ - static class Program - { - static void Main() - { - ServiceBase.Run(new ZeroTierOneService()); - } - } -} diff --git a/vsprojects/Service/Properties/AssemblyInfo.cs b/vsprojects/Service/Properties/AssemblyInfo.cs deleted file mode 100644 index 04bb7710d..000000000 --- a/vsprojects/Service/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Service")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Service")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8c5f91e6-d727-431c-b99c-8e16dc423889")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/vsprojects/Service/Service.csproj b/vsprojects/Service/Service.csproj deleted file mode 100644 index 10372114b..000000000 --- a/vsprojects/Service/Service.csproj +++ /dev/null @@ -1,108 +0,0 @@ - - - - - Debug - AnyCPU - {079E8119-388C-4676-964E-0B8C5324F770} - WinExe - Properties - Service - Service - v4.5 - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - Service.Program - - - - - - - - - - - - - - - Component - - - ZeroTierOneService.cs - - - - - - - - - - ZeroTierOneService.cs - - - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - - - \ No newline at end of file diff --git a/vsprojects/Service/ZeroTierOneService.Designer.cs b/vsprojects/Service/ZeroTierOneService.Designer.cs deleted file mode 100644 index 9b1f6ddf2..000000000 --- a/vsprojects/Service/ZeroTierOneService.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -namespace Service -{ - partial class ZeroTierOneService - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.zeroTierProcess = new System.Diagnostics.Process(); - this.checkForUpdatesTimer = new System.Windows.Forms.Timer(this.components); - // - // zeroTierProcess - // - this.zeroTierProcess.EnableRaisingEvents = true; - this.zeroTierProcess.StartInfo.CreateNoWindow = true; - this.zeroTierProcess.StartInfo.Domain = ""; - this.zeroTierProcess.StartInfo.LoadUserProfile = false; - this.zeroTierProcess.StartInfo.Password = null; - this.zeroTierProcess.StartInfo.RedirectStandardError = true; - this.zeroTierProcess.StartInfo.RedirectStandardInput = true; - this.zeroTierProcess.StartInfo.RedirectStandardOutput = true; - this.zeroTierProcess.StartInfo.StandardErrorEncoding = null; - this.zeroTierProcess.StartInfo.StandardOutputEncoding = null; - this.zeroTierProcess.StartInfo.UserName = ""; - this.zeroTierProcess.StartInfo.UseShellExecute = false; - this.zeroTierProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; - this.zeroTierProcess.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(this.zeroTierProcess_OutputDataReceived); - this.zeroTierProcess.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(this.zeroTierProcess_ErrorDataReceived); - this.zeroTierProcess.Exited += new System.EventHandler(this.zeroTierProcess_Exited); - // - // checkForUpdatesTimer - // - this.checkForUpdatesTimer.Enabled = true; - this.checkForUpdatesTimer.Interval = 3600000; - this.checkForUpdatesTimer.Tick += new System.EventHandler(this.checkForUpdatesTimer_Tick); - // - // ZeroTierOneService - // - this.ServiceName = "ZeroTier One"; - - } - - #endregion - - private System.Diagnostics.Process zeroTierProcess; - private System.Windows.Forms.Timer checkForUpdatesTimer; - } -} diff --git a/vsprojects/Service/ZeroTierOneService.cs b/vsprojects/Service/ZeroTierOneService.cs deleted file mode 100644 index f654f1086..000000000 --- a/vsprojects/Service/ZeroTierOneService.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Diagnostics; -using System.Linq; -using System.ServiceProcess; -using System.Text; -using System.Threading.Tasks; - -namespace Service -{ - public partial class ZeroTierOneService : ServiceBase - { - public ZeroTierOneService() - { - InitializeComponent(); - } - - protected override void OnStart(string[] args) - { - } - - protected override void OnStop() - { - } - - private void zeroTierProcess_Exited(object sender, EventArgs e) - { - } - - private void zeroTierProcess_ErrorDataReceived(object sender, DataReceivedEventArgs e) - { - } - - private void zeroTierProcess_OutputDataReceived(object sender, DataReceivedEventArgs e) - { - } - - private void checkForUpdatesTimer_Tick(object sender, EventArgs e) - { - } - } -} diff --git a/vsprojects/Service/ZeroTierOneService.resx b/vsprojects/Service/ZeroTierOneService.resx deleted file mode 100644 index 73b94cb82..000000000 --- a/vsprojects/Service/ZeroTierOneService.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 146, 17 - - - False - - \ No newline at end of file diff --git a/vsprojects/SelfTest/SelfTest.vcxproj b/windows/SelfTest/SelfTest.vcxproj similarity index 100% rename from vsprojects/SelfTest/SelfTest.vcxproj rename to windows/SelfTest/SelfTest.vcxproj diff --git a/vsprojects/SelfTest/SelfTest.vcxproj.filters b/windows/SelfTest/SelfTest.vcxproj.filters similarity index 100% rename from vsprojects/SelfTest/SelfTest.vcxproj.filters rename to windows/SelfTest/SelfTest.vcxproj.filters diff --git a/vsprojects/SelfTest/targetver.h b/windows/SelfTest/targetver.h similarity index 100% rename from vsprojects/SelfTest/targetver.h rename to windows/SelfTest/targetver.h diff --git a/vsprojects/TapDriver Package/TapDriver Package.vcxproj b/windows/TapDriver Package/TapDriver Package.vcxproj similarity index 100% rename from vsprojects/TapDriver Package/TapDriver Package.vcxproj rename to windows/TapDriver Package/TapDriver Package.vcxproj diff --git a/vsprojects/TapDriver Package/TapDriver Package.vcxproj.filters b/windows/TapDriver Package/TapDriver Package.vcxproj.filters similarity index 100% rename from vsprojects/TapDriver Package/TapDriver Package.vcxproj.filters rename to windows/TapDriver Package/TapDriver Package.vcxproj.filters diff --git a/vsprojects/TapDriver/TapDriver.vcxproj b/windows/TapDriver/TapDriver.vcxproj similarity index 100% rename from vsprojects/TapDriver/TapDriver.vcxproj rename to windows/TapDriver/TapDriver.vcxproj diff --git a/vsprojects/TapDriver/TapDriver.vcxproj.filters b/windows/TapDriver/TapDriver.vcxproj.filters similarity index 100% rename from vsprojects/TapDriver/TapDriver.vcxproj.filters rename to windows/TapDriver/TapDriver.vcxproj.filters diff --git a/vsprojects/TapDriver/config.h b/windows/TapDriver/config.h similarity index 100% rename from vsprojects/TapDriver/config.h rename to windows/TapDriver/config.h diff --git a/vsprojects/TapDriver/constants.h b/windows/TapDriver/constants.h similarity index 100% rename from vsprojects/TapDriver/constants.h rename to windows/TapDriver/constants.h diff --git a/vsprojects/TapDriver/dhcp.c b/windows/TapDriver/dhcp.c similarity index 100% rename from vsprojects/TapDriver/dhcp.c rename to windows/TapDriver/dhcp.c diff --git a/vsprojects/TapDriver/dhcp.h b/windows/TapDriver/dhcp.h similarity index 100% rename from vsprojects/TapDriver/dhcp.h rename to windows/TapDriver/dhcp.h diff --git a/vsprojects/TapDriver/endian.h b/windows/TapDriver/endian.h similarity index 100% rename from vsprojects/TapDriver/endian.h rename to windows/TapDriver/endian.h diff --git a/vsprojects/TapDriver/error.c b/windows/TapDriver/error.c similarity index 100% rename from vsprojects/TapDriver/error.c rename to windows/TapDriver/error.c diff --git a/vsprojects/TapDriver/error.h b/windows/TapDriver/error.h similarity index 100% rename from vsprojects/TapDriver/error.h rename to windows/TapDriver/error.h diff --git a/vsprojects/TapDriver/instance.c b/windows/TapDriver/instance.c similarity index 100% rename from vsprojects/TapDriver/instance.c rename to windows/TapDriver/instance.c diff --git a/vsprojects/TapDriver/lock.h b/windows/TapDriver/lock.h similarity index 100% rename from vsprojects/TapDriver/lock.h rename to windows/TapDriver/lock.h diff --git a/vsprojects/TapDriver/macinfo.c b/windows/TapDriver/macinfo.c similarity index 100% rename from vsprojects/TapDriver/macinfo.c rename to windows/TapDriver/macinfo.c diff --git a/vsprojects/TapDriver/macinfo.h b/windows/TapDriver/macinfo.h similarity index 100% rename from vsprojects/TapDriver/macinfo.h rename to windows/TapDriver/macinfo.h diff --git a/vsprojects/TapDriver/mem.c b/windows/TapDriver/mem.c similarity index 100% rename from vsprojects/TapDriver/mem.c rename to windows/TapDriver/mem.c diff --git a/vsprojects/TapDriver/proto.h b/windows/TapDriver/proto.h similarity index 100% rename from vsprojects/TapDriver/proto.h rename to windows/TapDriver/proto.h diff --git a/vsprojects/TapDriver/prototypes.h b/windows/TapDriver/prototypes.h similarity index 100% rename from vsprojects/TapDriver/prototypes.h rename to windows/TapDriver/prototypes.h diff --git a/vsprojects/TapDriver/tap-windows.h b/windows/TapDriver/tap-windows.h similarity index 100% rename from vsprojects/TapDriver/tap-windows.h rename to windows/TapDriver/tap-windows.h diff --git a/vsprojects/TapDriver/tapdrvr.c b/windows/TapDriver/tapdrvr.c similarity index 100% rename from vsprojects/TapDriver/tapdrvr.c rename to windows/TapDriver/tapdrvr.c diff --git a/vsprojects/TapDriver/testcert.pfx b/windows/TapDriver/testcert.pfx similarity index 100% rename from vsprojects/TapDriver/testcert.pfx rename to windows/TapDriver/testcert.pfx diff --git a/vsprojects/TapDriver/types.h b/windows/TapDriver/types.h similarity index 100% rename from vsprojects/TapDriver/types.h rename to windows/TapDriver/types.h diff --git a/vsprojects/TapDriver/ztTap100.inf b/windows/TapDriver/ztTap100.inf similarity index 100% rename from vsprojects/TapDriver/ztTap100.inf rename to windows/TapDriver/ztTap100.inf diff --git a/ZeroTierOne.sln b/windows/ZeroTierOne.sln similarity index 97% rename from ZeroTierOne.sln rename to windows/ZeroTierOne.sln index 2f4c9e052..80c9c9d3b 100644 --- a/ZeroTierOne.sln +++ b/windows/ZeroTierOne.sln @@ -1,20 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "vsprojects\SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "vsprojects\TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "vsprojects\TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}" ProjectSection(ProjectDependencies) = postProject {689210B1-467C-4850-BB7D-2E10D5B4A3DA} = {689210B1-467C-4850-BB7D-2E10D5B4A3DA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "vsprojects\ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service", "vsprojects\Service\Service.csproj", "{079E8119-388C-4676-964E-0B8C5324F770}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstallerUpdater", "vsprojects\InstallerUpdater\InstallerUpdater.csproj", "{B2A5CD75-E0FF-42A3-833A-0C6B0278CFEA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj similarity index 100% rename from vsprojects/ZeroTierOne/ZeroTierOne.vcxproj rename to windows/ZeroTierOne/ZeroTierOne.vcxproj diff --git a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters similarity index 100% rename from vsprojects/ZeroTierOne/ZeroTierOne.vcxproj.filters rename to windows/ZeroTierOne/ZeroTierOne.vcxproj.filters