serverengine 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e00b2c2ebec4b3f44d7afb6d519822bd215a94356d018d4de9c88b890ee944
-  data.tar.gz: 667633c2ebcda531c78976fbaf6f86da06cf8c8ef17f1913679f02b2184715f2
+  metadata.gz: 934c5957de987807cb9a28cf740ee002cfa1c64d54c82b21acb16c464bfd8da0
+  data.tar.gz: aef6141bd22834eb0f9fb837d374ec69b5681cb31bddc0fa1afda5cd82c3ec38
 SHA512:
-  metadata.gz: 4cd38c03f674b8c9826e11bf88969abcc8797d71fbeaf1630fbb779473bf276850a006a12f9e4b422de132a8087bfc38c477347d76b943cc120194b06878f64d
-  data.tar.gz: 43a6c3773f01d987efb8724ffca4a604402cb0e1ab9bdb4ba3e13265e5820c169deca7720aabda780b7b34df7038191add977219a9d5bc84e0ba701ff17f3a95
+  metadata.gz: eb93190b271548e433d9dcc9ce2d7b4f8358a4bd96079b24c1417bc43e86567840733265df4931d79beacd1ba31dbe23bd1e29c1d205982e036dc29861d68c2a
+  data.tar.gz: '09f3589a04c3bbea01c619216066e7bbb9ac2e4414cd8345713315aa416cbe2600d537bec860034423bb4566881c5febc4efb33bfd28a376953c078aeee524fb'

data/Changelog

@@ -1,3 +1,8 @@
+2020-01-24 version 2.2.1:
+
+* Fix IPv6 dual-stack mode issue for UDP
+* experimental: Add SERVERENGINE_USE_SOCKET_REUSEPORT envvar to enable SO_REUSEPORT
+
 2019-11-16 version 2.2.0:
 
 * Fix IPv6 dual-stack mode issue for TCP

data/lib/serverengine/socket_manager_unix.rb

@@ -50,21 +50,30 @@ module ServerEngine
       private
 
       def listen_tcp_new(bind_ip, port)
-        # TCPServer.new doesn't set IPV6_V6ONLY flag, so use Addrinfo class instead.
-        # TODO: make backlog configurable if necessary
-        tsock = Addrinfo.tcp(bind_ip.to_s, port).listen(::Socket::SOMAXCONN)
-        tsock.autoclose = false
-        TCPServer.for_fd(tsock.fileno)
+        if ENV['SERVERENGINE_USE_SOCKET_REUSEPORT'] == '1'
+          # Based on Addrinfo#listen
+          tsock = Socket.new(bind_ip.ipv6? ? ::Socket::AF_INET6 : ::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
+          tsock.ipv6only! if bind_ip.ipv6?
+          tsock.setsockopt(:SOCKET, :REUSEPORT, true)
+          tsock.setsockopt(:SOCKET, :REUSEADDR, true)
+          tsock.bind(Addrinfo.tcp(bind_ip.to_s, port))
+          tsock.listen(::Socket::SOMAXCONN)
+          tsock.autoclose = false
+          TCPServer.for_fd(tsock.fileno)
+        else
+          # TCPServer.new doesn't set IPV6_V6ONLY flag, so use Addrinfo class instead.
+          # TODO: make backlog configurable if necessary
+          tsock = Addrinfo.tcp(bind_ip.to_s, port).listen(::Socket::SOMAXCONN)
+          tsock.autoclose = false
+          TCPServer.for_fd(tsock.fileno)
+        end
       end
 
       def listen_udp_new(bind_ip, port)
-        if bind_ip.ipv6?
-          sock = UDPSocket.new(Socket::AF_INET6)
-        else
-          sock = UDPSocket.new(Socket::AF_INET)
-        end
-        sock.bind(bind_ip.to_s, port)
-        return sock
+        # UDPSocket.new doesn't set IPV6_V6ONLY flag, so use Addrinfo class instead.
+        usock = Addrinfo.udp(bind_ip.to_s, port).bind
+        usock.autoclose = false
+        UDPSocket.for_fd(usock.fileno)
       end
 
       def start_server(path)

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/socket_manager_spec.rb

@@ -155,7 +155,27 @@ describe ServerEngine::SocketManager do
         test_state(:is_udp_socket).should == 1
         test_state(:udp_data_sent).should == 1
       end
-    end if (TCPServer.open("::1",0) rescue nil)
+    end if (TCPServer.open("::1", 0) rescue nil)
+
+    unless ServerEngine.windows?
+      context 'using ipv4/ipv6' do
+        it 'can bind ipv4/ipv6 together' do
+          server = SocketManager::Server.open(server_path)
+          client = ServerEngine::SocketManager::Client.new(server_path)
+
+          tcp_v4 = client.listen_tcp('0.0.0.0', test_port)
+          udp_v4 = client.listen_udp('0.0.0.0', test_port)
+          tcp_v6 = client.listen_tcp('::', test_port)
+          udp_v6 = client.listen_udp('::', test_port)
+
+          tcp_v4.close
+          udp_v4.close
+          tcp_v6.close
+          udp_v6.close
+          server.close
+        end
+      end if (TCPServer.open("::", 0) rescue nil)
+    end
   end
 
   if ServerEngine.windows?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump