DIY-pcap 0.2.3 → 0.2.4

data/lib/diy/builder.rb

@@ -31,33 +31,26 @@ module DIY
     end
     
     def client(ip_or_iport)
-      default_port = "7878"
-      if ! ip_or_iport.include?(':')
-        iport = ip_or_iport + ':' + default_port
-      else
-        iport = ip_or_iport
-      end
-      @curi = ip2druby(iport)
+      @curi = ip_or_iport_with_default(ip_or_iport, 7878)
     end
     
     def server(ip_or_iport)
-      default_port = "7879"
-      if ! ip_or_iport.include?(':')
-        iport = ip_or_iport + ':' + default_port
-      else
-        iport = ip_or_iport
-      end
-      @suri = ip2druby(iport)
+      @suri = ip_or_iport_with_default(ip_or_iport, 7879)
     end
     
     def me(ip_or_iport)
-      default_port = "7880"
+      @me = ip_or_iport_with_default(ip_or_iport, 7880)
+    end
+    alias controller me
+    
+    def ip_or_iport_with_default(ip_or_iport, default_port)
+      default_port = default_port.to_s
       if ! ip_or_iport.include?(':')
         iport = ip_or_iport + ':' + default_port
       else
         iport = ip_or_iport
       end
-      @me = ip2druby(iport)      
+      ip2druby(iport)      
     end
     
     def ip2druby(ip)

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/diy/worker.rb

@@ -1,6 +1,8 @@
 # encoding : utf-8
 require 'diy/packet'
 require 'drb'
+require 'thread'
+
 module DIY
   include DRbUndumped
   class Worker
@@ -8,6 +10,7 @@ module DIY
       @live = live
       @recv_t = nil
       @start = false
+      @m = Mutex.new
       loop_recv
     end
   
@@ -25,8 +28,10 @@ module DIY
         @live.loop do |this, pkt|
           next unless @start
           begin
-            @block.call(pkt.body) if @block
-          rescue DRb::DRbconnError
+            @m.synchronize do
+              @block.call(pkt.body) if @block
+            end
+          rescue DRb::DRbConnError
             DIY::Logger.info "closed connection by controller"
           end
         end

data/simple/pcap.rb

@@ -10,7 +10,7 @@ a = DIY::Builder.new do
   pcapfile Dir["pcaps/*.pcap"]
   client "127.0.0.1"
   server "127.0.0.1"
-  me "127.0.0.1"
+  controller "127.0.0.1"
 end
 
 a.run

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-29 00:00:00 +08:00
-default_executable: 
+date: 2012-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi-pcap
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
@@ -110,7 +111,6 @@ files:
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -124,6 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -132,13 +133,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: DIY pcap send and recv