diff options
| author | Joseph Henry <[email protected]> | 2016-07-20 14:20:45 -0700 |
|---|---|---|
| committer | Joseph Henry <[email protected]> | 2016-07-20 14:20:45 -0700 |
| commit | 27c26b61b27bdb9068a9b7d331b69462060b22b6 (patch) | |
| tree | a0b6f7901ee53e1347de183506c6cf8bb81ae9f0 /src/SDK_ServiceSetup.hpp | |
| parent | d894077b81ed1ddb9185e2c39fffb566e48d2b7a (diff) | |
API usability update, normalized zt_ naming convention0.2.1
Diffstat (limited to 'src/SDK_ServiceSetup.hpp')
| -rw-r--r-- | src/SDK_ServiceSetup.hpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/SDK_ServiceSetup.hpp b/src/SDK_ServiceSetup.hpp index 3477269..a5b29f6 100644 --- a/src/SDK_ServiceSetup.hpp +++ b/src/SDK_ServiceSetup.hpp @@ -27,7 +27,6 @@ #include <string> - #ifdef __cplusplus extern "C" { #endif @@ -49,19 +48,27 @@ extern std::string homeDir; /* If you define anything else in this file it that you wish to expose to your Android Java application you *must* follow that convention and any corresponding Java package/classes in your Android project must match this as well */ - JNIEXPORT void JNICALL Java_ZeroTier_SDK_startOneService(JNIEnv *env, jobject thisObj, jstring path); - JNIEXPORT void JNICALL Java_ZeroTier_SDK_joinNetwork(JNIEnv *env, jobject thisObj, jstring nwid); - JNIEXPORT void JNICALL Java_ZeroTier_SDK_leaveNetwork(JNIEnv *env, jobject thisObj, jstring nwid); - JNIEXPORT jboolean JNICALL Java_ZeroTier_SDK_isRunning(JNIEnv *env, jobject thisObj); + JNIEXPORT void JNICALL Java_ZeroTier_SDK_zt_1join_1network(JNIEnv *env, jobject thisObj, jstring nwid); + JNIEXPORT void JNICALL Java_ZeroTier_SDK_zt_1leave_1network(JNIEnv *env, jobject thisObj, jstring nwid); + JNIEXPORT jboolean JNICALL Java_ZeroTier_SDK_zt_1running(JNIEnv *env, jobject thisObj); #else - void *startOneService(void *thread_id); void init_service(int key, const char * path); void init_service_and_rpc(int key, const char * path, const char * nwid); void init_intercept(int key); #endif + +#if defined (__ANDROID__) + JNIEXPORT int JNICALL Java_ZeroTier_SDK_zt_1start_1service(JNIEnv *env, jobject thisObj, jstring path); +#else + void * zt_start_service(void *thread_id); +#endif + void set_intercept_status(int mode); -void join_network(const char * nwid); -void leave_network(const char * nwid); +void zts_join_network(const char * nwid); +void zts_leave_network(const char * nwid); +bool zts_is_running(); +void zts_terminate(); + #endif |