mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 12:33:44 +02:00
simplify loadLibrary
This commit is contained in:
parent
0aa4a4ba7a
commit
7f996ea6d5
2 changed files with 3 additions and 117 deletions
|
@ -1,93 +0,0 @@
|
||||||
package com.zerotier.sdk;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simple library class for working with JNI (Java Native Interface)
|
|
||||||
*
|
|
||||||
* @see http://adamheinrich.com/2012/how-to-load-native-jni-library-from-jar
|
|
||||||
*
|
|
||||||
* @author Adam Heirnich <adam@adamh.cz>, http://www.adamh.cz
|
|
||||||
*/
|
|
||||||
public class NativeUtils {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Private constructor - this class will never be instanced
|
|
||||||
*/
|
|
||||||
private NativeUtils() {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads library from current JAR archive
|
|
||||||
*
|
|
||||||
* The file from JAR is copied into system temporary directory and then loaded. The temporary file is deleted after exiting.
|
|
||||||
* Method uses String as filename because the pathname is "abstract", not system-dependent.
|
|
||||||
*
|
|
||||||
* @param filename The filename inside JAR as absolute path (beginning with '/'), e.g. /package/File.ext
|
|
||||||
* @throws IOException If temporary file creation or read/write operation fails
|
|
||||||
* @throws IllegalArgumentException If source file (param path) does not exist
|
|
||||||
* @throws IllegalArgumentException If the path is not absolute or if the filename is shorter than three characters (restriction of {@see File#createTempFile(java.lang.String, java.lang.String)}).
|
|
||||||
*/
|
|
||||||
public static void loadLibraryFromJar(String path) throws IOException {
|
|
||||||
|
|
||||||
if (!path.startsWith("/")) {
|
|
||||||
throw new IllegalArgumentException("The path has to be absolute (start with '/').");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Obtain filename from path
|
|
||||||
String[] parts = path.split("/");
|
|
||||||
String filename = (parts.length > 1) ? parts[parts.length - 1] : null;
|
|
||||||
|
|
||||||
// Split filename to prefix and suffix (extension)
|
|
||||||
String prefix = "";
|
|
||||||
String suffix = null;
|
|
||||||
if (filename != null) {
|
|
||||||
parts = filename.split("\\.", 2);
|
|
||||||
prefix = parts[0];
|
|
||||||
suffix = (parts.length > 1) ? "."+parts[parts.length - 1] : null; // Thanks, davs! :-)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if the filename is okay
|
|
||||||
if (filename == null || prefix.length() < 3) {
|
|
||||||
throw new IllegalArgumentException("The filename has to be at least 3 characters long.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prepare temporary file
|
|
||||||
File temp = File.createTempFile(prefix, suffix);
|
|
||||||
temp.deleteOnExit();
|
|
||||||
|
|
||||||
if (!temp.exists()) {
|
|
||||||
throw new FileNotFoundException("File " + temp.getAbsolutePath() + " does not exist.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prepare buffer for data copying
|
|
||||||
byte[] buffer = new byte[1024];
|
|
||||||
int readBytes;
|
|
||||||
|
|
||||||
// Open and check input stream
|
|
||||||
InputStream is = NativeUtils.class.getResourceAsStream(path);
|
|
||||||
if (is == null) {
|
|
||||||
throw new FileNotFoundException("File " + path + " was not found inside JAR.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open output stream and copy data between source file in JAR and the temporary file
|
|
||||||
OutputStream os = new FileOutputStream(temp);
|
|
||||||
try {
|
|
||||||
while ((readBytes = is.read(buffer)) != -1) {
|
|
||||||
os.write(buffer, 0, readBytes);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
// If read/write fails, close streams safely before throwing an exception
|
|
||||||
os.close();
|
|
||||||
is.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, load the library
|
|
||||||
System.load(temp.getAbsolutePath());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -28,35 +28,14 @@
|
||||||
package com.zerotier.sdk;
|
package com.zerotier.sdk;
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A ZeroTier One node
|
* A ZeroTier One node
|
||||||
*/
|
*/
|
||||||
public class Node {
|
public class Node {
|
||||||
static {
|
static {
|
||||||
try {
|
System.loadLibrary("ZeroTierOneJNI");
|
||||||
System.loadLibrary("ZeroTierOneJNI");
|
}
|
||||||
} catch (UnsatisfiedLinkError e) {
|
|
||||||
try {
|
|
||||||
if(System.getProperty("os.name").startsWith("Windows")) {
|
|
||||||
System.out.println("Arch: " + System.getProperty("sun.arch.data.model"));
|
|
||||||
if(System.getProperty("sun.arch.data.model").equals("64")) {
|
|
||||||
NativeUtils.loadLibraryFromJar("/lib/ZeroTierOneJNI_win64.dll");
|
|
||||||
} else {
|
|
||||||
NativeUtils.loadLibraryFromJar("/lib/ZeroTierOneJNI_win32.dll");
|
|
||||||
}
|
|
||||||
} else if(System.getProperty("os.name").startsWith("Mac")) {
|
|
||||||
NativeUtils.loadLibraryFromJar("/lib/libZeroTierOneJNI.jnilib");
|
|
||||||
} else {
|
|
||||||
// TODO: Linux
|
|
||||||
}
|
|
||||||
} catch (IOException ioe) {
|
|
||||||
ioe.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final String TAG = "NODE";
|
private static final String TAG = "NODE";
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue