Browse Source

small SDK proxy ifdef fix, rewording of sentence in readme

pull/1/head
Joseph Henry 10 years ago
parent
commit
58dddb9d2f
  1. 2
      docs/android_zt_sdk.md
  2. 2
      integrations/android/example_app/app/src/main/AndroidManifest.xml
  3. 8
      integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
  4. BIN
      integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
  5. 2
      src/SDK_EthernetTap.cpp

2
docs/android_zt_sdk.md

@ -42,7 +42,7 @@ new Thread(new Runnable() {
**Step 4: App permissions**
- In order for your application to write the auth keys to the internal storage you'll need to set a few permissions in your `AndroidManifest.xml` file:
- In order for your application to write the auth keys and network files to the internal storage you'll need to set a few permissions in your `AndroidManifest.xml` file at the same scope level as `<application>`:
```
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

2
integrations/android/example_app/app/src/main/AndroidManifest.xml

@ -4,7 +4,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

8
integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java

@ -5,6 +5,9 @@ import android.os.Bundle;
import ZeroTier.SDK;
import java.net.InetSocketAddress;
import java.net.*;
public class MainActivity extends AppCompatActivity {
@Override
@ -18,5 +21,10 @@ public class MainActivity extends AppCompatActivity {
wrapper.startOneService(); // Calls to JNI code
}
}).start();
Socket s = new Socket();
SocketAddress proxyAddr = new InetSocketAddress("0.0.0.0", 1337);
Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxyAddr);
}
}

BIN
integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated

Binary file not shown.

2
src/SDK_EthernetTap.cpp

@ -136,7 +136,7 @@ NetconEthernetTap::NetconEthernetTap(
// Start SOCKS5 Proxy server
// For use when traditional syscall hooking isn't available (ex. some APIs on iOS and Android)
#if defined(USE_SOCKS_PROXY)
#if defined(USE_SOCKS_PROXY) || defined(__ANDROID__)
StartProxy(sockPath);
#endif

Loading…
Cancel
Save