update JNI code for 1.1.6
This commit is contained in:
parent
2d7c58540f
commit
be0af135bc
7 changed files with 4 additions and 170 deletions
|
@ -1,53 +0,0 @@
|
|||
/*
|
||||
* ZeroTier One - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||
*
|
||||
* 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/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||
*
|
||||
* If you would like to embed ZeroTier into a commercial application or
|
||||
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||
* LLC. Start here: http://www.zerotier.com/
|
||||
*/
|
||||
package com.zerotier.sdk;
|
||||
|
||||
|
||||
public final class MulticastGroup {
|
||||
private MulticastGroup() {}
|
||||
|
||||
private long mac;
|
||||
private long adi;
|
||||
|
||||
public boolean equals(MulticastGroup other) {
|
||||
return mac == other.mac && adi == other.adi;
|
||||
}
|
||||
|
||||
/**
|
||||
* MAC address (least significant 48 bits)
|
||||
*/
|
||||
public final long getMacAddress() {
|
||||
return mac;
|
||||
}
|
||||
|
||||
/**
|
||||
* Additional distinguishing information (usually zero)
|
||||
*/
|
||||
public final long getAdi() {
|
||||
return adi;
|
||||
}
|
||||
}
|
|
@ -33,5 +33,4 @@ public final class Version {
|
|||
public int major = 0;
|
||||
public int minor = 0;
|
||||
public int revision = 0;
|
||||
public long featureFlags = 0;
|
||||
}
|
|
@ -49,7 +49,6 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
|
|||
private int portError;
|
||||
private boolean enabled;
|
||||
private long netconfRevision;
|
||||
private MulticastGroup[] multicastSubscriptions;
|
||||
private InetSocketAddress[] assignedAddresses;
|
||||
|
||||
private VirtualNetworkConfig() {
|
||||
|
@ -167,13 +166,6 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
|
|||
return portError;
|
||||
}
|
||||
|
||||
/**
|
||||
* Is this network enabled? If not, all frames to/from are dropped.
|
||||
*/
|
||||
public final boolean isEnabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Network config revision as reported by netconf master
|
||||
*
|
||||
|
@ -183,13 +175,6 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
|
|||
return netconfRevision;
|
||||
}
|
||||
|
||||
/**
|
||||
* Multicast group subscriptions
|
||||
*/
|
||||
public final MulticastGroup[] multicastSubscriptions() {
|
||||
return multicastSubscriptions;
|
||||
}
|
||||
|
||||
/**
|
||||
* ZeroTier-assigned addresses (in {@link java.net.InetSocketAddress} objects)
|
||||
*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue