diff options
-rw-r--r-- | make-linux.mk | 5 | ||||
-rw-r--r-- | one.cpp | 6 | ||||
-rw-r--r-- | service/README.md | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/make-linux.mk b/make-linux.mk index cd946491..74f0a33c 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -164,6 +164,11 @@ ifeq ($(CC_MACH),armv7l) override DEFS+=-DZT_NO_TYPE_PUNNING ZT_USE_ARM32_NEON_ASM_CRYPTO=1 endif +ifeq ($(CC_MACH),armv7l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING + ZT_USE_ARM32_NEON_ASM_SALSA2012=1 +endif ifeq ($(CC_MACH),arm64) ZT_ARCHITECTURE=4 override DEFS+=-DZT_NO_TYPE_PUNNING @@ -466,7 +466,7 @@ static int cli(int argc,char **argv) } } else if (command == "join") { if (arg1.length() != 16) { - cliPrintHelp(argv[0],stderr); + printf("invalid network id" ZT_EOL_S); return 2; } requestHeaders["Content-Type"] = "application/json"; @@ -494,7 +494,7 @@ static int cli(int argc,char **argv) } } else if (command == "leave") { if (arg1.length() != 16) { - cliPrintHelp(argv[0],stderr); + printf("invalid network id" ZT_EOL_S); return 2; } unsigned int scode = Http::DEL( @@ -592,7 +592,7 @@ static int cli(int argc,char **argv) } } else if (command == "set") { if (arg1.length() != 16) { - cliPrintHelp(argv[0],stderr); + printf("invalid network id" ZT_EOL_S); return 2; } std::size_t eqidx = arg2.find('='); diff --git a/service/README.md b/service/README.md index 9ac097ab..da29d3d0 100644 --- a/service/README.md +++ b/service/README.md @@ -60,7 +60,7 @@ An example `local.conf`: }, "settings": { "softwareUpdate": "apply", - "softwraeUpdateChannel": "release" + "softwareUpdateChannel": "release" } } ``` |