kcp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7802d290ec502e834ab5f7eb1e9b4c7a4f664b677ecae6c6f001fce6be4cd3c
-  data.tar.gz: 58fc1060c2be20897078deb312bfd4e671a5d5dd72b9656205ee2ccf8cc6fa31
+  metadata.gz: 42d14476648e8ceeab7e1719c5f60ef345c1756985653d680250f7cff245f556
+  data.tar.gz: 7e9598575a4293778ea9def78f24dfcdcdb5d8a280cf6dd7457ab613c40ea5d9
 SHA512:
-  metadata.gz: f01a77107b1821d1c32818c403982799e5a97b0dd214d6f9b8cb7e6419f1eb597849d31456f76abecadb75317d2a1a29bd85f3ea8694d88dcf57e2c6699d12d7
-  data.tar.gz: 2261acc0d59efcb3b94267a0b523e24fa9b036aa5ba7e18f52a2a857194051a94c1a2004d4ba1a993b7141e76e7ca9bfcae828ee7098c91aaaba66e2382b7edc
+  metadata.gz: 75c1449845bf2f6c3df5afa9cb0cd158430101c090b1069174b56a210933576865b502cc76b735aa59253b8f87d79e590a19c2c7dc2c63c8a6a0770dd61646ab
+  data.tar.gz: 3e74c12241e69202ccb56e4f5fe600a0b3f69bc6b918c4e17ea8abedca016bb15464d7b81cf700f1454056e592f4ad13ab9d48c9a014de6ce07e1d8504db475e

data/ext/kcp/ikcp.c

@@ -34,7 +34,7 @@ const IUINT32 IKCP_ASK_SEND = 1;		// need to send IKCP_CMD_WASK
 const IUINT32 IKCP_ASK_TELL = 2;		// need to send IKCP_CMD_WINS
 const IUINT32 IKCP_WND_SND = 32;
 const IUINT32 IKCP_WND_RCV = 128;       // must >= max fragment size
-const IUINT32 IKCP_MTU_DEF = 1400;
+const IUINT32 IKCP_MTU_DEF = 1300;
 const IUINT32 IKCP_ACK_FAST	= 3;
 const IUINT32 IKCP_INTERVAL	= 100;
 const IUINT32 IKCP_OVERHEAD = 24;

data/ext/kcp/kcp_native.c

@@ -8,36 +8,25 @@
 #include <stdlib.h>
 #include <string.h>
 
-typedef struct {
-    char *data;
-    int len;
-} kcp_pkt;
-
 typedef struct {
     ikcpcb *kcp;
-    kcp_pkt *pkts;
-    int count;
-    int cap;
+    char *out;
+    int outlen;
+    int outcap;
 } kcp_ctx;
 
