serverengine 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac02dfbbdf4f05336522f09c88857a122c35821d
-  data.tar.gz: 6ec1e772952f738b8d17e93d15788e934ffcf665
+  metadata.gz: 27ee21f3ac6b04119621a1ccafc43da3a285465a
+  data.tar.gz: 2f145a46ec4de7b4034e807458813b8def7f8de8
 SHA512:
-  metadata.gz: 831d6e39b2cfd52d25c6cf39d2aba188f29767b21d203d2f8ee22cf945c44750f9617d382b9db6eab58d902c366c3d03761b420a4aed270cb32d1db2683555c9
-  data.tar.gz: b619fb4e206c79bf70c91950950d62c9fe64deb18014016ca959c0bda60bf99442beda9ef07ab2a1931b832333304f4da1ad2cc445dc2574299cf928579f97a3
+  metadata.gz: 5b88fe6bcebd72115a8d9c4c58296a831e39625fc763e2ed09a359674dfe1d849fa1ab7c14d732870bfd6b67183dccdc9acf72f2d1506c7bd8675a708376ebd6
+  data.tar.gz: e660e7a7900db257d0022e441cc414bbbd0c6388a3f05c35b51190c1c1e14cbe5e9d84660cc957cef52c4f9c348e6d38e4c9608f2cff35260ff1c93ae4585c97

data/Changelog

@@ -1,3 +1,10 @@
+2016-04-27 version 1.6.3:
+
+* Fix Socket Manager for UDP to adapt to ipv6
+* Fix Socket Manager not to join thread in Ruby 2.1
+* Fix Socket Manager to identify all localhost address
+* Fix ruby dll path on Ruby x64
+
 2016-04-14 version 1.6.2:
 
 * Fix to use Etc instead of id command in change_privilege for windows

data/lib/serverengine/socket_manager.rb

@@ -124,6 +124,9 @@ module ServerEngine
           return "[#{bind_ip}]:#{port}", bind_ip
         else
           # assuming ipv4
+          if bind_ip == "127.0.0.1" or bind_ip == "0.0.0.0"
+            return "localhost:#{port}", bind_ip
+          end
           return "#{bind_ip}:#{port}", bind_ip
         end
       end

data/lib/serverengine/socket_manager_unix.rb

@@ -80,7 +80,8 @@ module ServerEngine
         @tcp_sockets.reject! {|key,lsock| lsock.close; true }
         @udp_sockets.reject! {|key,usock| usock.close; true }
         @server.close unless @server.closed?
-        @thread.join
+        # It cause dead lock and can't finish when joining thread using Ruby 2.1 on linux.
+        @thread.join if RUBY_VERSION >= "2.2"
       end
 
       def send_socket(peer, pid, method, bind, port)

data/lib/serverengine/socket_manager_win.rb

@@ -78,7 +78,12 @@ module ServerEngine
       def listen_udp_new(bind_ip, port)
         sock_addr = Socket.pack_sockaddr_in(port, bind_ip.to_s)
 
-        handle = WinSock.WSASocketA(Socket::AF_INET, Socket::SOCK_DGRAM, Socket::IPPROTO_UDP, nil, 0, 1)
+        if IPAddr.new(IPSocket.getaddress(bind_ip.to_s)).ipv4?
+          handle = WinSock.WSASocketA(Socket::AF_INET, Socket::SOCK_DGRAM, Socket::IPPROTO_UDP, nil, 0, 1)
+        else
+          handle = WinSock.WSASocketA(Socket::AF_INET6, Socket::SOCK_DGRAM, Socket::IPPROTO_UDP, nil, 0, 1)
+        end
+
         if handle == WinSock::INVALID_SOCKET
           RbWinSock.raise_last_error("WSASocketA(2)")
         end

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

data/lib/serverengine/winsock.rb

@@ -92,7 +92,7 @@ module ServerEngine
     GetModuleFileNameA(0, ruby_bin_path_buf, ruby_bin_path_buf.size)
 
     ruby_bin_path = ruby_bin_path_buf.to_s.gsub(/\\/, '/')
-    ruby_dll_paths = File.dirname(ruby_bin_path) + '/msvcr*ruby*.dll'
+    ruby_dll_paths = File.dirname(ruby_bin_path) + '/*msvcr*ruby*.dll'
     ruby_dll_path = Dir.glob(ruby_dll_paths).first
     dlload ruby_dll_path
 

data/spec/socket_manager_spec.rb

@@ -65,6 +65,10 @@ describe ServerEngine::SocketManager do
     end
 
   else
+    let(:test_port) do
+      9102
+    end
+
     it 'is unix' do
       SocketManager::Client.is_a?(SocketManagerUnix::ClientModule)
       SocketManager::Server.is_a?(SocketManagerUnix::ServerModule)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump