From 6832ae589dea7f2ec0a35e326e6438d6d0e8a601 Mon Sep 17 00:00:00 2001
From: angryziber <angryziber@375186e5-ef17-0410-b0b6-91563547dcda>
Date: Tue, 24 Jul 2007 21:33:44 +0000
Subject: [PATCH] * WindowsPinger now works * LibraryLoader class introduced:
 now used by RawSocket and WindowsPinger * JNI libraries are now always loaded
 from the classpath (or the jar file): lib dirs added to the classpath in
 eclipse project

git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@176 375186e5-ef17-0410-b0b6-91563547dcda
---
 .classpath                                    |  11 +-
 .settings/org.eclipse.core.runtime.prefs      |   3 +-
 build.xml                                     |   5 +-
 ext/rocksaw/lib/tmp.jar                       | Bin 349 -> 0 bytes
 .../org/savarese/rocksaw/net/RawSocket.java   |  45 +-------
 ext/winping/jni/WindowsPinger.c               |  93 ----------------
 ext/winping/lib/winping.dll                   | Bin 0 -> 24064 bytes
 ext/winping/{jni => src}/Makefile             |  13 ++-
 ext/winping/src/WindowsPinger.c               | 103 ++++++++++++++++++
 ext/winping/{jni => src}/WindowsPinger.h      |   9 ++
 resources/Labels.txt                          |   1 +
 src/net/azib/ipscan/core/LibraryLoader.java   |  64 +++++++++++
 src/net/azib/ipscan/core/net/ICMPPinger.java  |   2 +-
 .../ipscan/core/net/PingerRegistryImpl.java   |   7 +-
 .../azib/ipscan/core/net/WindowsPinger.java   |  43 ++++++--
 15 files changed, 242 insertions(+), 157 deletions(-)
 delete mode 100755 ext/rocksaw/lib/tmp.jar
 delete mode 100755 ext/winping/jni/WindowsPinger.c
 create mode 100644 ext/winping/lib/winping.dll
 rename ext/winping/{jni => src}/Makefile (65%)
 create mode 100755 ext/winping/src/WindowsPinger.c
 rename ext/winping/{jni => src}/WindowsPinger.h (82%)
 create mode 100644 src/net/azib/ipscan/core/LibraryLoader.java

diff --git a/.classpath b/.classpath
index 72e90083..184317e4 100755
--- a/.classpath
+++ b/.classpath
@@ -5,17 +5,14 @@
 	<classpathentry kind="src" path="ext/rocksaw/src/java"/>
 	<classpathentry kind="src" path="ext/vserv-tcpip/src/java"/>
 	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="src" path="ext/rocksaw/lib"/>
+	<classpathentry kind="src" path="ext/winping/lib"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="ext/rocksaw/lib/tmp.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="ipscan/ext/rocksaw/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="ext/picocontainer/picocontainer-1.0.jar"/>
 	<classpathentry kind="lib" path="ext/swt/swt-linux.jar" sourcepath="ext/swt/src-linux"/>
-	<classpathentry kind="lib" path="ext/swt/swt-mac.jar" sourcepath="ext/swt/src-mac"/>
 	<classpathentry kind="lib" path="ext/swt/swt-win32.jar" sourcepath="ext/swt/src-win32"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="ext/swt/swt-mac.jar" sourcepath="ext/swt/src-mac"/>
 	<classpathentry kind="lib" path="ext/easymock/easymock.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs
index d321418f..03c92a61 100644
--- a/.settings/org.eclipse.core.runtime.prefs
+++ b/.settings/org.eclipse.core.runtime.prefs
@@ -1,3 +1,4 @@
-#Thu Jan 04 10:25:32 EET 2007
+#Tue Jul 24 22:19:33 EEST 2007
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 line.separator=\n
diff --git a/build.xml b/build.xml
index 97dab312..21eca2be 100755
--- a/build.xml
+++ b/build.xml
@@ -125,7 +125,8 @@
 			<mkdir dir="${bin}.@{platform}"/>			
 			<unzip src="${ext}/picocontainer/picocontainer-1.0.jar" dest="${bin}"/>
 			<unzip src="${swt}/swt-@{platform}.jar" dest="${bin}.@{platform}"/>
