ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-20 13:33:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-12 13:27:07 -07:00
commit f5e71f64ed
No known key found for this signature in database
GPG Key ID: 1657198823E52A61
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -125,3 +125,7 @@ endif(BUILD_CENTRAL_CONTROLLER)
add_executable(${PROJECT_NAME} ${src} ${headers}) add_executable(${PROJECT_NAME} ${src} ${headers})
target_link_libraries(${PROJECT_NAME} ${libs}) target_link_libraries(${PROJECT_NAME} ${libs})
add_executable(zerotier-selftest selftest.cpp)
target_link_libraries(zerotier-selftest ${libs})

6
Jenkinsfile vendored
View File

@ -14,10 +14,12 @@ parallel 'centos7': {
checkout scm checkout scm
stage('Build Centos 7') { stage('Build Centos 7') {
sh '''rm -rf build/ sh '''. /opt/rh/devtoolset-8/enable
rm -rf build/
mkdir build && cd build mkdir build && cd build
CC=clang CXX=clang++ cmake .. cmake ..
make -j4 make -j4
./zerotier-selftest
''' '''
} }
} }

3
node/Identity.cpp
View File

@ -243,7 +243,7 @@ char *Identity::toString(bool includePrivate,char buf[ZT_IDENTITY_STRING_BUFFER_
} }
*p = (char)0; *p = (char)0;
return buf; return buf;
} } break;
case P384: { case P384: {
char *p = buf; char *p = buf;
Utils::hex10(_address.toInt(),p); Utils::hex10(_address.toInt(),p);
@ -262,6 +262,7 @@ char *Identity::toString(bool includePrivate,char buf[ZT_IDENTITY_STRING_BUFFER_
return buf; return buf;
} break; } break;
} }
return nullptr;
} }
bool Identity::fromString(const char *str) bool Identity::fromString(const char *str)