diff options
| -rw-r--r-- | attic/update-dummy/update-dummy.nfo | 6 | ||||
| -rw-r--r-- | attic/update-dummy/update-dummy.sh | 4 | ||||
| -rw-r--r-- | main.cpp | 2 | ||||
| -rw-r--r-- | node/Defaults.cpp | 20 |
4 files changed, 30 insertions, 2 deletions
diff --git a/attic/update-dummy/update-dummy.nfo b/attic/update-dummy/update-dummy.nfo new file mode 100644 index 00000000..2aa173e0 --- /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 00000000..cafb6f90 --- /dev/null +++ b/attic/update-dummy/update-dummy.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Dummy updater -- run with opts: $*" +exit 0 @@ -475,7 +475,7 @@ int main(int argc,char **argv) try { node = new Node(homeDir,port,controlPort); switch(node->run()) { - case Node::NODE_NODE_RESTART_FOR_UPGRADE: { + case Node::NODE_RESTART_FOR_UPGRADE: { #ifdef __UNIX_LIKE__ const char *upgPath = node->reasonForTermination(); if (upgPath) diff --git a/node/Defaults.cpp b/node/Defaults.cpp index 566658fa..2588c85f 100644 --- a/node/Defaults.cpp +++ b/node/Defaults.cpp @@ -122,8 +122,26 @@ static inline std::map< Address,Identity > _mkUpdateAuth() return ua; } -static inline std::string _mkUpdateUrl() +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() : |