Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from xtaci:master #2

Open
wants to merge 483 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
483 commits
Select commit Hold shift + click to select a range
2684e47
upd default value for streambuf
xtaci Sep 21, 2019
fe3227d
update smux deps
xtaci Sep 21, 2019
3425d62
upd deps
xtaci Sep 21, 2019
1635649
upd deps
xtaci Sep 21, 2019
13deb22
upd deps
xtaci Sep 21, 2019
8778495
upd deps smuxv2
xtaci Sep 22, 2019
a69b0a9
fix generic.Stream interface type error
xtaci Sep 22, 2019
1b756ae
adjust sequence of startup log
xtaci Sep 22, 2019
0f18b17
fix spelling
xtaci Sep 22, 2019
30cca4d
half default streambuf to 2097152 bytes
xtaci Sep 22, 2019
ade7ee0
stream copy print high-level error
xtaci Sep 22, 2019
fa72823
only output protocol error in streamCopy
xtaci Sep 22, 2019
a859f41
verbose error handling for smux protocol
xtaci Sep 22, 2019
112870d
1->2
xtaci Sep 22, 2019
1b72bf3
verbose logging on smux establishment
xtaci Sep 22, 2019
6c46285
upd to kcp-go@5.4.7
xtaci Sep 22, 2019
903cb9f
update .travis.yml
xtaci Sep 22, 2019
9004bf3
update Dockerfile to support GO111MODULE
xtaci Sep 22, 2019
cda9de7
go mod tidy
xtaci Sep 22, 2019
6d6114b
update example json for smux v2
xtaci Sep 22, 2019
3530c32
upgrade smux@v2.0.10 -> smux@v2.0.11
xtaci Sep 22, 2019
f45e756
upgrade to kcp-go@5.4.8
xtaci Sep 23, 2019
00db8d2
upgrade to kcp-go@5.4.9
xtaci Sep 23, 2019
7e648ff
upgrade to kcp-go@5.4.10
xtaci Sep 24, 2019
7d06c5f
upgrade to kcp-go@5.4.11
xtaci Sep 26, 2019
c21ba84
Update README.md
xtaci Sep 27, 2019
265dd7e
Update README.md
xtaci Sep 27, 2019
ffb7f8a
Update README.md
xtaci Sep 27, 2019
c251f2c
Update ISSUE_TEMPLATE
xtaci Sep 27, 2019
a95a000
Update ISSUE_TEMPLATE
xtaci Sep 27, 2019
b51ef20
Update README.md
xtaci Sep 27, 2019
b272034
Update README.md
xtaci Sep 28, 2019
029af29
Update README.md
xtaci Oct 26, 2019
c380abf
upgrade to kcp-go@v5.4.13
xtaci Oct 30, 2019
8ab0626
Update README.md
xtaci Nov 1, 2019
b93460f
Delete wechat_donate.jpg
xtaci Nov 1, 2019
047895f
upgrade to kcp-go@v5.4.14
xtaci Nov 1, 2019
2eec01d
upgrade to kcp-go@v5.4.15
xtaci Nov 4, 2019
8f2fcb7
upgrade to kcp-go@v5.4.16
xtaci Nov 4, 2019
f70791f
upgrade to kcp-go@v5.4.17
xtaci Nov 5, 2019
9d84f40
upgrade to kcp-go@v5.4.18
xtaci Nov 5, 2019
556de30
upgrade to kcp-go@v5.4.19
xtaci Nov 7, 2019
4a49552
force GO111MODULE to on while compiling
xtaci Nov 10, 2019
99abd12
upgrade to smux@v2.0.13
xtaci Nov 12, 2019
24ff7ca
shrink per-direction buffer to 4k
xtaci Nov 12, 2019
166dbca
upgrade to github.com/xtaci/smux@v1.4.5 github.com/xtaci/smux/v2@v2.0…
xtaci Nov 26, 2019
876e17a
upgrade to smux/v2@v2.0.15
xtaci Nov 26, 2019
216c7aa
upgrade smux to v1.4.6 & v2.0.16
xtaci Nov 26, 2019
61e830c
write controlled reading based on RawConn to buffer per stream
xtaci Dec 18, 2019
361ba76
fix error
xtaci Dec 18, 2019
5ad2b95
fix locking scheme
xtaci Dec 18, 2019
c8c084a
adjusts to 4k buf per mux
xtaci Dec 18, 2019
90ea4ba
fallback on windows
xtaci Dec 18, 2019
de73ed9
add comments to rawCopy
xtaci Dec 18, 2019
9e0d6f8
upgrade to kcp-go@v5.4.20
xtaci Dec 19, 2019
8a03eb1
eliminate extra 1 goroutine per connection
xtaci Dec 19, 2019
4f88883
fix termination sequence
xtaci Dec 19, 2019
f3cccbb
fix closing scheme
xtaci Dec 19, 2019
5bd9b7e
Update README.md
xtaci Dec 19, 2019
dca5b2d
upgrade deps to smux
xtaci Dec 19, 2019
98f9311
smux@v1.4.8 & smux/v2@v2.0.18
xtaci Dec 19, 2019
56b45e8
Add files via upload
xtaci Dec 20, 2019
34bc48f
Squashed commit of the following:
xtaci Dec 26, 2019
fc57c98
rawcopy leads mistakes in smux in v2
xtaci Dec 29, 2019
7490778
upgrade to smux@v1.5.7
xtaci Dec 29, 2019
0c31530
add an example systemd service
xtaci Dec 31, 2019
0f4131b
use go.mod based kcp-go
xtaci Dec 31, 2019
b983528
Update README.md
xtaci Jan 1, 2020
3b5b4ac
Update README.md
xtaci Jan 2, 2020
eefaf5a
upgrade to kcp-go/v5@v5.4.23
xtaci Jan 3, 2020
c8fa2a2
update to kcp-go@v5.4.25
xtaci Jan 3, 2020
d374f93
upgrade kcp-go@v5.4.26
xtaci Jan 3, 2020
b07931c
upgrade to kcp-go@5.5.0
xtaci Jan 4, 2020
3790c74
upgrade to kcp-go@v5.5.2
xtaci Jan 4, 2020
8c2d397
upgrade to kcp-go@v5.5.3
xtaci Jan 4, 2020
77dc451
Update README.md
xtaci Jan 5, 2020
ee29dc4
upgrade deps
xtaci Jan 16, 2020
c71120e
upd deps
xtaci Jan 16, 2020
3c54e12
Update README.md
xtaci Jan 21, 2020
23cd29a
update deps to kcp-go to v5.5.5
xtaci Feb 1, 2020
0da9173
upgrade to kcp-go@v5.5.6
xtaci Feb 9, 2020
01e7b9f
upd deps to smux to@v1.5.12
xtaci Feb 20, 2020
c290f0b
upd deps
xtaci Feb 23, 2020
0dabb34
update travis.yml
xtaci Feb 24, 2020
8115fe5
upd deps to kcp-go
xtaci Feb 25, 2020
4b574ec
a bugfix in kcp-go, upgrade to kcp-go/v5@v5.5.9
xtaci Mar 9, 2020
e99088b
upd go.mod
xtaci Mar 21, 2020
720050c
upd deps
xtaci Mar 22, 2020
7cf9909
upd to v5.5.11
xtaci Mar 22, 2020
4358f56
update Dockerfile
xtaci Apr 10, 2020
7062748
Add iptables to docker image (#786)
tete1030 Apr 24, 2020
912a979
upgrade to smux@v1.5.14
xtaci May 20, 2020
a1fa761
upgrade to kcp-go@v5.5.14
xtaci Jul 1, 2020
d367ce9
add /vendor to kcptun
xtaci Sep 18, 2020
e3c5c13
add -mod=vendor to go build
xtaci Sep 18, 2020
335b2d3
upgrade deps to kcp-go@v5.5.16 and golang 1.14.9
xtaci Sep 30, 2020
7cb5adf
upd to kcp-go@v5.5.17
xtaci Sep 30, 2020
b2be91c
add missing vendor files
xtaci Oct 4, 2020
114cd97
upgrade to kcp-go@v5.6.1
xtaci Oct 10, 2020
212504f
upd deps to smux
xtaci Nov 26, 2020
160b68c
upd vendor
xtaci Nov 26, 2020
76c4d23
Support Apple M1 Mac (#823)
networkextension Nov 26, 2020
9ac04cd
a smarter scavenger
xtaci Dec 17, 2020
e9316f7
remove a condition in scavenger
xtaci Dec 19, 2020
2225d25
create UDP connection only when needed (#825)
mitnk Dec 20, 2020
07ad03f
remove a duplicated logging
xtaci Dec 20, 2020
9a5b31b
enable support for Apple M1
xtaci Apr 1, 2021
94c9cac
upd deps to smux to v1.5.16
xtaci Sep 22, 2021
c4bd77c
add rpm support (#862)
purplegrape Dec 31, 2021
5b5c094
miss [unit] (#860)
Ansen Dec 31, 2021
b63eeb6
Fix typo (embeded -> embedded) (#850)
brlin-tw Dec 31, 2021
b7167b5
upd deps
xtaci Jun 27, 2022
0a9243f
fix missing vendor
xtaci Jun 28, 2022
c5232c2
config --crypt null (#878)
ithewei Jun 28, 2022
51e6fed
adding support for multiport dial
xtaci Oct 8, 2022
f7a6425
upd test
xtaci Oct 8, 2022
b9cb84e
make parsing generic
xtaci Oct 8, 2022
2e5215a
add multiport support on server
xtaci Oct 8, 2022
208decc
use rand port instead of sequential pattern
xtaci Oct 15, 2022
baca7d7
add unix support on client (#892)
fesily Oct 28, 2022
b4684d7
Update README.md
xtaci Nov 2, 2022
a3cc866
support windows arm64 (#900)
eagleoflqj Dec 20, 2022
968e76e
upd deps
xtaci Feb 7, 2023
00ce2f8
upd vendor
xtaci Feb 7, 2023
997b217
upd deps to smux
xtaci Feb 7, 2023
4789212
add parameters explaination
xtaci Feb 7, 2023
386bd58
Update README.md
xtaci Feb 7, 2023
86f2e5b
upd deps to smux
xtaci Feb 7, 2023
ec09978
upd deps to smux
xtaci Feb 12, 2023
eed5f5f
upd deps to smux@v1.5.22
xtaci Feb 14, 2023
0603885
upd vendor
xtaci Feb 14, 2023
bd274ab
upd deps to smux
xtaci Feb 14, 2023
f7d957f
fixed a bug that smux.OpenStream /smux.Close will hang forever in rare
xtaci Feb 14, 2023
432e75c
Bump golang.org/x/net from 0.5.0 to 0.7.0 (#910)
dependabot[bot] Mar 7, 2023
0e91759
upd Dockerfile
xtaci Jul 27, 2023
5ad73ea
Squashed commit of the following:
xtaci Jul 27, 2023
511c9a5
upd deps & upgrade to kcp-go@v5.6.3
xtaci Aug 11, 2023
589fe49
update Dockerfile to go1.21
xtaci Aug 11, 2023
55e6700
add default.pgo in client &
xtaci Aug 11, 2023
1439911
Bump golang.org/x/net from 0.14.0 to 0.17.0 (#931)
dependabot[bot] Oct 12, 2023
0440abb
upd deps of kcp-go to @v5.6.5
xtaci Oct 12, 2023
86443d9
upgrade deps to v5.6.6
fulirockx Jan 5, 2024
fa0d5e0
upd deps to v5.6.7
xtaci Jan 5, 2024
13f48e0
add vendor
xtaci Jan 5, 2024
8929bb0
upd pgo
xtaci Jan 6, 2024
a922538
Update README.md
xtaci Jan 7, 2024
15e358a
upd deps to kcp-go@v5.6.8
xtaci Mar 12, 2024
6842543
Bump golang.org/x/net from 0.19.0 to 0.23.0 (#944)
dependabot[bot] Apr 23, 2024
f8cae52
Added github workflow for docker and dependabot (#946)
itspooya May 16, 2024
f9a4242
add a label to Dockerfile
fulirockx Jun 3, 2024
557d511
support for QPP(Quantum Permutation Pad)
xtaci Jun 30, 2024
5fbd5b1
add missing files
xtaci Jun 30, 2024
2a956c7
upgrade qpp deps to v1.0.2
xtaci Jul 1, 2024
69dc068
add missing vendor file
xtaci Jul 1, 2024
30baf81
upd deps of qpp to v1.0.3
xtaci Jul 1, 2024
ecfb3ac
Update README.md
xtaci Jul 1, 2024
bb741a0
Update ISSUE_TEMPLATE
xtaci Jul 1, 2024
3842efb
Update README.md
xtaci Jul 1, 2024
5808892
fix memory usage for QPP
xtaci Jul 1, 2024
226c4ba
fix memory issue related to server-side QPP
xtaci Jul 1, 2024
e6305ba
upgrade deps to qpp@v1.1.0
xtaci Jul 2, 2024
e8218e9
update deps to qpp@v1.1.3
xtaci Jul 2, 2024
1255da1
upgrade deps to qpp@v1.1.4
xtaci Jul 3, 2024
bda93c7
fix log
xtaci Jul 3, 2024
0cd11d2
adjust on usage text
xtaci Jul 4, 2024
0129024
upgrade deps to qpp@v1.1.5
xtaci Jul 4, 2024
c25908b
update deps
xtaci Jul 6, 2024
d92eb81
upgrade to faster qpp@v1.1.7
xtaci Jul 13, 2024
ff8ab98
upgrade deps to qpp@v1.1.10
xtaci Jul 14, 2024
4d9dcbe
update deps to qpp@v1.1.15
xtaci Jul 15, 2024
a956bb3
upd deps to qpp@v1.1.16
xtaci Jul 15, 2024
96ef4c9
notify user if QPPCount/qpp-count is not a prime
xtaci Jul 15, 2024
bfa9c1d
add a bsd rc dist
xtaci Jul 16, 2024
2078ee7
fix script
xtaci Jul 16, 2024
54712c8
Bump github.com/xtaci/qpp from 1.1.16 to 1.1.17 (#960)
dependabot[bot] Jul 17, 2024
f75cf15
update freebsd dist rc script
xtaci Jul 19, 2024
86c984c
mov dist configs in ./dist
xtaci Jul 19, 2024
d396c3a
mv examples to dist/*.example
xtaci Jul 20, 2024
e50b9f0
add sysctl
xtaci Jul 24, 2024
68e936a
add license to source codes
xtaci Jul 26, 2024
575fb41
add an extra layer, instead of copy codes
xtaci Jul 27, 2024
4193bb6
wait until client close
xtaci Jul 27, 2024
1f75a39
add more comments
xtaci Jul 27, 2024
aeed835
upd other deps
xtaci Jul 27, 2024
65684b7
vendor
xtaci Jul 27, 2024
003e480
go mod vendor
xtaci Jul 27, 2024
bc60f38
fix pipe
xtaci Jul 28, 2024
8bb477a
update deps to smux
xtaci Jul 28, 2024
bac681d
remove unused math/rand
xtaci Jul 29, 2024
fe5c7bf
re-layout source
xtaci Jul 29, 2024
3d7f560
relayout source code
xtaci Jul 29, 2024
584effe
Create README.md
xtaci Jul 29, 2024
65b7371
move images to assets/
xtaci Jul 29, 2024
58d6aba
Update README.md
xtaci Jul 29, 2024
b3d8403
Update README.md
xtaci Jul 29, 2024
f851cbd
replace "error" with "pipe"
xtaci Jul 30, 2024
4d2c6f1
enum target type
xtaci Jul 30, 2024
96054d9
remove unused vars
xtaci Jul 30, 2024
018976b
upgrade deps to kcp-go
xtaci Jul 31, 2024
a41663a
Update README.md
xtaci Aug 1, 2024
cb679d0
Update README.md
xtaci Aug 1, 2024
faaa042
run as nobody in freebsd rc script
xtaci Aug 3, 2024
7f0ee9e
use bash instead of /bin/bash for compatibility
xtaci Aug 7, 2024
9ed813f
add a delay in conn closing
xtaci Aug 7, 2024
dfb4920
Bump golang.org/x/crypto from 0.25.0 to 0.26.0 (#963)
dependabot[bot] Aug 7, 2024
dc43e92
Bump docker/build-push-action from 5 to 6 (#953)
dependabot[bot] Aug 7, 2024
77d6604
fix typo
xtaci Aug 7, 2024
fe2f55a
Merge branch 'master' of github.com:xtaci/kcptun
xtaci Aug 7, 2024
b53f638
update sysctl on freebsd
xtaci Aug 9, 2024
4b00288
notify user if scavengettl is smaller than autoexpire
xtaci Aug 12, 2024
79940ba
adjust message
xtaci Aug 12, 2024
eb87948
Bump github.com/xtaci/kcp-go/v5 from 5.6.12 to 5.6.13 (#964)
dependabot[bot] Aug 16, 2024
545b99d
update minimum go version to go1.21
xtaci Aug 15, 2024
65d33c0
update freebsd rc script
xtaci Aug 17, 2024
0670f98
add a desc to freebsd rc conf
xtaci Aug 17, 2024
ef268e3
rename freebsd rc.conf
xtaci Aug 17, 2024
5d57c21
seperate linux and freebsd configs
xtaci Aug 17, 2024
fd571f1
add a download script
xtaci Aug 17, 2024
9c6c089
rename
xtaci Aug 17, 2024
c0542e9
Update README.md
xtaci Aug 17, 2024
921a688
add a scavengePeriod and set to 5 to make the check period longer
xtaci Aug 17, 2024
0cadf5c
update tcpraw deps to v1.2.26
xtaci Aug 18, 2024
9f406c2
add vendor
xtaci Aug 19, 2024
d5a4974
upgrade deps to tcpraw and make the UDPSession to close the tcpraw
xtaci Aug 19, 2024
348dffe
update deps to tcpraw to @v1.2.27
xtaci Aug 19, 2024
ca79329
upgrade deps to tcpraw to @v1.2.28
xtaci Aug 20, 2024
9066f71
upd deps
xtaci Aug 20, 2024
48f9ce7
add sigterm/sigint handler to handle iptables clear under linux for tcp
xtaci Aug 20, 2024
1f00068
upd deps
xtaci Aug 21, 2024
4058cc6
finalize vendor
xtaci Aug 25, 2024
f398415
Bump github.com/xtaci/kcp-go/v5 from 5.6.14 to 5.6.15 (#966)
dependabot[bot] Aug 26, 2024
ff1fe55
upd deps to kcpgo
xtaci Aug 28, 2024
698814b
mod vendor
xtaci Aug 28, 2024
3f228a7
upd deps
xtaci Aug 28, 2024
7db327c
mod vendor
xtaci Aug 28, 2024
cf6a03e
bash header
xtaci Aug 30, 2024
e985782
update script
xtaci Aug 30, 2024
6c3db07
update deps to smux
xtaci Aug 30, 2024
9ed66e0
add isPassive in std/copy.go to differentiate closing
xtaci Aug 31, 2024
f5aa175
fix passive
xtaci Aug 31, 2024
142ac6b
rename
xtaci Aug 31, 2024
3ec90cd
parameterize closeWait
xtaci Aug 31, 2024
f21e9e7
update deps to smux
xtaci Sep 2, 2024
9bba49d
add vendor
xtaci Sep 2, 2024
b88b2d9
Bump golang.org/x/crypto from 0.26.0 to 0.27.0 (#968)
dependabot[bot] Sep 6, 2024
84e62fb
update deps to smux to @v1.5.30
xtaci Sep 15, 2024
3ed6502
raise SIGTERM instead of SIGINT
xtaci Sep 19, 2024
5e54ec6
fix systemd restart waiting due to signal handling
xtaci Sep 19, 2024
fd6cbb6
support for loong64/linux
xtaci Oct 1, 2024
4983587
update deps to smux and kcp-go
xtaci Oct 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 16 additions & 14 deletions .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
问问题前先搜索ISSUE,并搞清楚下面的问题:

1. 检查 ```-key xxx``` 至少三遍, ***保证***两边一致。
2. 保证```-nocomp, -datashard, -parityshard, -key, -crypt```两边一致。
2. 保证```-nocomp, -datashard, -parityshard, -key, -crypt, -smuxver, -QPP -QPPCount```两边一致。
3. 是否在服务器端,正确设定了转发的目标服务器地址 ***--target***。
4. 如果第3条不确定,尝试在服务器上telnet target port试试。
5. 防火墙是否关闭了UDP通信。
6. 两端的版本是否一致?
7. 是不是最新版本?
8. 两端分别是什么操作系统?
9. 两端的输出日志是什么?
4. 是否在客户端,正确的连接到了 client的监听端口。
5. 如果第3条不确定,尝试在服务器上telnet target port试试。
6. 防火墙是否关闭了UDP通信,或者设置了UDP的最大发包速率?
7. 两端的版本是否一致?
8. 是不是最新版本?
9. 两端分别是什么操作系统?
10. 两端的输出日志是什么?

Before firing issue, make sure you figured out the following common questions.

PLEASE DO SEARCH FIRST.

1. Check your ```-key xxx``` for at least 3 times, ***MAKE SURE*** both sides share the same secret.
2. ```-nocomp, -datashard, -parityshard, -key, -crypt``` ***must be the same*** on both side.
2. ```-nocomp, -datashard, -parityshard, -key, -crypt, -smuxver, -QPP -QPPCount``` ***must be the same*** on both side.
3. Did you correctly set the ***-target*** on the server side?
4. ***MAKE SURE*** ```telnet target port``` on your server successful(don't ask me why couldn't).
5. Does your ***firewall allows UDP*** communications? (including your ISP Cable-Modem)
6. Are you using the **same version** for both client & server
7. Are you using the **latest release**?
8. Which **OS** do you use?
9. Which end for this issue related to, **client or server**?
4. Did you correctly connected to the listening port on client side?
5. ***MAKE SURE*** ```telnet target port``` on your server successful(don't ask me why couldn't).
6. Does your ***firewall allows UDP*** communications? (including your ISP Cable-Modem)
7. Are you using the **same version** for both client & server
8. Are you using the **latest release**?
9. Which **OS** do you use?
10. Which end for this issue related to, **client or server**?


10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "gomod" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
47 changes: 47 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Release KCPTUN

on:
push:
tags:
- '*'
release:
types: [published]
workflow_dispatch:

jobs:
build_and_push:
runs-on: ubuntu-latest

steps:
- name: Check out the code
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}

- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64, linux/arm64/v8, linux/arm/v7, linux/arm/v6, linux/386
tags: |
${{ steps.meta.outputs.tags }}
ghcr.io/${{ github.repository }}:latest
labels: ${{ steps.meta.outputs.labels }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ _testmain.go
*.prof
client/client
server/server
build/*
.DS_Store
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
language: go
go:
- 1.6
- 1.13.x
before_install:
- go get github.com/mattn/goveralls
- go get golang.org/x/tools/cmd/cover
install:
- go get github.com/xtaci/kcptun/client
- go get github.com/xtaci/kcptun/server
- env GO111MODULE=on go get github.com/xtaci/kcptun/client
- env GO111MODULE=on go get github.com/xtaci/kcptun/server
before_script:
script:
- cd $HOME/gopath/src/github.com/xtaci/kcptun/client
- $HOME/gopath/bin/goveralls -service=travis-ci
- env GO111MODULE=on $HOME/gopath/bin/goveralls -service=travis-ci
- cd $HOME/gopath/src/github.com/xtaci/kcptun/server
- $HOME/gopath/bin/goveralls -service=travis-ci
- env GO111MODULE=on $HOME/gopath/bin/goveralls -service=travis-ci
- exit 0
18 changes: 13 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
FROM golang:alpine
FROM golang:1.21.0-alpine3.18 as builder
MAINTAINER xtaci <daniel820313@gmail.com>
RUN apk update && \
apk upgrade && \
apk add git
RUN go get github.com/xtaci/kcptun/client && go get github.com/xtaci/kcptun/server
LABEL org.opencontainers.image.source=https://github.com/xtaci/kcptun
ENV GO111MODULE=on
RUN apk add git
RUN git clone https://github.com/xtaci/kcptun.git
RUN cd kcptun && \
go build -mod=vendor -ldflags "-X main.VERSION=$(date -u +%Y%m%d) -s -w" -o /client github.com/xtaci/kcptun/client && \
go build -mod=vendor -ldflags "-X main.VERSION=$(date -u +%Y%m%d) -s -w" -o /server github.com/xtaci/kcptun/server

FROM alpine:3.18
RUN apk add --no-cache iptables
COPY --from=builder /client /bin
COPY --from=builder /server /bin
EXPOSE 29900/udp
EXPOSE 12948
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Daniel Fu
Copyright (c) 2016 xtaci

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading