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

Update to JNI for both Java and Scala (removed ztjni from method prefixes)

Browse Source
This commit is contained in:
Joseph Henry
2017-10-16 15:34:43 -07:00
parent 55c527d149
commit ce22940f57
5 changed files with 154 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
examples/bindings/java/zerotier/ZeroTier.java
View File

@@ -26,8 +26,6 @@
package zerotier;
//import zerotier.*;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -43,155 +41,35 @@ public class ZeroTier {
// Socket families
public static int AF_UNIX = 1;
public static int AF_INET = 2;
// Socket types
public static int SOCK_STREAM = 1;
public static int SOCK_DGRAM = 2;
// fcntl flags
public static int O_APPEND = 1024;
public static int O_NONBLOCK = 2048;
public static int O_ASYNC = 8192;
public static int O_DIRECT = 65536;
public static int O_NOATIME = 262144;
// fcntl cmds
public static int F_GETFL = 3;
public static int F_SETFL = 4;
// Loads JNI code
//static { System.loadLibrary("zt"); }
// ZeroTier service controls
public native void ztjni_start(String homeDir);
public void start(String homeDir) { ztjni_start(homeDir); }
public native void ztjni_startjoin(String homeDir, String nwid);
public void startjoin(String homeDir, String nwid) { ztjni_startjoin(homeDir, nwid); }
public native void ztjni_join(String nwid);
public void join(String nwid) {
ztjni_join(nwid);
}
public native void ztjni_leave(String nwid);
public void leave(String nwid) {
ztjni_leave(nwid);
}
public native ArrayList<String> ztjni_get_addresses(String nwid);
public ArrayList<String> get_addresses(String nwid) {
int err = -1;
ArrayList<String> addresses;
while (err < 0) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
}
addresses = ztjni_get_addresses(nwid);
if (addresses.size() > 0) {
return addresses;
}
}
return null;
}
public native boolean ztjni_running();
public boolean running() { return ztjni_running(); }
public native int ztjni_socket(int family, int type, int protocol);
public int socket(int family, int type, int protocol) { return ztjni_socket(family, type, protocol); }
public native int ztjni_connect(int fd, String addr, int port);
public int connect(int sock, Address zaddr, String nwid) { return connect(sock, zaddr.Address(), zaddr.Port(), nwid); }
public int connect(int sock, String addr, int port, String nwid)
{
int err = -1;
ArrayList<String> addresses;
while (err < 0) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
}
addresses = ztjni_get_addresses(nwid);
if (addresses.size() > 0) {
if(!addresses.get(0).startsWith("-1.-1.-1.-1/-1")) {
err = ztjni_connect(sock, addr, port);
}
}
}
return err;
}
public native int ztjni_bind(int fd, String addr, int port);
public int bind(int sock, Address zaddr, String nwid) { return bind(sock, zaddr.Address(), zaddr.Port(), nwid); }
public int bind(int sock, String addr, int port, String nwid) {
int err = -1;
ArrayList<String> addresses;
while (err < 0) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
}
addresses = ztjni_get_addresses(nwid);
if (addresses.size() > 0) {
if(!addresses.get(0).startsWith("-1.-1.-1.-1/-1")) {
err = ztjni_bind(sock, addr, port);
}
}
}
return err;
}
public native int ztjni_accept4(int fd, String addr, int port);
public int accept4(int fd, String addr, int port) {
return ztjni_accept4(fd,addr,port);
}
public native int ztjni_accept(int fd, Address addr);
public int accept(int fd, Address addr) {
return ztjni_accept(fd, addr);
}
public native int ztjni_listen(int fd, int backlog);
public int listen(int fd, int backlog) {
return ztjni_listen(fd,backlog);
}
public native int ztjni_close(int fd);
public int close(int fd) {
return ztjni_close(fd);
}
public native int ztjni_read(int fd, byte[] buf, int len);
public int read(int fd, byte[] buf, int len) {
return ztjni_read(fd, buf, len);
}
public native int ztjni_write(int fd, byte[] buf, int len);
public int write(int fd, byte[] buf, int len) {
return ztjni_write(fd, buf, len);
}
public native int ztjni_sendto(int fd, byte[] buf, int len, int flags, Address addr);
public int sendto(int fd, byte[] buf, int len, int flags, Address addr){
return ztjni_sendto(fd,buf,len,flags,addr);
}
public native int ztjni_send(int fd, byte[] buf, int len, int flags);
public int send(int fd, byte[] buf, int len, int flags) {
return ztjni_send(fd, buf, len, flags);
}
public native int ztjni_recvfrom(int fd, byte[] buf, int len, int flags, Address addr);
public int recvfrom(int fd, byte[] buf, int len, int flags, Address addr){
return ztjni_recvfrom(fd,buf,len,flags,addr);
}
public native int ztjni_fcntl(int sock, int cmd, int flag);
public int fcntl(int sock, int cmd, int flag) {
return ztjni_fcntl(sock, F_SETFL, O_NONBLOCK);
}
public native void start(String homeDir);
public native void startjoin(String homeDir, String nwid);
public native boolean running();
public native void join(String nwid);
public native void leave(String nwid);
public native int socket(int family, int type, int protocol);
public native int connect(int fd, String addr, int port);
public native int bind(int fd, String addr, int port);
public native int accept4(int fd, String addr, int port);
public native int accept(int fd, Address addr);
public native int listen(int fd, int backlog);
public native int close(int fd);
public native int read(int fd, byte[] buf, int len);
public native int write(int fd, byte[] buf, int len);
public native int sendto(int fd, byte[] buf, int len, int flags, Address addr);
public native int send(int fd, byte[] buf, int len, int flags);
public native int recvfrom(int fd, byte[] buf, int len, int flags, Address addr);
public native int fcntl(int sock, int cmd, int flag);
}