Re-work of thread model
This commit is contained in:
@@ -1,280 +0,0 @@
|
||||
/*
|
||||
* ZeroTier SDK - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2018 ZeroTier, Inc. https://www.zerotier.com/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* You can be released from the requirements of the license by purchasing
|
||||
* a commercial license. Buying such a license is mandatory as soon as you
|
||||
* develop commercial closed-source software that incorporates or links
|
||||
* directly against ZeroTier software without disclosing the source code
|
||||
* of your own application.
|
||||
*/
|
||||
|
||||
// Simple Java example for libzt using JNI
|
||||
|
||||
import com.zerotier.libzt.ZeroTier;
|
||||
import com.zerotier.libzt.ZTSocketAddress;
|
||||
import com.zerotier.libzt.ZTFDSet;
|
||||
|
||||
import java.lang.Thread;
|
||||
|
||||
public class ExampleApp {
|
||||
|
||||
static { System.loadLibrary("zt"); } // load libzt.dylib or libzt.so
|
||||
|
||||
static void sleep(int ms)
|
||||
{
|
||||
try { Thread.sleep(ms); }
|
||||
catch (InterruptedException e) { e.printStackTrace(); }
|
||||
}
|
||||
|
||||
public static void main(String[] args)
|
||||
{
|
||||
|
||||
final ZeroTier zt = new ZeroTier();
|
||||
|
||||
new Thread(new Runnable()
|
||||
{
|
||||
public void run()
|
||||
{
|
||||
String path = "/Users/joseph/op/zt/libzt/ztjni"; // Where node's config files are stored
|
||||
long nwid = 0xa09acf7233e4b071L;
|
||||
|
||||
// Test modes
|
||||
boolean blocking_start_call = true;
|
||||
boolean client_mode = false;
|
||||
boolean tcp = false;
|
||||
boolean loop = true; // RX/TX multiple times
|
||||
boolean idle = false; // Idle loop after node comes online. For testing reachability
|
||||
boolean use_select = true;
|
||||
|
||||
int fd = -1, client_fd = -1, err, r, w, lengthToRead = 0, flags = 0;
|
||||
byte[] rxBuffer;
|
||||
byte[] txBuffer = "welcome to the machine".getBytes();
|
||||
String remoteAddrStr = "11.7.7.107";
|
||||
String localAddrStr = "0.0.0.0";
|
||||
int portNo = 4040;
|
||||
|
||||
ZTSocketAddress remoteAddr, localAddr;
|
||||
ZTSocketAddress sockname = new ZTSocketAddress();
|
||||
ZTSocketAddress addr = new ZTSocketAddress();
|
||||
|
||||
// METHOD 1 (easy)
|
||||
// Blocking call that waits for all components of the service to start
|
||||
System.out.println("Starting ZT service...");
|
||||
if (blocking_start_call) {
|
||||
zt.startjoin(path, nwid);
|
||||
}
|
||||
// METHOD 2
|
||||
// Optional. Non-blocking call to start service. You'll have to use the below process to determine
|
||||
// when you are allowed to start making socket calls.
|
||||
if (!blocking_start_call) {
|
||||
zt.start(path, true);
|
||||
while(!zt.ready()) {
|
||||
try { // Wait for core service to start
|
||||
Thread.sleep(250);
|
||||
}
|
||||
catch(InterruptedException ex) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
System.out.println("Core started. Networks can be joined after this point");
|
||||
zt.join(nwid);
|
||||
// Wait for userspace stack to start, we trigger this by joining a network
|
||||
while(!zt.stack_running()) {
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
catch(InterruptedException ex) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
}
|
||||
System.out.println("ZT service ready.");
|
||||
// Device/Node address info
|
||||
System.out.println("path=" + zt.get_path());
|
||||
long nodeId = zt.get_node_id();
|
||||
System.out.println("nodeId=" + Long.toHexString(nodeId));
|
||||
int numAddresses = zt.get_num_assigned_addresses(nwid);
|
||||
System.out.println("this node has (" + numAddresses + ") assigned addresses on network " + Long.toHexString(nwid));
|
||||
for (int i=0; i<numAddresses; i++) {
|
||||
zt.get_address_at_index(nwid, i, sockname);
|
||||
//System.out.println("address[" + i + "] = " + sockname.toString()); // ip:port
|
||||
System.out.println("address[" + i + "] = " + sockname.toCIDR());
|
||||
}
|
||||
|
||||
zt.get_6plane_addr(nwid, nodeId, sockname);
|
||||
System.out.println("6PLANE address = " + sockname.toCIDR());
|
||||
|
||||
// Idle loop test
|
||||
while(idle) { try { Thread.sleep(3000); } catch (InterruptedException e) { e.printStackTrace(); } }
|
||||
|
||||
// TCP
|
||||
if (tcp) {
|
||||
System.out.println("mode:tcp");
|
||||
if ((fd = zt.socket(zt.AF_INET, zt.SOCK_STREAM, 0)) < 0) {
|
||||
System.out.println("error creating socket");
|
||||
return;
|
||||
}
|
||||
// CLIENT
|
||||
if (client_mode) {
|
||||
System.out.println("mode:client");
|
||||
remoteAddr = new ZTSocketAddress(remoteAddrStr, portNo);
|
||||
if ((err = zt.connect(fd, remoteAddr)) < 0) {
|
||||
System.out.println("error connecting (err=" + err + ")");
|
||||
return;
|
||||
}
|
||||
String echo_msg = "echo!";
|
||||
w = zt.write(fd, echo_msg.getBytes());
|
||||
rxBuffer = new byte[100];
|
||||
lengthToRead = 100;
|
||||
System.out.println("reading bytes...");
|
||||
r = zt.read(fd, rxBuffer);
|
||||
System.out.println("r="+r);
|
||||
System.out.println("string="+new String(rxBuffer));
|
||||
}
|
||||
|
||||
// SERVER
|
||||
if (!client_mode) {
|
||||
System.out.println("mode:server");
|
||||
localAddr = new ZTSocketAddress(localAddrStr, portNo);
|
||||
|
||||
if ((err = zt.bind(fd, localAddr)) < 0) {
|
||||
System.out.println("error binding socket to virtual interface");
|
||||
return;
|
||||
} if ((err = zt.listen(fd, 1)) < 0) {
|
||||
System.out.println("error putting socket into listening state");
|
||||
return;
|
||||
}
|
||||
remoteAddr = new ZTSocketAddress(localAddrStr, 0);
|
||||
client_fd = -1;
|
||||
if ((client_fd = zt.accept(fd, remoteAddr)) < 0) {
|
||||
System.out.println("error accepting incoming connection (err=" + client_fd + ")");
|
||||
return;
|
||||
}
|
||||
System.out.println("accepted connection (client_fd=" + client_fd + ")");
|
||||
rxBuffer = new byte[100];
|
||||
lengthToRead = 100;
|
||||
System.out.println("reading bytes...");
|
||||
r = zt.read(client_fd, rxBuffer);
|
||||
System.out.println("r="+r);
|
||||
System.out.println("string="+new String(rxBuffer));
|
||||
System.out.println("writing bytes...");
|
||||
String echo_msg = "echo!";
|
||||
w = zt.write(client_fd, echo_msg.getBytes());
|
||||
System.out.println("wrote (" + w + ") bytes");
|
||||
}
|
||||
}
|
||||
|
||||
// UDP
|
||||
if (!tcp) {
|
||||
System.out.println("mode:udp");
|
||||
if ((fd = zt.socket(zt.AF_INET, zt.SOCK_DGRAM, 0)) < 0) {
|
||||
System.out.println("error creating socket");
|
||||
return;
|
||||
}
|
||||
// CLIENT
|
||||
if (client_mode) {
|
||||
System.out.println("mode:client");
|
||||
localAddr = new ZTSocketAddress(localAddrStr, portNo);
|
||||
if ((err = zt.bind(fd, localAddr)) < 0) {
|
||||
System.out.println("error binding socket to virtual interface");
|
||||
return;
|
||||
}
|
||||
remoteAddr = new ZTSocketAddress(remoteAddrStr, portNo);
|
||||
System.out.println("sending message to: " + remoteAddr.toString());
|
||||
if (loop) {
|
||||
while (true) {
|
||||
sleep(500);
|
||||
if ((w = zt.sendto(fd, txBuffer, flags, remoteAddr)) < 0) {
|
||||
System.out.println("error sending bytes");
|
||||
} else {
|
||||
System.out.println("sendto()=" + w);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ((w = zt.sendto(fd, txBuffer, flags, remoteAddr)) < 0) {
|
||||
System.out.println("error sending bytes");
|
||||
} else {
|
||||
System.out.println("sendto()=" + w);
|
||||
}
|
||||
}
|
||||
}
|
||||
// SERVER
|
||||
if (!client_mode) {
|
||||
System.out.println("mode:server");
|
||||
localAddr = new ZTSocketAddress(localAddrStr, portNo);
|
||||
System.out.println("binding to " + localAddr.toString());
|
||||
if ((err = zt.bind(fd, localAddr)) < 0) {
|
||||
System.out.println("error binding socket to virtual interface");
|
||||
return;
|
||||
}
|
||||
|
||||
rxBuffer = new byte[100];
|
||||
remoteAddr = new ZTSocketAddress("-1.-1.-1.-1", 0);
|
||||
|
||||
// select() loop
|
||||
ZTFDSet master_set = new ZTFDSet();
|
||||
master_set.ZERO();
|
||||
master_set.SET(fd);
|
||||
int nfds = fd + 1;
|
||||
if (use_select)
|
||||
{
|
||||
while(true)
|
||||
{
|
||||
err = zt.select(nfds, master_set, null, null, 0, 100000);
|
||||
if (err < 0) {
|
||||
System.out.println("select failed");
|
||||
} if (err == 0) {
|
||||
System.out.println("select timed out");
|
||||
} if (err > 0) {
|
||||
System.out.println("select detected something to read on");
|
||||
for (int i = 0; i < nfds; i++)
|
||||
{
|
||||
if (master_set.ISSET(i))
|
||||
{
|
||||
System.out.println("attempting to read from: " + i);
|
||||
r = zt.recvfrom(fd, rxBuffer, flags, remoteAddr);
|
||||
System.out.println("read (" + r + ") bytes from " + remoteAddr.toString() + ", buffer = " + new String(rxBuffer));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!use_select)
|
||||
{
|
||||
while(true) {
|
||||
addr = new ZTSocketAddress();
|
||||
r = zt.recvfrom(fd, rxBuffer, flags, remoteAddr);
|
||||
System.out.println("read (" + r + ") bytes from " + remoteAddr.toString() + ", buffer = " + new String(rxBuffer));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
zt.close(client_fd);
|
||||
zt.close(fd);
|
||||
}
|
||||
}).start();
|
||||
|
||||
while(true)
|
||||
{
|
||||
try { Thread.sleep(3000); }
|
||||
catch (InterruptedException e) { e.printStackTrace(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
## ZeroTier with Java via JNI
|
||||
***
|
||||
|
||||
### ExampleApp
|
||||
|
||||
Copy `zt.jar` file into this directory
|
||||
Extract shared library from JAR file: `jar xf zt.jar libzt.dylib`
|
||||
Build ExampleApp: `javac -cp ".:zt.jar" ExampleApp.java`
|
||||
@@ -1,54 +0,0 @@
|
||||
/*
|
||||
* ZeroTier SDK - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2018 ZeroTier, Inc. https://www.zerotier.com/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* You can be released from the requirements of the license by purchasing
|
||||
* a commercial license. Buying such a license is mandatory as soon as you
|
||||
* develop commercial closed-source software that incorporates or links
|
||||
* directly against ZeroTier software without disclosing the source code
|
||||
* of your own application.
|
||||
*/
|
||||
|
||||
package com.zerotier.libzt;
|
||||
|
||||
public class ZTFDSet
|
||||
{
|
||||
byte[] fds_bits = new byte[1024];
|
||||
|
||||
public void CLR(int fd)
|
||||
{
|
||||
fds_bits[fd] = 0x00;
|
||||
}
|
||||
|
||||
public boolean ISSET(int fd)
|
||||
{
|
||||
return fds_bits[fd] == 0x01;
|
||||
}
|
||||
|
||||
public void SET(int fd)
|
||||
{
|
||||
fds_bits[fd] = 0x01;
|
||||
}
|
||||
|
||||
public void ZERO()
|
||||
{
|
||||
for (int i=0; i<1024; i++) {
|
||||
fds_bits[i] = 0x00;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
/*
|
||||
* ZeroTier SDK - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2018 ZeroTier, Inc. https://www.zerotier.com/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* You can be released from the requirements of the license by purchasing
|
||||
* a commercial license. Buying such a license is mandatory as soon as you
|
||||
* develop commercial closed-source software that incorporates or links
|
||||
* directly against ZeroTier software without disclosing the source code
|
||||
* of your own application.
|
||||
*/
|
||||
|
||||
package com.zerotier.libzt;
|
||||
|
||||
import com.zerotier.libzt.ZeroTier;
|
||||
|
||||
import java.net.InetAddress;
|
||||
|
||||
// Designed to transport address information across the JNI boundary
|
||||
public class ZTSocketAddress
|
||||
{
|
||||
public byte[] _ip6 = new byte[16];
|
||||
public byte[] _ip4 = new byte[4];
|
||||
|
||||
public int _family;
|
||||
public int _port; // Also reused for netmask or prefix
|
||||
|
||||
public ZTSocketAddress() {}
|
||||
|
||||
public ZTSocketAddress(String ipStr, int port)
|
||||
{
|
||||
if(ipStr.contains(":")) {
|
||||
_family = ZeroTier.AF_INET6;
|
||||
try {
|
||||
InetAddress ip = InetAddress.getByName(ipStr);
|
||||
_ip6 = ip.getAddress();
|
||||
}
|
||||
catch (Exception e) { }
|
||||
}
|
||||
else if(ipStr.contains(".")) {
|
||||
_family = ZeroTier.AF_INET;
|
||||
try {
|
||||
InetAddress ip = InetAddress.getByName(ipStr);
|
||||
_ip4 = ip.getAddress();
|
||||
}
|
||||
catch (Exception e) { }
|
||||
}
|
||||
_port = port;
|
||||
}
|
||||
|
||||
public int getPort() { return _port; }
|
||||
public int getNetmask() { return _port; }
|
||||
public int getPrefix() { return _port; }
|
||||
|
||||
private String ipString()
|
||||
{
|
||||
if (_family == ZeroTier.AF_INET) {
|
||||
try {
|
||||
InetAddress inet = InetAddress.getByAddress(_ip4);
|
||||
return "" + inet.getHostAddress();
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
}
|
||||
}
|
||||
if (_family == ZeroTier.AF_INET6) {
|
||||
try {
|
||||
InetAddress inet = InetAddress.getByAddress(_ip6);
|
||||
return "" + inet.getHostAddress();
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public String toString() { return ipString() + ":" + _port; }
|
||||
public String toCIDR() { return ipString() + "/" + _port; }
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
/*
|
||||
* ZeroTier SDK - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2018 ZeroTier, Inc. https://www.zerotier.com/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* You can be released from the requirements of the license by purchasing
|
||||
* a commercial license. Buying such a license is mandatory as soon as you
|
||||
* develop commercial closed-source software that incorporates or links
|
||||
* directly against ZeroTier software without disclosing the source code
|
||||
* of your own application.
|
||||
*/
|
||||
|
||||
package com.zerotier.libzt;
|
||||
|
||||
import java.net.*;
|
||||
|
||||
public class ZeroTier {
|
||||
|
||||
public static int AF_INET = 2;
|
||||
public static int AF_INET6 = 30;
|
||||
public static int SOCK_STREAM = 1;
|
||||
public static int SOCK_DGRAM = 2;
|
||||
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;
|
||||
public static int F_GETFL = 3;
|
||||
public static int F_SETFL = 4;
|
||||
|
||||
public native void start(String homePath, boolean blocking);
|
||||
public native void startjoin(String homePath, long nwid);
|
||||
public native void stop();
|
||||
public native boolean core_running();
|
||||
public native boolean stack_running();
|
||||
public native boolean ready();
|
||||
public native int join(long nwid);
|
||||
public native int leave(long nwid);
|
||||
public native String get_path();
|
||||
public native long get_node_id();
|
||||
public native int get_num_assigned_addresses(long nwid);
|
||||
public native boolean get_address_at_index(long nwid, int index, ZTSocketAddress addr);
|
||||
public native boolean has_address(long nwid);
|
||||
public native boolean get_address(long nwid, int address_family, ZTSocketAddress addr);
|
||||
public native void get_6plane_addr(long nwid, long nodeId, ZTSocketAddress addr);
|
||||
public native void get_rfc4193_addr(long nwid, long nodeId, ZTSocketAddress addr);
|
||||
|
||||
public native int socket(int family, int type, int protocol);
|
||||
public native int connect(int fd, ZTSocketAddress addr);
|
||||
public native int bind(int fd, ZTSocketAddress addr);
|
||||
public native int listen(int fd, int backlog);
|
||||
public native int accept(int fd, ZTSocketAddress addr);
|
||||
public native int accept4(int fd, String addr, int port);
|
||||
public native int close(int fd);
|
||||
public native int setsockopt(int fd, int level, int optname, int optval, int optlen);
|
||||
public native int getsockopt(int fd, int level, int optname, int optval, int optlen);
|
||||
public native int sendto(int fd, byte[] buf, int flags, ZTSocketAddress addr);
|
||||
public native int send(int fd, byte[] buf, int flags);
|
||||
public native int recv(int fd, byte[] buf, int flags);
|
||||
public native int recvfrom(int fd, byte[] buf, int flags, ZTSocketAddress addr);
|
||||
public native int read(int fd, byte[] buf);
|
||||
public native int write(int fd, byte[] buf);
|
||||
public native int shutdown(int fd, int how);
|
||||
public native boolean getsockname(int fd, ZTSocketAddress addr);
|
||||
public native int getpeername(int fd, ZTSocketAddress addr);
|
||||
public native int fcntl(int sock, int cmd, int flag);
|
||||
public native int select(int nfds, ZTFDSet readfds, ZTFDSet writefds, ZTFDSet exceptfds, int timeout_sec, int timeout_usec);
|
||||
}
|
||||
Reference in New Issue
Block a user