mnet 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2024e36584d9a17b0671a60776e00d4cee60c0fae82fc940f293566a07f471c7
-  data.tar.gz: 06d1487cb7206d21b62311c89f7e2419785346ebceb86995e79c185f698640e7
+  metadata.gz: 426aa10a38e121d68b9a895f6ca52c30b8f074b1dfc355e457602198a35e94f9
+  data.tar.gz: 4847c3712519daa9bc2f97c57c662436966aa60dd44c23016d4676aad2356742
 SHA512:
-  metadata.gz: 31c53f20db9e19f677e85452477000197e1f615bbf615a95d14faac1d84e9aa3045821eaa67302ebf6cf68f0ca3ed2e02f0af96b5e732affb84babe396296289
-  data.tar.gz: f06da08c602b9f4bba472e2778cdba7fd1d4e163c0c09d4aa244f04d6d22ba3cacc29b11939e95d986b199991b2b33af98a6e4f17bd0b5a0cd85705dc73cb3db
+  metadata.gz: 9cd167304267f4665d3df1429d2214453926f4981ff791649e2eaf5cf0a75185e1290df774cea5b65508ebf7d1ae5028532cbe963e0c8ad9ff60ce3d44d4257e
+  data.tar.gz: 738fbf86f844faf9eef17b0fbc55de691fa6734bbd399188cf692dbb3c6f0d811354e653b4041272f0be4a07501c5230eb0912ead10eed99098d29177945a029

data/lib/mnet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mnet
-  VERSION = '0.1.0'
+  VERSION = '0.1.3'
 end

data/lib/mnet.rb

@@ -26,8 +26,8 @@ require "mnet/version"
 require "kcp"
 
 module Mnet
-  MAGIC          = "MNET".b
-  MAGIC_LEN      = 4
+  MAGIC          = "\x12\xE9\x97".b
+  MAGIC_LEN      = 3
   SESSION_ID_LEN = 16
 
   # Conservative MTU for mobile networks / VPN tunnels (mosh uses 1280).
@@ -43,6 +43,9 @@ module Mnet
   # delayed packets (mosh: MAX_OLD_SOCKET_AGE = 60000ms).
   MAX_OLD_SOCKET_AGE = 60.0
 
+  # 非阻塞发送标志：POSIX 有 MSG_DONTWAIT，Windows 没有（用 nonblock 模式兜底）。
+  MSG_DONTWAIT = Socket.const_defined?(:MSG_DONTWAIT) ? Socket::MSG_DONTWAIT : 0
+
   # Message types (mirrors the enum-message-types pattern from tmux-protocol.h).
   TYPE_SYN    = 0x01
   TYPE_SYNACK = 0x02
@@ -72,12 +75,12 @@ module Mnet
 
   def pack(session_id, seq, ack, type, flags, window, payload = "".b)
     [MAGIC, session_id, seq, ack, type, flags, window, payload]
-      .pack("a4a16Q>Q>CCNa*")
+      .pack("a3a16Q>Q>CCNa*")
   end
 
   def unpack(data)
     return nil if data.bytesize < HEADER_LEN
-    magic, sid, seq, ack, type, flags, window = data.unpack("a4a16Q>Q>CCN")
+    magic, sid, seq, ack, type, flags, window = data.unpack("a3a16Q>Q>CCN")
     return nil unless magic == MAGIC
     Packet.new(sid, seq, ack, type, flags, window,
                data.byteslice(HEADER_LEN, data.bytesize - HEADER_LEN) || "".b)
@@ -110,7 +113,7 @@ module Mnet
   # socketpair is unavailable (Windows).
   def socket_pair
     Socket.pair(:UNIX, :STREAM, 0)
-  rescue Errno::EAFNOSUPPORT, Errno::EOPNOTSUPP, Errno::EPROTONOSUPPORT, Errno::ENOTSUP, NotImplementedError
+  rescue SystemCallError, NotImplementedError
     server = TCPServer.new("127.0.0.1", 0)
     port   = server.addr[1]
     client = TCPSocket.new("127.0.0.1", port)
@@ -137,6 +140,15 @@ module Mnet
     def sync=(_value)
     end
 
+    # 返回对端真实地址（Addrinfo）。Session/KcpSession 没有内核 socket，远端地址
+    # 由 @peer_addr 跟踪（含切网迁移后的新地址），供 LSocket#io.remote_address 等使用。
+    def remote_address
+      return nil unless @peer_addr
+      Addrinfo.udp(@peer_addr[0], @peer_addr[1])
+    rescue SocketError
+      nil
+    end
+
     # Hook overridden by KcpSession to pull decoded bytes out of the engine.
     def pump_recv
     end
@@ -271,6 +283,11 @@ module Mnet
         end
       end
 
+      # 桥接 socketpair 本身拿不到远端地址，把 remote_address 委托回 session，
+      # 这样 SSLServer#io.remote_address 等仍能取到对端真实 ip:port。
+      session = self
+      app.define_singleton_method(:remote_address) { session.remote_address }
+
       @bridge_io = app
     end
   end
@@ -971,11 +988,9 @@ module Mnet
     def send_raw(data, ip, port)
       sock = @socks.last[0]
       @send_mutex.synchronize do
-        sock.send(data, Socket::MSG_DONTWAIT, ip, port)
+        sock.send(data, Mnet::MSG_DONTWAIT, ip, port)
         true
-      rescue IO::EAGAINWaitWritable, Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ENOBUFS
-        false
-      rescue IOError, Errno::EBADF, Errno::ECONNRESET, Errno::ECONNREFUSED
+      rescue IO::WaitWritable, IO::WaitReadable, SystemCallError, IOError
         false
       end
     end
@@ -999,6 +1014,9 @@ module Mnet
 
     def configure_socket(sock)
       sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+      # Windows 没有 MSG_DONTWAIT，用 nonblock 模式让 send 在缓冲满时返回错误
+      # 而非阻塞（避免发送端死锁）。
+      sock.nonblock = true if Mnet::MSG_DONTWAIT == 0
       # Request buffers sized for the receive window. Linux clamps these to
       # net.core.rmem_max/wmem_max, so read back the real value and cap the
       # flow-control window to what the kernel can actually buffer -- otherwise
@@ -1038,7 +1056,7 @@ module Mnet
         break if socks.empty?
         begin
           ready = IO.select(socks, nil, nil, 0.5)
-        rescue IOError, Errno::EBADF
+        rescue IOError, SystemCallError
           break
         end
         next unless ready
@@ -1055,9 +1073,7 @@ module Mnet
       cap.times do
         data, addr = sock.recvfrom_nonblock(65_535)
         dispatch(data, addr)
-      rescue IO::WaitReadable, Errno::EAGAIN, Errno::EWOULDBLOCK
-        break
-      rescue IOError, Errno::EBADF, Errno::ECONNRESET
+      rescue IO::WaitReadable, SystemCallError, IOError
         break
       rescue => e
         warn "mnet: #{e.class}: #{e.message}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mnet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - mnet developers