Merge branch 'master' of https://github.com/xtaci/kcptun

upd
2024-04-21 12:32:32 +00:00 · 2019-07-14 10:29:56 +00:00 · 2019-07-14 10:28:59 +00:00 · 2019-07-14 12:17:40 +08:00 · 2019-07-13 07:22:04 +00:00 · 2019-07-13 05:01:55 +00:00
5 changed files with 93 additions and 1 deletions
@@ -0,0 +1,25 @@
+{
+        "localaddr": ":2000",
+        "remoteaddr": "11.22.33.44:2000",
+        "key": "PASSWORD",
+        "crypt": "aes-128",
+        "mode": "fast3",
+        "mtu": 1400,
+        "sndwnd": 128,
+        "rcvwnd": 1024,
+        "datashard": 10,
+        "parityshard": 3,
+        "dscp": 46,
+        "nocomp": true,
+        "acknodelay": false,
+        "nodelay": 1,
+        "interval": 40,
+        "resend": 2,
+        "nc": 1,
+        "sockbuf": 16777217,
+        "smuxbuf": 16777217,
+        "keepalive": 10,
+		"autoexpire":1800,
+        "quiet":false,
+        "tcp":false
+}
@@ -0,0 +1,25 @@
+{
+        "listen": ":2000",
+        "target": "127.0.0.1:9999",
+        "key": "PASSWORD",
+        "crypt": "aes-128",
+        "mode": "fast3",
+        "mtu": 1400,
+        "sndwnd": 2048,
+        "rcvwnd": 2048,
+        "datashard": 10,
+        "parityshard": 3,
+        "dscp": 46,
+        "nocomp": true,
+        "acknodelay": false,
+        "nodelay": 1,
+        "interval": 40,
+        "resend": 2,
+        "nc": 1,
+        "sockbuf": 16777217,
+        "smuxbuf": 16777217,
+        "keepalive": 10,
+        "pprof":false,
+        "quiet":false,
+        "tcp":false
+}
@@ -32,6 +32,24 @@ func (c *CompStream) Close() error {
 	return c.conn.Close()
 }

+func (c *CompStream) LocalAddr() net.Addr {
+	if ts, ok := c.conn.(interface {
+		LocalAddr() net.Addr
+	}); ok {
+		return ts.LocalAddr()
+	}
+	return nil
+}
+
+func (c *CompStream) RemoteAddr() net.Addr {
+	if ts, ok := c.conn.(interface {
+		RemoteAddr() net.Addr
+	}); ok {
+		return ts.RemoteAddr()
+	}
+	return nil
+}
+
 func NewCompStream(conn net.Conn) *CompStream {
 	c := new(CompStream)
 	c.conn = conn
@@ -13,7 +13,7 @@ require (
 	github.com/urfave/cli v1.20.0
 	github.com/xtaci/kcp-go v5.4.2+incompatible
 	github.com/xtaci/smux v1.3.4
-	github.com/xtaci/tcpraw v1.2.0
+	github.com/xtaci/tcpraw v1.2.13
 	golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5
 	golang.org/x/net v0.0.0-20190607181551-461777fb6f67 // indirect
 	golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae // indirect
@@ -129,6 +129,30 @@ github.com/xtaci/tcpraw v1.1.18 h1:Jl5UpGZ6Ck0bwXSWdOZ3ExUa6DXx30mCaqvpRnhB3TY=
 github.com/xtaci/tcpraw v1.1.18/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
 github.com/xtaci/tcpraw v1.2.0 h1:ktu8W19TkPj3Av2tDhnp7YGKG9tk1Jz3LI8bI5usT6Q=
 github.com/xtaci/tcpraw v1.2.0/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.1 h1:NdMZTNgIK9R9payI0ISU1LZs24fzOPk10z4wSsMnOTM=
+github.com/xtaci/tcpraw v1.2.1/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.2 h1:/4m5yUO/b3xJBUQmPzxW4SzgnbfVku8g26jFVJ4n/YQ=
+github.com/xtaci/tcpraw v1.2.2/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.3 h1:Wf47jXep3tCP3qXwj12gyiSe90fvuOV2pofMDMEt89A=
+github.com/xtaci/tcpraw v1.2.3/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.4 h1:Euz3j4DJzaTgqHmPuF0YPnvJ9w+6pLWPw27f5skFXEo=
+github.com/xtaci/tcpraw v1.2.4/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.5 h1:SbSGUqGsSjtP+Ejn14X5EFg4cIyYHACHZGsTSEItySI=
+github.com/xtaci/tcpraw v1.2.5/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.6 h1:kBdM4tXKt40nwZgTDYdWiO0vY0i6gdwGAOJOp9LVM7E=
+github.com/xtaci/tcpraw v1.2.6/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.7 h1:ImTm0CorUW1c6dn+lM2TpC8vt5Xps2kOd5i7vIlg98Y=
+github.com/xtaci/tcpraw v1.2.7/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.8 h1:QyMKfDE61fAWCf25+6CFmpxJF11+ORiATGcWqOlDZoQ=
+github.com/xtaci/tcpraw v1.2.8/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.9 h1:PmQIlNkVsXwpHkoe7pab/WDGlg+TNod8UXMMvSVaVhQ=
+github.com/xtaci/tcpraw v1.2.9/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.10 h1:MXgrEuA9Fng5rLr/TdCRY8tV7xy88dcQxr5ybJf/wOI=
+github.com/xtaci/tcpraw v1.2.10/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.11 h1:xauEjUvrApWnVWml5g5jwAbOI9N+iorXASLPwawP5Bk=
+github.com/xtaci/tcpraw v1.2.11/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
+github.com/xtaci/tcpraw v1.2.13 h1:Z5FMbVgrcWkdx3e3Uz3Bvf6w0XC8LhLESKP+G2RwM4g=
+github.com/xtaci/tcpraw v1.2.13/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576 h1:aUX/1G2gFSs4AsJJg2cL3HuoRhCSCz733FE5GUSuaT4=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Author	SHA1	Message	Date
xtaci	62f2ffe2d8	Merge branch 'master' of https://github.com/xtaci/kcptun	2019-07-14 10:29:56 +00:00
xtaci	90b9f85617	upd	2019-07-14 10:28:59 +00:00
xtaci	e619848985	upd	2019-07-14 12:17:40 +08:00
xtaci	7f93fb5858	upd deps	2019-07-13 07:22:04 +00:00
xtaci	7b8a4646fc	upd deps	2019-07-13 05:01:55 +00:00
xtaci	b5487cd0ce	upd deps	2019-07-12 16:38:16 +00:00
xtaci	acfe430810	upd deps	2019-07-12 16:16:29 +00:00
xtaci	9285b162b7	upd deps	2019-07-12 16:02:00 +00:00
xtaci	8d13f9be89	upd deps	2019-07-12 15:22:09 +00:00
xtaci	4ba9028985	upd deps	2019-07-12 06:25:06 +00:00
xtaci	b4473a5413	print address on compressed connection	2019-07-11 15:24:54 +00:00
xtaci	3b01e69ba2	upd deps	2019-07-11 13:47:45 +00:00
xtaci	76b658917a	add example config json file	2019-07-11 13:38:47 +00:00
xtaci	b260423213	upd deps	2019-07-11 10:17:15 +00:00