mnet 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28c7a4caaa839184e561f720b57548ce98528405577180cd36419aaaad7f573d
-  data.tar.gz: 88a321feeed9a003e4dac10dceefa786d179d064b54c048235aaf0433ae95dd8
+  metadata.gz: f6bfc9f4f191ccc85bc0826dce0bb1db83e8b2cc7d3fc8876b1669f59c0f47bb
+  data.tar.gz: 7d7993715434586564f1b91ee3e186ca95a638e331794362a992865b6650eb14
 SHA512:
-  metadata.gz: 1de03ebb7e9318e8e4b8867246c38ab80fa1570ce15465cfa0e649075db61dbf2e956e632b86c8693c1f5512570877e061e03e77bbc978427c3af6da13c22e90
-  data.tar.gz: a5c553a57c24bf513111b10656eef1bc2e48faa9fb79a8aae8ced04ab3c372a2718c7573e200d6feeb901cb83db8daf7f846d05e563d37f197c5214081bd739c
+  metadata.gz: 9f57908a81e4eb68d7643f75253dabbcae45de9f8386169301914d15743d8f25d6d5ff89562d1e1bfe09874c8c453cbc48b3a56f1b7974c5427e35e09e97cade
+  data.tar.gz: 1dfb4adc41610b08ddf958a58e64e044352a0833aff09cb265aea4d7cd8c7f6a68047992a33e6adb3d74cbd125273a7a87380c81a79fbe56367469528fd769cc

data/lib/mnet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mnet
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 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).
@@ -75,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)
@@ -140,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
@@ -274,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
@@ -667,6 +681,10 @@ module Mnet
 
       @conv   = id.unpack1("N") # KCP conv derived from the session id
       @engine = Kcp::Engine.new(@conv)
+      # KCP 默认 MTU 1400，但外层还要加 mnet header(42) + GCM nonce/tag(28)。
+      # 按 IP_MTU(1280) 反推，KCP 包最多 1280 - 42 - 28 = 1210，留点余量取 1200，
+      # 保证「KCP 包 + 封装」不超路径 MTU，避免被 IP 分片（分片常被 NAT/防火墙丢）。
+      @engine.mtu = 1200
 
       @m  = Monitor.new
       @cv = @m.new_cond

metadata

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