rbczmq 1.7.2 → 1.7.3

data/ext/zeromq/src/ipc_address.cpp

@@ -51,11 +51,18 @@ int zmq::ipc_address_t::resolve (const char *path_)
         errno = ENAMETOOLONG;
         return -1;
     }
+#if defined ZMQ_HAVE_LINUX
+    if (path_[0] == '@' && !path_[1]) {
+            errno = EINVAL;
+            return -1;
+    }
+#endif
 
     address.sun_family = AF_UNIX;
     strcpy (address.sun_path, path_);
 #if defined ZMQ_HAVE_LINUX
-    if (*path_ == '@')
+    /* Abstract sockets on Linux start with '\0' */
+    if (path_[0] == '@')
         *address.sun_path = '\0';
 #endif
     return 0;
@@ -73,10 +80,10 @@ int zmq::ipc_address_t::to_string (std::string &addr_)
     s << "ipc://" << address.sun_path;
 #else
     s << "ipc://";
-    if (*address.sun_path)
-       s << address.sun_path;
-    else
+    if (!address.sun_path[0] && address.sun_path[1])
        s << "@" << address.sun_path + 1;
+    else
+       s << address.sun_path;
 #endif
     addr_ = s.str ();
     return 0;
@@ -89,6 +96,10 @@ const sockaddr *zmq::ipc_address_t::addr () const
 
 socklen_t zmq::ipc_address_t::addrlen () const
 {
+#if defined ZMQ_HAVE_LINUX
+    if (!address.sun_path[0] && address.sun_path[1])
+        return (socklen_t) strlen(address.sun_path + 1) + sizeof (sa_family_t) + 1;
+#endif
     return (socklen_t) sizeof (address);
 }
 

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.7.2"
+  VERSION = "1.7.3"
 end

data/test/test_beacon.rb

@@ -1,10 +1,27 @@
 # encoding: utf-8
 
 require File.join(File.dirname(__FILE__), 'helper')
+require 'socket'
 
 class TestZmqBeacon < ZmqTestCase
+  def setup
+    r = Random.new
+    begin
+      # find a random port number that we are able to bind to, and use this port
+      # for the beacon tests.
+      udp = UDPSocket.new
+      @port = 10000 + r.rand(50000)
+      udp.bind('0.0.0.0', @port)
+    rescue Errno::EADDRINUSE
+      udp.close
+      retry
+    ensure
+      udp.close
+    end
+  end
+
   def test_beacon
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     assert_instance_of ZMQ::Beacon, beacon
     assert_nil beacon.destroy
     assert_raises TypeError do
@@ -15,14 +32,14 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_hostname
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     assert_instance_of String, beacon.hostname
   ensure
     beacon.destroy
   end
 
   def test_set_interval
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     beacon.interval = 100
     assert_raises TypeError do
       beacon.interval = :invalid
@@ -32,14 +49,14 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_noecho
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     assert_nil beacon.noecho
   ensure
     beacon.destroy
   end
 
   def test_publish
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     assert_raises TypeError do
       beacon.publish :invalid
     end
@@ -50,7 +67,7 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_subscribe
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     assert_raises TypeError do
       beacon.subscribe :invalid
     end
@@ -61,7 +78,7 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_pipe
-    beacon = ZMQ::Beacon.new(80000)
+    beacon = ZMQ::Beacon.new(@port)
     assert_instance_of ZMQ::Socket::Pair, beacon.pipe
     GC.start # check GC cycle with "detached" socket
   ensure
@@ -72,10 +89,10 @@ class TestZmqBeacon < ZmqTestCase
     ctx = ZMQ::Context.new
     address = "tcp://127.0.0.1:90000"
     rep = ctx.bind(:REP, address)
-    service_beacon = ZMQ::Beacon.new(80000)
+    service_beacon = ZMQ::Beacon.new(@port)
     service_beacon.publish(address)
     sleep(0.5)
-    client_beacon = ZMQ::Beacon.new(80000)
+    client_beacon = ZMQ::Beacon.new(@port)
     client_beacon.subscribe("tcp")
     client_beacon.pipe.rcvtimeo = 1000
     sender_address = client_beacon.pipe.recv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbczmq
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Lourens Naudé
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -646,7 +646,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Ruby extension for ZeroMQ (ZMQ) using CZMQ - High-level C Binding for ØMQ