diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-05-06 11:13:34 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-05-06 11:13:34 -0700 |
| commit | 7913fa7bbdaaf7a081680051afde783732ae67b2 (patch) | |
| tree | 27a4efa59e5137d75dbc23097c90804bcff70427 | |
| parent | b5438683516437a617e10138d82e4907fbb55b39 (diff) | |
| download | infinitytier-7913fa7bbdaaf7a081680051afde783732ae67b2.tar.gz infinitytier-7913fa7bbdaaf7a081680051afde783732ae67b2.zip | |
Dead code removal.
| -rw-r--r-- | include/ZeroTierOne.h | 13 | ||||
| -rw-r--r-- | node/Node.cpp | 7 |
2 files changed, 2 insertions, 18 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 6f0517ba..956fa304 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -117,16 +117,6 @@ extern "C" { #define ZT_MAX_PEER_NETWORK_PATHS 4 /** - * Feature flag: ZeroTier One was built to be thread-safe -- concurrent processXXX() calls are okay - */ -#define ZT_FEATURE_FLAG_THREAD_SAFE 0x00000001 - -/** - * Feature flag: FIPS compliant build (not available yet, but reserved for future use if we ever do this) - */ -#define ZT_FEATURE_FLAG_FIPS 0x00000002 - -/** * Maximum number of hops in a ZeroTier circuit test * * This is more or less the max that can be fit in a given packet (with @@ -1833,9 +1823,8 @@ void ZT_Node_backgroundThreadMain(ZT_Node *node); * @param major Result: major version * @param minor Result: minor version * @param revision Result: revision - * @param featureFlags: Result: feature flag bitmap */ -void ZT_version(int *major,int *minor,int *revision,unsigned long *featureFlags); +void ZT_version(int *major,int *minor,int *revision); #ifdef __cplusplus } diff --git a/node/Node.cpp b/node/Node.cpp index 5d534239..698f23c3 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -1023,16 +1023,11 @@ void ZT_Node_backgroundThreadMain(ZT_Node *node) } catch ( ... ) {} } -void ZT_version(int *major,int *minor,int *revision,unsigned long *featureFlags) +void ZT_version(int *major,int *minor,int *revision) { if (major) *major = ZEROTIER_ONE_VERSION_MAJOR; if (minor) *minor = ZEROTIER_ONE_VERSION_MINOR; if (revision) *revision = ZEROTIER_ONE_VERSION_REVISION; - if (featureFlags) { - *featureFlags = ( - ZT_FEATURE_FLAG_THREAD_SAFE - ); - } } } // extern "C" |