dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to InetSockAddress instead of InetAddress so we can send the port # to java as well

Browse source
This commit is contained in:
Grant Limberg 2015-04-27 17:48:37 -07:00
parent 73d68c0c98
commit d1ed269537
10 changed files with 98 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
java/src/com/zerotierone/sdk/VirtualNetworkConfig.java
View file

@ -29,7 +29,7 @@ package com.zerotierone.sdk;
import java.lang.String;
import java.util.ArrayList;
import java.net.InetAddress;
import java.net.InetSocketAddress;
public final class VirtualNetworkConfig {
public static final int MAX_MULTICAST_SUBSCRIPTIONS = 4096;
@ -48,7 +48,7 @@ public final class VirtualNetworkConfig {
private boolean enabled;
private long netconfRevision;
private ArrayList<MulticastGroup> multicastSubscriptions;
private ArrayList<InetAddress> assignedAddresses;
private ArrayList<InetSocketAddress> assignedAddresses;
private VirtualNetworkConfig() {
@ -155,7 +155,7 @@ public final class VirtualNetworkConfig {
}
/**
* ZeroTier-assigned addresses (in {@link java.net.InetAddress} objects)
* ZeroTier-assigned addresses (in {@link java.net.InetSocketAddress} objects)
*
* For IP, the port number of the sockaddr_XX structure contains the number
* of bits in the address netmask. Only the IP address and port are used.
@ -164,7 +164,7 @@ public final class VirtualNetworkConfig {
* This is only used for ZeroTier-managed address assignments sent by the
* virtual network's configuration master.
*/
public final ArrayList<InetAddress> assignedAddresses() {
public final ArrayList<InetSocketAddress> assignedAddresses() {
return assignedAddresses;
}
}