pcaprub 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535c4c591e5797f6a4963cf133b0382a078456801918bca13e28afe0b72436b2
-  data.tar.gz: cd18712ab62ecbc51ea710cecedbcf5099922555e6fee5f1e0a3b86a9668264d
+  metadata.gz: 6c07274578544377dda665e39affdcb19979c7497887ce37f807390c3cdb3ff8
+  data.tar.gz: eb637469104d446bacebae7c670e0dea91621bbc27f99e35c9bbeadbe09c78bb
 SHA512:
-  metadata.gz: 58380aee87fe885d6651f4b69934e167166237413dc9790634bd95cd3db13709a7ccb4d3cd89c9db64abc3a04e8f142e29172b7add6d62e82891870d336634e4
-  data.tar.gz: 505f6970e65157340d7bff1f0454ac46fd01dedd64fd00728016713b01e1bafa50cfbba0008324fbbdd65ecf7bc3ed3890f92664865bacf143f51b4f9bc04f19
+  metadata.gz: a816e68c66133672c2e33f2800130fecd3570345dd59bd9da5d068d0b2dee6b64a63bdd32418c327638e978e8120f5b9be30be8ac0e34d51d27badbb4bbf4168
+  data.tar.gz: 5c8b31ca16e5d34dec166fa5cacedb976285b0b7ccf8ddf42d9da1d3c9ab4c30058e6cc7fcb8a53bab9de9bde2c448eb974682bcc7af9e895b9b907071474937

data/ext/pcaprub_c/extconf.rb

@@ -3,6 +3,10 @@ extension_name = 'pcaprub_c'
 
 puts "\n[*] Running checks for #{extension_name} code..."
 puts("platform is #{RUBY_PLATFORM}")
+default_npcap_sdk = 'C:/npcap-sdk'
+default_winpcap_sdk = 'C:/WpdPack'
+# Default to npcap if it exists, otherwise fallback to winpcap
+default_pcap_sdk = File.directory?(default_npcap_sdk) ? default_npcap_sdk : default_winpcap_sdk
 
 if /i386-mingw32/ =~ RUBY_PLATFORM || /x64-mingw32/ =~ RUBY_PLATFORM || /x64-mingw-ucrt/ =~ RUBY_PLATFORM
   unless  have_library("ws2_32" ) and
@@ -14,7 +18,7 @@ if /i386-mingw32/ =~ RUBY_PLATFORM || /x64-mingw32/ =~ RUBY_PLATFORM || /x64-min
     exit
   end
 
-  pcap_dir        = with_config("pcap-dir", "C:/WpdPack")
+  pcap_dir        = with_config("pcap-dir", default_pcap_sdk)
   pcap_includedir = with_config("pcap-includedir", pcap_dir + "/include")
   pcap_libdir     = with_config("pcap-libdir", pcap_dir + "/lib")
 
@@ -28,12 +32,15 @@ if /i386-mingw32/ =~ RUBY_PLATFORM || /x64-mingw32/ =~ RUBY_PLATFORM || /x64-min
   $LDFLAGS += " -g" if with_config("debug")
 
   have_header("ruby/thread.h")
+  if have_header(pcap_includedir + "/Win32-Extensions.h", pcap_includedir + "/pcap.h")
+    append_cflags("-DHAVE_WIN32_EXTENSIONS_H")
+  end
   have_func("rb_thread_blocking_region") # Pre ruby 2.2
   have_func("rb_thread_call_without_gvl") # Post ruby 2.2
   have_library("wpcap", "pcap_open_live")
   have_library("wpcap", "pcap_setnonblock")
 elsif /i386-mswin32/ =~ RUBY_PLATFORM || /x64-mswin32/ =~ RUBY_PLATFORM
-  pcap_dir        = with_config("pcap-dir", "C:\\WpdPack")
+  pcap_dir        = with_config("pcap-dir", default_pcap_sdk)
   pcap_includedir = with_config("pcap-includedir", pcap_dir + "\\include")
   pcap_libdir     = with_config("pcap-libdir", pcap_dir + "\\lib")
 
@@ -46,6 +53,9 @@ elsif /i386-mswin32/ =~ RUBY_PLATFORM || /x64-mswin32/ =~ RUBY_PLATFORM
   $LDFLAGS = "/link /LIBPATH:#{pcap_libdir}"
   $LDFLAGS += " -g" if with_config("debug")
   have_header("ruby/thread.h")