-			<copy file="${ext}/rocksaw/lib/@{librocksaw}" todir="${bin}.@{platform}"/>
+			<copy file="${ext}/rocksaw/lib/@{librocksaw}" todir="${bin}.@{platform}"/>
+			<copy file="${ext}/winping/lib/winping.dll" todir="${bin}.win32"/>
 			<delete includeemptydirs="true" failonerror="false">
 				<fileset dir="${bin}/META-INF"/>
 				<fileset dir="${bin}/images" includes="**/*.svg"/>
@@ -198,7 +199,7 @@
 	</target>
 
 	<target name="package-win32">
-		<package-for platform="win32" librocksaw="rocksaw.dll"/>
+		<package-for platform="win32" librocksaw="rocksaw.dll"/>
 	</target>
 
 	<target name="package-mac">
diff --git a/ext/rocksaw/lib/tmp.jar b/ext/rocksaw/lib/tmp.jar
deleted file mode 100755
index a21876420c616e80608f67f9a9fe7e780c9ca024..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmWIWW@h1H00H0f+eTmpl;C7wVeoYgan$wnbJPEKih&^jt~7S1uJJBEpFVG(QV<ql
z5Jf2Ub@cOea}5sB^K}ai;bdSAG*WkV0pidK7KSg3Ul@H8^D@&?i%WFFQj3Z+^Yg3}
z4D}3nxtxnq6H8K4be$?e0w#J!@dg&UNe0FW8o{M`3ci`iMft^*#U-h^#R{Hz$$FZ+
zT)bQX-i%Bl%($Ho@reM#TSpKJ%`=Ql;!v%a-r)u7WCW58joQdsQ9Q>A@my#HC~R2S
PKzf*funS1<1#uVvFx^C7

diff --git a/ext/rocksaw/src/java/org/savarese/rocksaw/net/RawSocket.java b/ext/rocksaw/src/java/org/savarese/rocksaw/net/RawSocket.java
index 7da14268..3c57ed05 100755
--- a/ext/rocksaw/src/java/org/savarese/rocksaw/net/RawSocket.java
+++ b/ext/rocksaw/src/java/org/savarese/rocksaw/net/RawSocket.java
@@ -19,14 +19,13 @@
 
 package org.savarese.rocksaw.net;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.SocketException;
 
+import net.azib.ipscan.core.LibraryLoader;
+
 /**
  * <p>The RawSocket class provides a strictly utilitarian API for
  * performing I/O with raw sockets.  The API is currently crude, but
@@ -79,8 +78,8 @@ public class RawSocket {
   native static void __RockSawShutdown();
 
   static {
-	// modified to reuse SWT's loading of jni libs from jar file
-    loadLibrary("rocksaw");
+	// modified to load jni libs from jar file
+    LibraryLoader.loadLibrary("rocksaw");
     
     if(__RockSawStartup() != 0)
       throw new UnsatisfiedLinkError(__getErrorMessage());
@@ -151,41 +150,7 @@ public class RawSocket {
       setUseSelectTimeout(false);
   }
 
-
-  private static void loadLibrary(String library) {
-	String filename = System.mapLibraryName(library);
-	String fullFilename = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + filename;
-	try {
-	  System.load(fullFilename);
-	}
-	catch (UnsatisfiedLinkError e) {
-		try {
-			// try to extract
-			InputStream is = RawSocket.class.getClassLoader().getResourceAsStream(filename);
-			byte[] buffer = new byte[4096];
-			OutputStream os = new FileOutputStream(fullFilename);
-			int read;
-			while ((read = is.read(buffer)) != -1) {
-				os.write(buffer, 0, read);
-			}
-			os.close();
-			is.close();
-			if (!net.azib.ipscan.config.Platform.WINDOWS) {
-				// TODO: change this to new File(fullFilename).setExecutable(true) in case of Java 1.6
-				try {
-					Runtime.getRuntime ().exec (new String []{"chmod", "755", fullFilename}).waitFor();
-				} catch (Throwable t) {}
-			}
-			System.load(fullFilename);
-		}
-		catch (IOException ioe) {
-			throw new RuntimeException("Unable to extract native library: " + library, ioe);
-		}
-	}
-	
-  }
-
-/**
+  /**
    * Tests if the socket has been opened.
    *
    * @return True if the socket is open.
diff --git a/ext/winping/jni/WindowsPinger.c b/ext/winping/jni/WindowsPinger.c
deleted file mode 100755
index 80f7eaea..00000000
--- a/ext/winping/jni/WindowsPinger.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2007 Anton Keks
- */
-
-#include <windows.h>
-
-#include "WindowsPinger.h"
-
-FARPROC IcmpCreateFile;
-
-typedef BOOL (FAR WINAPI *TIcmpCloseHandle)(HANDLE IcmpHandle);
-TIcmpCloseHandle IcmpCloseHandle;
-
-typedef DWORD (FAR WINAPI *TIcmpSendEcho)(
-  HANDLE IcmpHandle, 	/* handle returned from IcmpCreateFile() */
-  u_long DestAddress, /* destination IP address (in network order) */
-  LPVOID RequestData, /* pointer to buffer to send */
-  WORD RequestSize,	/* length of data in buffer */
-  LPIPINFO RequestOptns,  /* see Note 2 */
-  LPVOID ReplyBuffer, /* see Note 1 */
-  DWORD ReplySize, 	/* length of reply (must allow at least 1 reply) */
-  DWORD Timeout 	/* time in milliseconds to wait for reply */
-);
-TIcmpSendEcho IcmpSendEcho;
-
-/*
- * Class:     net_azib_ipscan_core_net_WindowsPinger
- * Method:    nativeIcmpCreateFile
- */
-JNIEXPORT jint JNICALL
-Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCreateFile
-(JNIEnv *env, jclass cls)
-{
-  HMODULE hICMP = LoadLibrary("icmp.dll");
-  if (!hICMP) {
-    // newer versions of Windows should include this one instead
-    hICMP = LoadLibrary("iphlpapi.dll");
-  }
-  if (!hICMP) {
-    return -1;
-  }
-  IcmpCreateFile  = (FARPROC)GetProcAddress(hICMP, "IcmpCreateFile");
-  IcmpCloseHandle = (TIcmpCloseHandle)GetProcAddress(hICMP, "IcmpCloseHandle");
-  IcmpSendEcho    = (TIcmpSendEcho)GetProcAddress(hICMP, "IcmpSendEcho");
-  
-  return IcmpCreateFile();
-}
-
-/*
- * Class:     net_azib_ipscan_core_net_WindowsPinger
- * Method:    nativeIcmpCloseHandle
- */
-JNIEXPORT jint JNICALL
-Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCloseHandle
-(JNIEnv *env, jclass cls, jint handle)
-{
-  return IcmpCloseHandle(handle);
-}
-
-/*
- * Class:     net_azib_ipscan_core_net_WindowsPinger
- * Method:    nativeIcmpSendEcho
- */
-JNIEXPORT jint JNICALL
-Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpSendEcho
-(JNIEnv *env, jclass cls, jint handle,
- jbyteArray address, jbyteArray pingData, jbyteArray replyData, jint timeout)
-{
-  DWORD replyCount;
-  IPINFO IPInfo;
-  jbyte *addrBuf, *pingDataBuf, replyDataBuf;
-  jclass replyClass;
-  jfieldID fid;
-  
-  IPInfo.Ttl = 128;
-  IPInfo.Tos = 0;
-  IPInfo.Flags = 0;
-  IPInfo.OptionsSize = 0;
-  IPInfo.OptionsData = NULL;
-  
-  addrBuf = env->GetByteArrayElements(env, address, NULL);
-  pingDataBuf = env->GetByteArrayElements(env, pingData, NULL);
-  replyDataBuf = env->GetByteArrayElements(env, replyData, NULL);
-  
-  replyCount = IcmpSendEcho(handle, (DWORD)*addrBuf, pingDataBuf, env->GetArrayLength(pingData) * sizeof(jbyte),
-                           &IPInfo, replyDataBuf, env->GetArrayLength(replyData), timeout);
-                            
-  env->ReleaseByteArrayElements(env, address, addrBuf, JNI_ABORT);
-  env->ReleaseByteArrayElements(env, pingData, pingDataBuf, JNI_ABORT);
-  env->ReleaseByteArrayElements(env, replyData, replyDataBuf, NULL);
-  
-  return replyCount;
-}
diff --git a/ext/winping/lib/winping.dll b/ext/winping/lib/winping.dll
new file mode 100644
index 0000000000000000000000000000000000000000..0ecd2c5781ee8db98925b586a335ed63caf6f707
GIT binary patch
literal 24064
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
DQL!v&

literal 0
HcmV?d00001

diff --git a/ext/winping/jni/Makefile b/ext/winping/src/Makefile
similarity index 65%
rename from ext/winping/jni/Makefile
rename to ext/winping/src/Makefile
index c77c3aaa..8bebe695 100755
--- a/ext/winping/jni/Makefile
+++ b/ext/winping/src/Makefile
@@ -1,8 +1,13 @@
 #
+# This file is a part of Angry IP Scanner source code,
+# see http://www.azib.net/ for more information.
+# Licensed under GPLv2.
+#
 # Windows JNI pinger using Microsoft's ICMP.DLL
+# Author: Anton Keks 
 #
-# Copyright 2007 Anton Keks
-#
+
+DEST = ..\lib
 
 JAVA_INCDIR      = $(JDK_HOME)\include
 JAVA_INCDIR_PLAF = $(JAVA_INCDIR)\win32
@@ -22,10 +27,10 @@ CLEAN_EXTENSIONS = *.obj *.$(LIBEXTENSION) *.lib *.exp
 all: $(LIBWINPING)
 
 .c.obj:
-	$(CC) -nologo $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+	$(CC) -nologo $(CFLAGS) $(CPPFLAGS) -c $< -o $(DEST)\$@
 
 $(LIBWINPING): $(OBJ)
-	$(CC) -nologo -MD -LD -o $@ $** 
+	$(CC) -nologo -MD -LD -o $(DEST)\$@ $** 
 
 clean:
 	del $(CLEAN_EXTENSIONS)
diff --git a/ext/winping/src/WindowsPinger.c b/ext/winping/src/WindowsPinger.c
new file mode 100755
index 00000000..b43c097b
--- /dev/null
+++ b/ext/winping/src/WindowsPinger.c
@@ -0,0 +1,103 @@
+/* 
+ * This file is a part of Angry IP Scanner source code,
+ * see http://www.azib.net/ for more information.
+ * Licensed under GPLv2.
+ *
+ * Windows JNI pinger using Microsoft's ICMP.DLL
+ * Author: Anton Keks 
+ */
+
+#include <windows.h>
+
+#include "WindowsPinger.h"
+
+
+FARPROC IcmpCreateFile = NULL;
+
+typedef BOOL (FAR WINAPI *TIcmpCloseHandle)(HANDLE IcmpHandle);
+TIcmpCloseHandle IcmpCloseHandle = NULL;
+
+typedef DWORD (FAR WINAPI *TIcmpSendEcho)(
+  HANDLE IcmpHandle, 	/* handle returned from IcmpCreateFile() */  
+  u_long DestAddress, /* destination IP address (in network order) */  
+  LPVOID RequestData, /* pointer to buffer to send */  
+  WORD RequestSize,	/* length of data in buffer */  
+  LPVOID RequestOptns,  /* see Note 2 */  
+  LPVOID ReplyBuffer, /* see Note 1 */  
+  DWORD ReplySize, 	/* length of reply (must allow at least 1 reply) */  
+  DWORD Timeout 	/* time in milliseconds to wait for reply */
+);
+TIcmpSendEcho IcmpSendEcho = NULL;
+
+/* 
+ * Class:     net_azib_ipscan_core_net_WindowsPinger
+ * Method:    nativeIcmpCreateFile
+ */
+JNIEXPORT jint JNICALL
+Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCreateFile
+(JNIEnv *env, jclass cls)
+{  
+  // Initialize dlls on first use
+  if (IcmpCreateFile == NULL) {
+    HMODULE hICMP = LoadLibrary("icmp.dll");
+    if (!hICMP) {
+      // newer versions of Windows should include this one instead
+      hICMP = LoadLibrary("iphlpapi.dll");
+    }
+
+    if (!hICMP) {
+      return -1;
+    }
+
+    IcmpCreateFile  = (FARPROC) GetProcAddress(hICMP, "IcmpCreateFile");
+    IcmpCloseHandle = (TIcmpCloseHandle) GetProcAddress(hICMP, "IcmpCloseHandle");
+    IcmpSendEcho    = (TIcmpSendEcho) GetProcAddress(hICMP, "IcmpSendEcho");
+  }
+
+  return IcmpCreateFile();
+}
+
+/*
+ * Class:     net_azib_ipscan_core_net_WindowsPinger
+ * Method:    nativeIcmpCloseHandle
+ */
+JNIEXPORT void JNICALL
+Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCloseHandle
+(JNIEnv *env, jclass cls, jint handle)
+{
+  return IcmpCloseHandle((HANDLE)handle);
+}
+
+/*
+ * Class:     net_azib_ipscan_core_net_WindowsPinger
+ * Method:    nativeIcmpSendEcho
+ */
+
+JNIEXPORT jint JNICALL
+Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpSendEcho
+(JNIEnv *env, jclass cls, jint handle, jbyteArray address, jbyteArray pingData, jbyteArray replyData, jint timeout)
+{
+  DWORD replyCount;
+  jbyte *addrBuf, *pingDataBuf, *replyDataBuf;
+  jint pingDataLen, replyDataLen;
+  jclass replyClass;
+  jfieldID fid;
+  u_long ip;
+
+  addrBuf = (*env)->GetByteArrayElements(env, address, NULL);
+  pingDataBuf = (*env)->GetByteArrayElements(env, pingData, NULL);
+  replyDataBuf = (*env)->GetByteArrayElements(env, replyData, NULL);
+
+  pingDataLen = (*env)->GetArrayLength(env, pingData);
+  replyDataLen = (*env)->GetArrayLength(env, replyData);
+
+  ip = *((u_long*)addrBuf);
+  replyCount = IcmpSendEcho((HANDLE)handle, ip, pingDataBuf, pingDataLen,
+                            NULL, replyDataBuf, replyDataLen, timeout);
+                            
+  (*env)->ReleaseByteArrayElements(env, address, addrBuf, JNI_ABORT);
+  (*env)->ReleaseByteArrayElements(env, pingData, pingDataBuf, JNI_ABORT);
+  (*env)->ReleaseByteArrayElements(env, replyData, replyDataBuf, 0);
+  
+  return replyCount;
+}
diff --git a/ext/winping/jni/WindowsPinger.h b/ext/winping/src/WindowsPinger.h
similarity index 82%
rename from ext/winping/jni/WindowsPinger.h
rename to ext/winping/src/WindowsPinger.h
index a920f8af..6925c333 100644
--- a/ext/winping/jni/WindowsPinger.h
+++ b/ext/winping/src/WindowsPinger.h
@@ -1,3 +1,12 @@
+/*
+ * This file is a part of Angry IP Scanner source code,
+ * see http://www.azib.net/ for more information.
+ * Licensed under GPLv2.
+ *
+ * Windows JNI pinger using Microsoft's ICMP.DLL
+ * Author: Anton Keks 
+ */
+
 #include <jni.h>
 /* Header for class net_azib_ipscan_core_net_WindowsPinger */
 
diff --git a/resources/Labels.txt b/resources/Labels.txt
index 64db1133..b7ac351d 100755
--- a/resources/Labels.txt
+++ b/resources/Labels.txt
@@ -134,6 +134,7 @@ list.alive.img=images/list/alive.png
 list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
+pinger.windows=Windows ICMP.DLL
 pinger.udp=UDP packet
 pinger.tcp=TCP port probe
 opener.web=Web Browser
diff --git a/src/net/azib/ipscan/core/LibraryLoader.java b/src/net/azib/ipscan/core/LibraryLoader.java
new file mode 100644
index 00000000..ae9e72e9
--- /dev/null
+++ b/src/net/azib/ipscan/core/LibraryLoader.java
@@ -0,0 +1,64 @@
+/**
+ * This file is a part of Angry IP Scanner source code,
+ * see http://www.azib.net/ for more information.
+ * Licensed under GPLv2.
+ */
+
+package net.azib.ipscan.core;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Utility class for loading of JNI libraries from jar files.
+ * 
+ * @author Anton Keks
+ */
+public class LibraryLoader {
+	
+	/**
+	 * Loads native library from the jar file (storing it in the temp dir)
+	 * @param library JNI library name
+	 */
+	public static void loadLibrary(String library) {		
+		String filename = System.mapLibraryName(library);
+		String fullFilename = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + filename;
+		try {
+			// try to load from the temp dir (in case it is already there)
+			System.load(fullFilename);
+		}
+		catch (UnsatisfiedLinkError err2) {
+			try {
+				// try to extract from the jar
+				InputStream is = LibraryLoader.class.getClassLoader().getResourceAsStream(filename);
+				if (is == null) {
+					throw new IOException(filename + " not found in the jar file (classpath)");
+				}
+				byte[] buffer = new byte[4096];
+				OutputStream os = new FileOutputStream(fullFilename);
+				int read;
+				while ((read = is.read(buffer)) != -1) {
+					os.write(buffer, 0, read);
+				}
+				os.close();
+				is.close();
+				if (!net.azib.ipscan.config.Platform.WINDOWS) {
+					// TODO: change this to new File(fullFilename).setExecutable(true) in case of
+					// Java 1.6
+					try {
+						Runtime.getRuntime().exec(new String[] { "chmod", "755", fullFilename }).waitFor();
+					}
+					catch (Throwable t) {
+					}
+				}
+				System.load(fullFilename);
+			}
+			catch (IOException ioe) {
+				throw new RuntimeException("Unable to extract native library: " + library, ioe);
+			}
+		}
+	}
+
+}
diff --git a/src/net/azib/ipscan/core/net/ICMPPinger.java b/src/net/azib/ipscan/core/net/ICMPPinger.java
index 6e73718d..54cbccc6 100644
--- a/src/net/azib/ipscan/core/net/ICMPPinger.java
+++ b/src/net/azib/ipscan/core/net/ICMPPinger.java
@@ -25,7 +25,7 @@ import org.savarese.vserv.tcpip.OctetConverter;
  */
 public class ICMPPinger implements Pinger {
 	
-	static final Logger LOG = Logger.getLogger(ICMPPinger.class.getName());
+	private static final Logger LOG = Logger.getLogger(ICMPPinger.class.getName());
 
 	private int timeout;
 	
diff --git a/src/net/azib/ipscan/core/net/PingerRegistryImpl.java b/src/net/azib/ipscan/core/net/PingerRegistryImpl.java
index 02dee4c0..09dc6494 100755
--- a/src/net/azib/ipscan/core/net/PingerRegistryImpl.java
+++ b/src/net/azib/ipscan/core/net/PingerRegistryImpl.java
@@ -14,12 +14,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.azib.ipscan.config.GlobalConfig;
+import net.azib.ipscan.config.Platform;
 import net.azib.ipscan.fetchers.FetcherException;
 
 /**
  * PingerRegistryImpl
  *
- * @author Anton Keks Keks
+ * @author Anton Keks
  */
 public class PingerRegistryImpl implements PingerRegistry {
 	
@@ -34,6 +35,10 @@ public class PingerRegistryImpl implements PingerRegistry {
 		this.globalConfig = globalConfig;
 		
 		pingers = new LinkedHashMap<String, Class<? extends Pinger>>();
+		if (Platform.WINDOWS) {
+			// this will be the preferred choice for Windows users
+			pingers.put("pinger.windows", WindowsPinger.class);
+		}
 		pingers.put("pinger.icmp", ICMPSharedPinger.class);
 		pingers.put("pinger.icmp2", ICMPPinger.class);
 		pingers.put("pinger.udp", UDPPinger.class);
diff --git a/src/net/azib/ipscan/core/net/WindowsPinger.java b/src/net/azib/ipscan/core/net/WindowsPinger.java
index d2de107a..09eb0d2e 100644
--- a/src/net/azib/ipscan/core/net/WindowsPinger.java
+++ b/src/net/azib/ipscan/core/net/WindowsPinger.java
@@ -8,10 +8,13 @@ package net.azib.ipscan.core.net;
 import java.io.IOException;
 import java.net.InetAddress;
 
+import net.azib.ipscan.core.LibraryLoader;
+
 /**
  * Windows-only pinger that uses Microsoft's ICMP.DLL for its job.
+ * <p/>
  * This pinger exists to provide adequate pinging to Windows users,
- * because Microsoft has removed raw socket support from consumer
+ * because Microsoft has removed Raw Socket support from consumer
  * versions of Windows since XP SP2.
  * 
  * @author Anton Keks
@@ -19,12 +22,13 @@ import java.net.InetAddress;
 public class WindowsPinger implements Pinger {
 	
 	private int timeout;
+	private boolean libraryLoaded;
 
 	public WindowsPinger(int timeout) {
 		this.timeout = timeout; 
-	}
-
-	public void close() throws IOException {
+		if (!libraryLoaded) {
+		    LibraryLoader.loadLibrary("winping");
+		}
 	}
 
 	public PingResult ping(InetAddress address, int count) throws IOException {
@@ -34,15 +38,22 @@ public class WindowsPinger implements Pinger {
 		byte[] replyData = new byte[56 + 100];
 		
 		int handle = nativeIcmpCreateFile();
+		if (handle < 0) {
+			throw new IOException("Unable to create Windows native ICMP handle");
+		}
+			
 		try {
 
 			// send a bunch of packets
 			for (int i = 1; i <= count; i++) {
 				if (nativeIcmpSendEcho(handle, address.getAddress(), pingData, replyData, timeout) > 0) {
-					/*if (replyData.status == 11000) {
-						result.addReply(replyData.roundTripTime);
-						result.setTTL(replyData.ttl);
-					}*/
+					int status = replyData[4] + (replyData[5]<<8) + (replyData[6]<<16) + (replyData[7]<<24);
+					if (status == 0) {
+						int roundTripTime = replyData[8] + (replyData[9]<<8) + (replyData[10]<<16) + (replyData[11]<<24); 
+						int timeToLive = replyData[20] & 0xFF;
+						result.addReply(roundTripTime);
+						result.setTTL(timeToLive);
+					}
 				}
 			}
 		}
@@ -53,9 +64,25 @@ public class WindowsPinger implements Pinger {
 		return result;
 	}
 	
+	/**
+	 * Wrapper for Microsoft's
+	 * {@linkplain http://msdn2.microsoft.com/en-US/library/aa366045.aspx IcmpCreateFile}
+	 */
 	private native static int nativeIcmpCreateFile();
 
+	/**
+	 * Wrapper for Microsoft's
+	 * {@linkplain http://msdn2.microsoft.com/EN-US/library/aa366050.aspx IcmpSendEcho}
+	 */
 	private native static int nativeIcmpSendEcho(int handle, byte[] address, byte[] pingData, byte[] replyData, int timeout);
 	
+	/**
+	 * Wrapper for Microsoft's IcmpCreateFile:
+	 * {@linkplain http://msdn2.microsoft.com/en-us/library/Aa366043.aspx IcmpCloseHandle}
+	 */
 	private native static void nativeIcmpCloseHandle(int handle);
+
+	public void close() throws IOException {
+		// not needed in this pinger
+	}
 }