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

Updated java example

Browse Source
This commit is contained in:
Joseph Henry
2018-07-28 16:44:13 -07:00
parent dd1ff7eb55
commit f765e29027
5 changed files with 105 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
examples/java/ExampleApp.java
View File

@@ -26,8 +26,11 @@
// Simple Java example for libzt using JNI // Simple Java example for libzt using JNI
import zerotier.*; import com.zerotier.libzt.ZeroTier;
import java.net.*; import com.zerotier.libzt.ZTSocketAddress;
import com.zerotier.libzt.ZTFDSet;
//import java.net.*;
import java.lang.Thread; import java.lang.Thread;
public class ExampleApp { public class ExampleApp {
@@ -46,14 +49,14 @@ public class ExampleApp {
public static void main(String[] args) public static void main(String[] args)
{ {
final ZeroTier libzt = new ZeroTier(); final ZeroTier zt = new ZeroTier();
new Thread(new Runnable() new Thread(new Runnable()
{ {
public void run() public void run()
{ {
String path = "/Users/joseph/op/zt/libzt/ztjni"; // Where node's config files are stored String path = "/Users/joseph/op/zt/libzt/ztjni"; // Where node's config files are stored
long nwid = 0xa09acf0233e4b070L; long nwid = 0xa09acf7233e4b071L;
// Test modes // Test modes
boolean blocking_start_call = true; boolean blocking_start_call = true;
@@ -61,6 +64,7 @@ public class ExampleApp {
boolean tcp = false; boolean tcp = false;
boolean loop = true; // RX/TX multiple times boolean loop = true; // RX/TX multiple times
boolean idle = false; // Idle loop after node comes online. For testing reachability 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; int fd = -1, client_fd = -1, err, r, w, lengthToRead = 0, flags = 0;
byte[] rxBuffer; byte[] rxBuffer;
@@ -77,14 +81,14 @@ public class ExampleApp {
// Blocking call that waits for all components of the service to start // Blocking call that waits for all components of the service to start
System.out.println("Starting ZT service..."); System.out.println("Starting ZT service...");
if (blocking_start_call) { if (blocking_start_call) {
libzt.startjoin(path, nwid); zt.startjoin(path, nwid);
} }
// METHOD 2 // METHOD 2
// Optional. Non-blocking call to start service. You'll have to use the below process to determine // 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. // when you are allowed to start making socket calls.
if (!blocking_start_call) { if (!blocking_start_call) {
libzt.start(path, true); zt.start(path, true);
while(!libzt.ready()) { while(!zt.ready()) {
try { // Wait for core service to start try { // Wait for core service to start
Thread.sleep(250); Thread.sleep(250);
} }
@@ -93,9 +97,9 @@ public class ExampleApp {
} }
} }
System.out.println("Core started. Networks can be joined after this point"); System.out.println("Core started. Networks can be joined after this point");
libzt.join(nwid); zt.join(nwid);
// Wait for userspace stack to start, we trigger this by joining a network // Wait for userspace stack to start, we trigger this by joining a network
while(!libzt.stack_running()) { while(!zt.stack_running()) {
try { try {
Thread.sleep(1000); Thread.sleep(1000);
} }
@@ -106,18 +110,18 @@ public class ExampleApp {
} }
System.out.println("ZT service ready."); System.out.println("ZT service ready.");
// Device/Node address info // Device/Node address info
System.out.println("path=" + libzt.get_path()); System.out.println("path=" + zt.get_path());
long nodeId = libzt.get_node_id(); long nodeId = zt.get_node_id();
System.out.println("nodeId=" + Long.toHexString(nodeId)); System.out.println("nodeId=" + Long.toHexString(nodeId));
int numAddresses = libzt.get_num_assigned_addresses(nwid); int numAddresses = zt.get_num_assigned_addresses(nwid);
System.out.println("this node has (" + numAddresses + ") assigned addresses on network " + Long.toHexString(nwid)); System.out.println("this node has (" + numAddresses + ") assigned addresses on network " + Long.toHexString(nwid));
for (int i=0; i<numAddresses; i++) { for (int i=0; i<numAddresses; i++) {
libzt.get_address_at_index(nwid, i, sockname); zt.get_address_at_index(nwid, i, sockname);
//System.out.println("address[" + i + "] = " + sockname.toString()); // ip:port //System.out.println("address[" + i + "] = " + sockname.toString()); // ip:port
System.out.println("address[" + i + "] = " + sockname.toCIDR()); System.out.println("address[" + i + "] = " + sockname.toCIDR());
} }
libzt.get_6plane_addr(nwid, nodeId, sockname); zt.get_6plane_addr(nwid, nodeId, sockname);
System.out.println("6PLANE address = " + sockname.toCIDR()); System.out.println("6PLANE address = " + sockname.toCIDR());
// Idle loop test // Idle loop test
@@ -126,7 +130,7 @@ public class ExampleApp {
// TCP // TCP
if (tcp) { if (tcp) {
System.out.println("mode:tcp"); System.out.println("mode:tcp");
if ((fd = libzt.socket(libzt.AF_INET, libzt.SOCK_STREAM, 0)) < 0) { if ((fd = zt.socket(zt.AF_INET, zt.SOCK_STREAM, 0)) < 0) {
System.out.println("error creating socket"); System.out.println("error creating socket");
return; return;
} }
@@ -134,16 +138,16 @@ public class ExampleApp {
if (client_mode) { if (client_mode) {
System.out.println("mode:client"); System.out.println("mode:client");
remoteAddr = new ZTSocketAddress(remoteAddrStr, portNo); remoteAddr = new ZTSocketAddress(remoteAddrStr, portNo);
if ((err = libzt.connect(fd, remoteAddr)) < 0) { if ((err = zt.connect(fd, remoteAddr)) < 0) {
System.out.println("error connecting (err=" + err + ")"); System.out.println("error connecting (err=" + err + ")");
return; return;
} }
String echo_msg = "echo!"; String echo_msg = "echo!";
w = libzt.write(fd, echo_msg.getBytes(), echo_msg.length()); w = zt.write(fd, echo_msg.getBytes(), echo_msg.length());
rxBuffer = new byte[100]; rxBuffer = new byte[100];
lengthToRead = 100; lengthToRead = 100;
System.out.println("reading bytes..."); System.out.println("reading bytes...");
r = libzt.read(fd, rxBuffer, lengthToRead); r = zt.read(fd, rxBuffer, lengthToRead);
System.out.println("r="+r); System.out.println("r="+r);
System.out.println("string="+new String(rxBuffer)); System.out.println("string="+new String(rxBuffer));
} }
@@ -153,16 +157,16 @@ public class ExampleApp {
System.out.println("mode:server"); System.out.println("mode:server");
localAddr = new ZTSocketAddress(localAddrStr, portNo); localAddr = new ZTSocketAddress(localAddrStr, portNo);
if ((err = libzt.bind(fd, localAddr)) < 0) { if ((err = zt.bind(fd, localAddr)) < 0) {
System.out.println("error binding socket to virtual interface"); System.out.println("error binding socket to virtual interface");
return; return;
} if ((err = libzt.listen(fd, 1)) < 0) { } if ((err = zt.listen(fd, 1)) < 0) {
System.out.println("error putting socket into listening state"); System.out.println("error putting socket into listening state");
return; return;
} }
remoteAddr = new ZTSocketAddress(localAddrStr, 0); remoteAddr = new ZTSocketAddress(localAddrStr, 0);
client_fd = -1; client_fd = -1;
if ((client_fd = libzt.accept(fd, remoteAddr)) < 0) { if ((client_fd = zt.accept(fd, remoteAddr)) < 0) {
System.out.println("error accepting incoming connection (err=" + client_fd + ")"); System.out.println("error accepting incoming connection (err=" + client_fd + ")");
return; return;
} }
@@ -170,12 +174,12 @@ public class ExampleApp {
rxBuffer = new byte[100]; rxBuffer = new byte[100];
lengthToRead = 100; lengthToRead = 100;
System.out.println("reading bytes..."); System.out.println("reading bytes...");
r = libzt.read(client_fd, rxBuffer, lengthToRead); r = zt.read(client_fd, rxBuffer, lengthToRead);
System.out.println("r="+r); System.out.println("r="+r);
System.out.println("string="+new String(rxBuffer)); System.out.println("string="+new String(rxBuffer));
System.out.println("writing bytes..."); System.out.println("writing bytes...");
String echo_msg = "echo!"; String echo_msg = "echo!";
w = libzt.write(client_fd, echo_msg.getBytes(), echo_msg.length()); w = zt.write(client_fd, echo_msg.getBytes(), echo_msg.length());
System.out.println("wrote (" + w + ") bytes"); System.out.println("wrote (" + w + ") bytes");
} }
} }
@@ -183,7 +187,7 @@ public class ExampleApp {
// UDP // UDP
if (!tcp) { if (!tcp) {
System.out.println("mode:udp"); System.out.println("mode:udp");
if ((fd = libzt.socket(libzt.AF_INET, libzt.SOCK_DGRAM, 0)) < 0) { if ((fd = zt.socket(zt.AF_INET, zt.SOCK_DGRAM, 0)) < 0) {
System.out.println("error creating socket"); System.out.println("error creating socket");
return; return;
} }
@@ -191,7 +195,7 @@ public class ExampleApp {
if (client_mode) { if (client_mode) {
System.out.println("mode:client"); System.out.println("mode:client");
localAddr = new ZTSocketAddress(localAddrStr, portNo); localAddr = new ZTSocketAddress(localAddrStr, portNo);
if ((err = libzt.bind(fd, localAddr)) < 0) { if ((err = zt.bind(fd, localAddr)) < 0) {
System.out.println("error binding socket to virtual interface"); System.out.println("error binding socket to virtual interface");
return; return;
} }
@@ -200,14 +204,14 @@ public class ExampleApp {
if (loop) { if (loop) {
while (true) { while (true) {
sleep(500); sleep(500);
if ((w = libzt.sendto(fd, txBuffer, txBuffer.length, flags, remoteAddr)) < 0) { if ((w = zt.sendto(fd, txBuffer, txBuffer.length, flags, remoteAddr)) < 0) {
System.out.println("error sending bytes"); System.out.println("error sending bytes");
} else { } else {
System.out.println("sendto()=" + w); System.out.println("sendto()=" + w);
} }
} }
} else { } else {
if ((w = libzt.sendto(fd, txBuffer, txBuffer.length, flags, remoteAddr)) < 0) { if ((w = zt.sendto(fd, txBuffer, txBuffer.length, flags, remoteAddr)) < 0) {
System.out.println("error sending bytes"); System.out.println("error sending bytes");
} else { } else {
System.out.println("sendto()=" + w); System.out.println("sendto()=" + w);
@@ -219,23 +223,55 @@ public class ExampleApp {
System.out.println("mode:server"); System.out.println("mode:server");
localAddr = new ZTSocketAddress(localAddrStr, portNo); localAddr = new ZTSocketAddress(localAddrStr, portNo);
System.out.println("binding to " + localAddr.toString()); System.out.println("binding to " + localAddr.toString());
if ((err = libzt.bind(fd, localAddr)) < 0) { if ((err = zt.bind(fd, localAddr)) < 0) {
System.out.println("error binding socket to virtual interface"); System.out.println("error binding socket to virtual interface");
return; return;
} }
rxBuffer = new byte[100]; rxBuffer = new byte[100];
remoteAddr = new ZTSocketAddress("-1.-1.-1.-1", 0); remoteAddr = new ZTSocketAddress("-1.-1.-1.-1", 0);
while(true) {
addr = new ZTSocketAddress(); // select() loop
r = libzt.recvfrom(fd, rxBuffer, rxBuffer.length, flags, remoteAddr); ZTFDSet master_set = new ZTFDSet();
System.out.println("read (" + r + ") bytes from " + remoteAddr.toString() + ", buffer = " + new String(rxBuffer)); 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, rxBuffer.length, 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, rxBuffer.length, flags, remoteAddr);
System.out.println("read (" + r + ") bytes from " + remoteAddr.toString() + ", buffer = " + new String(rxBuffer));
}
} }
} }
} }
libzt.close(client_fd); zt.close(client_fd);
libzt.close(fd); zt.close(fd);
} }
}).start(); }).start();

28
examples/java/zerotier/ZTFD.java → examples/java/com/zerotier/libzt/ZTFDSet.java
View File

@@ -24,9 +24,31 @@
* of your own application. * of your own application.
*/ */
package zerotier; package com.zerotier.libzt;
public class fd_set public class ZTFDSet
{ {
byte[] fds_bits[1024 / 8]; 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;
}
}
} }

17
examples/java/zerotier/ZTSocketAddress.java → examples/java/com/zerotier/libzt/ZTSocketAddress.java
View File

@@ -24,9 +24,11 @@
* of your own application. * of your own application.
*/ */
package zerotier; package com.zerotier.libzt;
import java.net.*; import com.zerotier.libzt.ZeroTier;
import java.net.InetAddress;
// Designed to transport address information across the JNI boundary // Designed to transport address information across the JNI boundary
public class ZTSocketAddress public class ZTSocketAddress
@@ -34,9 +36,6 @@ public class ZTSocketAddress
public byte[] _ip6 = new byte[16]; public byte[] _ip6 = new byte[16];
public byte[] _ip4 = new byte[4]; public byte[] _ip4 = new byte[4];
public long _ipdata;
public long _ipdata_ext;
public int _family; public int _family;
public int _port; // Also reused for netmask or prefix public int _port; // Also reused for netmask or prefix
@@ -45,7 +44,7 @@ public class ZTSocketAddress
public ZTSocketAddress(String ipStr, int port) public ZTSocketAddress(String ipStr, int port)
{ {
if(ipStr.contains(":")) { if(ipStr.contains(":")) {
_family = zerotier.ZeroTier.AF_INET6; _family = ZeroTier.AF_INET6;
try { try {
InetAddress ip = InetAddress.getByName(ipStr); InetAddress ip = InetAddress.getByName(ipStr);
_ip6 = ip.getAddress(); _ip6 = ip.getAddress();
@@ -53,7 +52,7 @@ public class ZTSocketAddress
catch (Exception e) { } catch (Exception e) { }
} }
else if(ipStr.contains(".")) { else if(ipStr.contains(".")) {
_family = zerotier.ZeroTier.AF_INET; _family = ZeroTier.AF_INET;
try { try {
InetAddress ip = InetAddress.getByName(ipStr); InetAddress ip = InetAddress.getByName(ipStr);
_ip4 = ip.getAddress(); _ip4 = ip.getAddress();
@@ -69,7 +68,7 @@ public class ZTSocketAddress
private String ipString() private String ipString()
{ {
if (_family == zerotier.ZeroTier.AF_INET) { if (_family == ZeroTier.AF_INET) {
try { try {
InetAddress inet = InetAddress.getByAddress(_ip4); InetAddress inet = InetAddress.getByAddress(_ip4);
return "" + inet.getHostAddress(); return "" + inet.getHostAddress();
@@ -77,7 +76,7 @@ public class ZTSocketAddress
System.out.println(e); System.out.println(e);
} }
} }
if (_family == zerotier.ZeroTier.AF_INET6) { if (_family == ZeroTier.AF_INET6) {
try { try {
InetAddress inet = InetAddress.getByAddress(_ip6); InetAddress inet = InetAddress.getByAddress(_ip6);
return "" + inet.getHostAddress(); return "" + inet.getHostAddress();

3
examples/java/zerotier/ZeroTier.java → examples/java/com/zerotier/libzt/ZeroTier.java
View File

@@ -24,7 +24,7 @@
* of your own application. * of your own application.
*/ */
package zerotier; package com.zerotier.libzt;
import java.net.*; import java.net.*;
@@ -78,4 +78,5 @@ public class ZeroTier {
public native boolean getsockname(int fd, ZTSocketAddress addr); public native boolean getsockname(int fd, ZTSocketAddress addr);
public native int getpeername(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 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);
} }

BIN
examples/java/libzt.jar
View File

Binary file not shown.