-/* shim_output 每个 KCP 报文（≤ mtu）单独入队，output() 一次只取一个包，
-   避免把多个 KCP 报文拼成一个大 blob，导致上层封成单个超大 UDP 数据报被
-   IP 分片（分片常被 NAT/防火墙丢弃，造成远端云主机连接异常）。 */
+/* Max bytes returned per output() call -- safely under the 64KB UDP datagram
+   limit, so a burst of KCP packets never overflows a single sendto(). */
+#define KCP_MAX_BLOB 60000
+
 static int shim_output(const char *buf, int len, ikcpcb *kcp, void *user) {
     kcp_ctx *ctx = (kcp_ctx *)user;
-    if (ctx->count >= ctx->cap) {
-        int newcap = ctx->cap ? ctx->cap * 2 : 32;
-        kcp_pkt *npkts = (kcp_pkt *)realloc(ctx->pkts, newcap * sizeof(kcp_pkt));
-        if (!npkts) return -1;
-        ctx->pkts = npkts;
-        ctx->cap = newcap;
+    if (ctx->outlen + len > ctx->outcap) {
+        ctx->outcap = (ctx->outlen + len) * 2 + 256;
+        ctx->out = (char *)realloc(ctx->out, ctx->outcap);
     }
-    kcp_pkt *p = &ctx->pkts[ctx->count];
-    p->data = (char *)malloc(len);
-    if (!p->data) return -1;
-    memcpy(p->data, buf, len);
-    p->len = len;
-    ctx->count++;
+    memcpy(ctx->out + ctx->outlen, buf, len);
+    ctx->outlen += len;
     return 0;
 }
 
@@ -45,8 +34,7 @@ static void ctx_free(void *ptr) {
     kcp_ctx *ctx = (kcp_ctx *)ptr;
     if (ctx) {
         if (ctx->kcp) ikcp_release(ctx->kcp);
-        for (int i = 0; i < ctx->count; i++) free(ctx->pkts[i].data);
-        free(ctx->pkts);
+        free(ctx->out);
         free(ctx);
     }
 }
@@ -120,23 +108,17 @@ static VALUE m_kcp_flush(VALUE mod, VALUE self) {
 
 static VALUE m_kcp_output(VALUE mod, VALUE self) {
     kcp_ctx *ctx = get_ctx(self);
-    if (ctx->count <= 0) return Qnil;
-    /* 一次只返回一个 KCP 报文（≤ mtu），避免上层拼成超长 UDP 数据报触发 IP 分片 */
-    kcp_pkt p = ctx->pkts[0];
-    VALUE buf = rb_str_new(p.data, p.len);
-    free(p.data);
-    ctx->count--;
-    if (ctx->count > 0) {
-        memmove(&ctx->pkts[0], &ctx->pkts[1], ctx->count * sizeof(kcp_pkt));
+    if (ctx->outlen <= 0) return Qnil;
+    /* 一次最多返回 60KB 拼接好的包，避免单个 UDP 数据报超过 64KB（EMSGSIZE） */
+    int n = ctx->outlen < KCP_MAX_BLOB ? ctx->outlen : KCP_MAX_BLOB;
+    VALUE buf = rb_str_new(ctx->out, n);
+    if (n < ctx->outlen) {
+        memmove(ctx->out, ctx->out + n, ctx->outlen - n);
     }
+    ctx->outlen -= n;
     return buf;
 }
 
-static VALUE m_kcp_setmtu(VALUE mod, VALUE self, VALUE mtu) {
-    kcp_ctx *ctx = get_ctx(self);
-    return INT2NUM(ikcp_setmtu(ctx->kcp, NUM2INT(mtu)));
-}
-
 static VALUE m_kcp_waitsnd(VALUE mod, VALUE self) {
     kcp_ctx *ctx = get_ctx(self);
     return INT2NUM(ikcp_waitsnd(ctx->kcp));
@@ -151,6 +133,5 @@ void Init_kcp_native(void) {
     rb_define_singleton_method(m, "kcp_update", m_kcp_update, 2);
     rb_define_singleton_method(m, "kcp_flush", m_kcp_flush, 1);
     rb_define_singleton_method(m, "kcp_output", m_kcp_output, 1);
-    rb_define_singleton_method(m, "kcp_setmtu", m_kcp_setmtu, 2);
     rb_define_singleton_method(m, "kcp_waitsnd", m_kcp_waitsnd, 1);
 }

data/lib/kcp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kcp
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/kcp.rb

@@ -57,12 +57,6 @@ module Kcp
       KcpNative.kcp_output(@ctx)
     end
 
-    # 设置 KCP 内部 MTU（默认 1400）。上层如 mnet 会额外加自己的 header + GCM tag，
-    # 需要把 MTU 调小，保证「KCP 包 + 外层封装」仍小于路径 MTU，避免 IP 分片。
-    def mtu=(mtu)
-      KcpNative.kcp_setmtu(@ctx, mtu)
-    end
-
     # 发送队列里待发送的包数（>0 表示窗口已满、有积压）。
     def waitsnd
       KcpNative.kcp_waitsnd(@ctx)

metadata

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