gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed... a quotation mark

Browse Source
This commit is contained in:
Joseph Henry
2016-06-22 16:18:46 -07:00
parent 7c0217a93a
commit ee54905035
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/android_zt_sdk.md
View File

@@ -25,7 +25,7 @@ In this example we aim to set up a minimal [Android Studio](https://developer.an
package ZeroTierSDK;
public class ZeroTierSDK_Wrapper {
public native void startOneService();
static { System.loadLibrary("ZeroTierOneJNI”); } // Loads JNI code
static { System.loadLibrary("ZeroTierOneJNI"); } // Loads JNI code
}
```

16
docs/osx_zt_sdk.md
View File

@@ -3,7 +3,7 @@ OSX + ZeroTier SDK
Welcome!
Imagine a flat, encrypted, no-configuration LAN for all of the instances of your OSX app.
Imagine a flat, encrypted, no-configuration LAN for all of the instances of your OSX app.
This short tutorial will show you how to enable ZeroTier functionality for your iOS app with little to no code modification. Check out our [ZeroTier SDK](https://www.zerotier.com/blog) page for more info on how the integration works and [Shim Techniques](https://www.zerotier.com/blog) for a discussion of shims available for your app/technology.
@@ -37,7 +37,7 @@ func ztnc_start_service() {
}
```
...and then start it. If you enabled the proxy service via `-DUSE_SOCKS_PROXY` it will start automatically and be reachable at `0.0.0.0:1337`:
...and then start it. If you enabled the proxy service via `-DUSE_SOCKS_PROXY` it will start automatically and be reachable at `0.0.0.0:1337`:
```
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), {
@@ -46,13 +46,13 @@ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), {
});
```
**Step 5: Pick an [API](# API) to use**
**Step 5: Pick an API**
**Step 6: Join a network!**
- Simply call `zt_join_network("XXXXXXXXXXXXXXXX")`
***
## Linking into an application on Mac OSX
## Linking into an application on Mac OSX
Example:
@@ -86,7 +86,7 @@ Run application
**Step 5: Join a network!**
- Simply call `zt_join_network("XXXXXXXXXXXXXXXX")`
***
***
## API
This integration allows for the following shim combinations:
@@ -112,9 +112,3 @@ inputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey)
outputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey)
// END proxy configuration
```

2
make-linux.mk
View File

@@ -61,7 +61,7 @@ ifeq ($(ZT_TRACE),1)
DEFS+=-DZT_TRACE
endif
# Debug output for Network Containers
# Debug output for Network Containers
# Specific levels can be controlled in netcon/common.inc.c
ifeq ($(SDK_DEBUG),1)
DEFS+=-DSDK_DEBUG