pcaprub 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ecc5932a3e21b8c657e9369ffdd9c723e6f7b1
-  data.tar.gz: 99dc681b6bad049acb3d135c6552b777e6d3e93f
+  metadata.gz: 282b1065a65ad397abd040bcdc8fa3b692c2cae0
+  data.tar.gz: df9c6be00a06fd8a1602c59e55d8614a633da93e
 SHA512:
-  metadata.gz: c0e27c627a094b1407a26fe39b3aa9d8008d6c2436f1bd8031eb986b5d59c27d880a187035a1efead7f5cf81797a957b19601d732b2b9e8a803004580777f501
-  data.tar.gz: 2cf6239d132f6bb32a22bc360fd105a3e7260d3e037ee25e58d02885f34e3bbb39b798eb34305c957a0bd5daa23847a65576764fabc4a99f5613a6594e53e6c9
+  metadata.gz: 618dabf64136f5f255a5e85e95efc1d17d215b1e45c563528e2b7919486538877d509254a0c607b85f5ca66bceafae46e7f2577d60c4ef5bfe4ddf7dd53287b0
+  data.tar.gz: c32162eb764c0b91d8ca93a0d9435e1adf3560367f7145c2eb25c8c551a41cdaaa67c349303fa3666accdfb5e793a582742f2e7fa838e321e18cc6be91289283

data/ext/pcaprub_c/pcaprub.c

@@ -32,6 +32,7 @@ static VALUE rbpcap_thread_wait_handle(HANDLE fno);
 
 #define OFFLINE 1
 #define LIVE 2
+#define DEAD 3
 
 #if !defined(PCAP_NETMASK_UNKNOWN)
 /*
@@ -413,7 +414,11 @@ rbpcap_setfilter(VALUE self, VALUE filter)
   if(TYPE(filter) != T_STRING)
   	rb_raise(eBPFilterError, "filter must be a string");
 
-	if(! rbpcap_ready(rbp)) return self;
+  if(! rbpcap_ready(rbp)) return self;
+
+  if(rbp->type == DEAD) {
+  	rb_raise(eBPFilterError, "unable to set bpf filter on OPEN_DEAD");
+  }
 
   if(rbp->type == LIVE)
   	if(pcap_lookupnet(rbp->iface, &netid, &mask, eb) < 0) {
@@ -427,7 +432,7 @@ rbpcap_setfilter(VALUE self, VALUE filter)
   }
 
   if(pcap_setfilter(rbp->pd, &bpf) < 0) {
-    pcap_freecode(&bpf);
+  	pcap_freecode(&bpf);
   	rb_raise(eBPFilterError, "unable to set bpf filter: %s", pcap_geterr(rbp->pd));
   }
 
@@ -662,7 +667,6 @@ rbpcap_open_dead(VALUE self, VALUE linktype, VALUE snaplen)
 {
   rbpcap_t *rbp;
 
-
   if(TYPE(linktype) != T_FIXNUM)
       rb_raise(rb_eArgError, "linktype must be a fixnum");
   if(TYPE(snaplen) != T_FIXNUM)
@@ -671,7 +675,7 @@ rbpcap_open_dead(VALUE self, VALUE linktype, VALUE snaplen)
   Data_Get_Struct(self, rbpcap_t, rbp);
 
   memset(rbp->iface, 0, sizeof(rbp->iface));
-  rbp->type = OFFLINE;
+  rbp->type = DEAD;
 
   rbp->pd = pcap_open_dead(
       NUM2INT(linktype),
@@ -890,6 +894,10 @@ rbpcap_next_data(VALUE self)
 	if(rbp->type == OFFLINE && ret <= 0)
 	  return Qnil;
 
+  if(rbp->type == DEAD && ret <= 0)
+    return Qnil;
+
+
 	if(ret > 0 && job.hdr.caplen > 0)
     return rb_str_new((char *) job.pkt, job.hdr.caplen);
 
@@ -935,6 +943,9 @@ rbpcap_next_packet(VALUE self)
 	if(rbp->type == OFFLINE && ret <= 0)
 	  return Qnil;
 
+  if(rbp->type == DEAD && ret <= 0)
+    return Qnil;
+
 	if(ret > 0 && job.hdr.caplen > 0)
     {
       rbpacket = ALLOC(rbpacket_t);
@@ -977,6 +988,7 @@ rbpcap_each_data(VALUE self)
   for(;;) {
   	VALUE packet = rbpcap_next_data(self);
   	if(packet == Qnil && rbp->type == OFFLINE) break;
+    if(packet == Qnil && rbp->type == DEAD) break;
 #if defined(WIN32)
 	  packet == Qnil ? rbpcap_thread_wait_handle(fno) : rb_yield(packet);
 #else
@@ -1018,6 +1030,7 @@ rbpcap_each_packet(VALUE self)
   for(;;) {
   	VALUE packet = rbpcap_next_packet(self);
   	if(packet == Qnil && rbp->type == OFFLINE) break;
+    if(packet == Qnil && rbp->type == DEAD) break;
 #if defined(WIN32)
 	  packet == Qnil ? rbpcap_thread_wait_handle(fno) : rb_yield(packet);
 #else

data/lib/pcaprub/version.rb

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

data/test/test_pcaprub_unit.rb

@@ -138,6 +138,17 @@ class Pcap::UnitTest < Test::Unit::TestCase
     assert_equal(o, o.setmonitor(true))
   end
 
+  def test_open_dead
+    # No applied filters on OPEN_DEAD just compile checking
+    o = Pcap.open_dead(Pcap::DLT_NULL, 65535)
+    assert_nothing_raised do
+      o.compile("ip host 1.2.3.4")
+    end
+    assert_raise PCAPRUB::BPFError do
+      o.setfilter("ip host 1.2.3.5")
+    end
+  end
+
   def test_filter
     d = Pcap.lookupdev
     o = Pcap.create(d)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pcaprub
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - shadowbq