Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

2 files changed, 1 insertions, 56 deletions

diff --git a/java/src/com/zerotier/sdk/VirtualNetworkRoute.java b/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
index 32376cb9..738c4158 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
@@ -29,7 +29,7 @@ package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 
-public class VirtualNetworkRoute
+public final class VirtualNetworkRoute
 {
 	private VirtualNetworkRoute() {}
 
diff --git a/java/src/com/zerotier/sdk/VirtualnetworkRoute.java b/java/src/com/zerotier/sdk/VirtualnetworkRoute.java
deleted file mode 100644
index 32376cb9..00000000
--- a/java/src/com/zerotier/sdk/VirtualnetworkRoute.java
+++ /dev/null
@@ -1,55 +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;
-
-import java.net.InetSocketAddress;
-
-public class VirtualNetworkRoute
-{
-	private VirtualNetworkRoute() {}
-
-	/**
-	 * Target network / netmask bits (in port field) or NULL or 0.0.0.0/0 for default
-	 */
-	public InetSocketAddress target;
-
-	/**
-	 * Gateway IP address (port ignored) or NULL (family == 0) for LAN-local (no gateway)
-	 */
-	public InetSocketAddress via;
-
-	/**
-	 * Route flags
-	 */
-	public int flags;
-
-	/**
-	 * Route metric (not currently used)
-	 */
-	public int metric;
-}