+  if have_header(pcap_includedir + "/Win32-Extensions.h", pcap_includedir + "/pcap.h")
+    append_cflags("-DHAVE_WIN32_EXTENSIONS_H")
+  end
   have_func("rb_thread_blocking_region") # Pre ruby 2.2
   have_func("rb_thread_call_without_gvl") # Post ruby 2.2
 

data/ext/pcaprub_c/pcaprub.c

@@ -9,8 +9,11 @@
 #endif
 
 #include <pcap.h>
+// Win32-Extensions only exist in winpcap not npcap
 #if defined(WIN32)
-#include <Win32-Extensions.h>
+  #ifdef HAVE_WIN32_EXTENSIONS_H
+    #include <Win32-Extensions.h>
+  #endif
 #endif
 
 #if !defined(WIN32)
@@ -407,7 +410,7 @@ rbpcap_setfilter(VALUE self, VALUE filter)
 {
   char eb[PCAP_ERRBUF_SIZE];
   rbpcap_t *rbp;
-  u_int32_t mask = 0, netid = 0;
+  bpf_u_int32 mask = 0, netid = 0;
   struct bpf_program bpf;
 
   Data_Get_Struct(self, rbpcap_t, rbp);
@@ -452,7 +455,7 @@ rbpcap_setfilter(VALUE self, VALUE filter)
 static VALUE
 rbpcap_compile(VALUE self, VALUE filter) {
   struct bpf_program bpf;
-  u_int32_t mask = 0;
+  bpf_u_int32 mask = 0;
   rbpcap_t *rbp;
 
   Data_Get_Struct(self, rbpcap_t, rbp);
@@ -981,7 +984,7 @@ rbpcap_each_data(VALUE self)
   if(! rbpcap_ready(rbp)) return self;
 
 #if defined(WIN32)
-  fno = (int)pcap_getevent(rbp->pd);
+  fno = (HANDLE)pcap_getevent(rbp->pd);
 #else
   fno = pcap_get_selectable_fd(rbp->pd);
 #endif
@@ -1023,7 +1026,7 @@ rbpcap_each_packet(VALUE self)
   if(! rbpcap_ready(rbp)) return self;
 
 #if defined(WIN32)
-  fno = (int)pcap_getevent(rbp->pd);
+  fno = (HANDLE)pcap_getevent(rbp->pd);
 #else
   fno = pcap_get_selectable_fd(rbp->pd);
 #endif
@@ -1241,12 +1244,12 @@ rbpacket_data(VALUE self)
 }
 
 #if defined(WIN32)
-static VALUE
+static void *
 rbpcap_thread_wait_handle_blocking(void *data)
 {
   VALUE result;
   result = (VALUE)WaitForSingleObject(data, 100);
-  return result;
+  return (void *) result;
 }
 
 /*

data/lib/pcaprub/version.rb

@@ -4,7 +4,7 @@ module PCAPRUB #:nodoc:
 
     MAJOR = 0
     MINOR = 13
-    TINY = 2
+    TINY = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/lib/pcaprub.rb

@@ -2,7 +2,31 @@ module PCAPRUB
   $:.unshift(File.dirname(__FILE__))
   require 'pcaprub/common'
   require 'pcaprub/version'
-  require 'pcaprub/ext'
+
+  add_dll_path = proc do |path, &block|
+    if RUBY_PLATFORM =~/(mswin|mingw)/i && path && File.exist?(path)
+      begin
+        require 'ruby_installer/runtime'
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV['PATH']
+        ENV['PATH'] = "#{path};#{old_path}"
+        begin
+          block.call
+        ensure
+          ENV['PATH'] = old_path
+        end
+      end
+    else
+      block.call
+    end
+  end
+
+  npcap_path = "C:\\Windows\\System32\\Npcap"
+  add_dll_path.call(npcap_path) do
+    require 'pcaprub/ext'
+  end
+
 end
 
 #Force Include to allow backwards compatibility to ::PCAP.new

data/test/test_pcaprub_unit.rb

@@ -165,11 +165,12 @@ class Pcap::UnitTest < Test::Unit::TestCase
   def test_lib_version
     v = Pcap.lib_version.split
     if RUBY_PLATFORM =~ /mingw/
-      assert_equal "WinPcap", v[0]
+      winpcap = 'WinPcap' == v[0]
+      npcap = 'Npcap' == v[0]
+      assert winpcap || npcap
     else
       assert_equal "libpcap", v[0]
     end
     assert_equal "version", v[1]
-    assert_equal 3, v[2].split('.').size
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pcaprub
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - shadowbq
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler