diff --git a/Makefile b/Makefile index 5ff062da1..5fbe6562f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -# Common makefile -- loads make rules for each platform - BUILDDIR := build .PHONY: all @@ -20,4 +18,4 @@ clean: rm -rf ${BUILDDIR} distclean: - rm -rf ${BUILDDIR} + rm -rf ${BUILDDIR} cmake-build-* diff --git a/go/cmd/zerotier/cli/help.go b/go/cmd/zerotier/cli/help.go index 924deb543..f3ac142bf 100644 --- a/go/cmd/zerotier/cli/help.go +++ b/go/cmd/zerotier/cli/help.go @@ -43,7 +43,7 @@ Commands: roots Show only root peers addroot [IP/port] Add root with optional bootstrap IP removeroot Remove root - join Join a virtual network + join [fingerprint] Join a virtual network leave Leave a virtual network networks List joined VL2 virtual networks network Show verbose network info diff --git a/node/Membership.cpp b/node/Membership.cpp index 71edb887a..11f2a9f2a 100644 --- a/node/Membership.cpp +++ b/node/Membership.cpp @@ -115,6 +115,7 @@ void Membership::pushCredentials(const RuntimeEnvironment *RR,void *tPtr,const i if (outl > (int)sizeof(Protocol::Header)) { outl = Protocol::compress(outp,outl); + // TODO } }