Commit Graph

87 Commits

Author SHA1 Message Date
haidy
fb756e03de 修复内存泄漏的问题 2019-03-07 21:45:38 +08:00
haidy
512e601cc9 合并最新代码 2019-03-05 22:31:51 +08:00
haidy
b66cd62c0d Merge branch 'frp/master'
# Conflicts:
#	client/admin_api.go
#	cmd/frpc/sub/root.go
2019-03-05 17:09:38 +08:00
fatedier
5bc7fe2cea fix PUT /api/config without token 2019-02-12 14:59:30 +08:00
fatedier
fe403ab328 frpc: update admin_api 2019-02-11 11:26:06 +08:00
fatedier
66555dbb00 frpc admin: not allow empty PUT /api/config body 2019-02-02 11:46:53 +08:00
fatedier
96d7e2da6f add admin UI for frpc 2019-02-01 19:28:05 +08:00
haidy
c1791a31cb Merge branch 'frp/master' 2019-02-01 18:22:54 +08:00
fatedier
d879b8208b frpc: add api PUT api/config 2019-01-31 18:35:44 +08:00
fatedier
3585e456d4 frpc: add api GET api/config 2019-01-31 17:17:34 +08:00
fatedier
48990da22e go vet 2019-01-31 16:49:23 +08:00
fatedier
5a7ef3be74 frpc: reload proxy not saved after reconnecting 2019-01-30 11:12:28 +08:00
haidy
edaaafbf9c Merge branch 'frp/master'
# Conflicts:
#	client/control.go
#	cmd/frpc/sub/root.go
#	server/proxy.go
#	server/service.go
2019-01-17 21:45:16 +08:00
haidy
f2512f8fce support ipv6 2019-01-04 22:21:57 +08:00
caohaidi
594ae40261 修改判断frp状态可能错误的bug 2018-12-27 13:32:20 +08:00
caohaidi
83b9e076f9 修复可能崩溃的bug 2018-12-22 18:59:09 +08:00
haidy
dda7861742 更新至最新代码 2018-12-14 08:50:55 +08:00
haidy
3c114e7cd9 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	client/control.go
#	client/service.go
2018-12-13 22:44:09 +08:00
fatedier
7c21906884 improve kcp shutdown 2018-12-11 15:17:36 +08:00
fatedier
25cfda5768 conf: support render configure file using environment variables 2018-12-11 11:46:12 +08:00
fatedier
35278ad17f mv folders 2018-12-09 22:06:22 +08:00
fatedier
aea9f9fbcc health: add more ci cases and fix bugs 2018-12-09 21:56:46 +08:00
fatedier
08c17c3247 frpc: support health check 2018-12-07 18:40:17 +08:00
haidy
f3813c32a0 更新frp接口 2018-11-26 22:28:48 +08:00
fatedier
b33ea9274c client/control: refactor code 2018-11-06 18:35:05 +08:00
fatedier
1a8ac148ca fix xtcp visitor panic 2018-10-18 13:55:51 +08:00
fatedier
698219b621 frpc: support health check 2018-09-11 18:33:02 +08:00
Haidy
d29e84eb92
Merge pull request #1 from fatedier/master
fork origin
2018-08-19 14:30:04 +08:00
fatedier
c33b5152e7 split visitors from proxies and add health check config 2018-06-25 18:22:35 +08:00
Neo He
bbc36be052 update xtcp log info 2018-06-08 21:27:58 +08:00
haidy
de38d3804d Merge remote-tracking branch 'upstream/master' 2018-06-04 13:18:08 +08:00
haidy
48c763e282 Merge remote-tracking branch 'upstream/master' 2018-05-21 13:13:23 +08:00
fatedier
6eb8146334 frps dashboard add stcp 2018-05-20 19:06:05 +08:00
haidy
183302d27c 修改合并最新代码导致的bug 2018-05-17 16:30:26 +08:00
haidy
c897e3e58d Merge remote-tracking branch 'upstream/master' 2018-05-17 10:45:56 +08:00
fatedier
1a6cbbb2d2 return error quickly if nathole make error 2018-05-17 00:07:56 +08:00
haidy
de3b19cbb2 更新frpc 2018-05-16 14:15:08 +08:00
Haidy
9d383a5b5b 更新代码 2018-05-16 01:11:43 +08:00
haidy
0749c2eb4d 修改frpc异步执行 2018-05-14 14:37:48 +08:00
fatedier
1464836f05 logs panic debug strace info 2018-05-11 12:05:37 +08:00
fatedier
a27e3dda88 vendor: update shutdown 2018-05-08 23:51:13 +08:00
fatedier
1dd7317c06 vendor: add package io 2018-05-08 23:42:04 +08:00
fatedier
8a6d6c534a vendor: udpate 2018-05-08 02:13:30 +08:00
fatedier
f45283dbdb disable yamux default log 2018-05-05 00:09:39 +08:00
fatedier
30af32728a frpc: support connectiong frps by socks5 proxy 2018-05-04 18:36:38 +08:00
fatedier
976cf3e9f8 use yamux instead of smux 2018-04-25 02:42:00 +08:00
fatedier
0f6f674a64 cmd: support more cli command 2018-04-23 02:00:25 +08:00
fatedier
9b990adf96 frpc: add proxy status 'wait start' 2018-01-29 23:51:46 +08:00
fatedier
8e719ff0ff frps: new params max_ports_per_client 2018-01-26 14:56:55 +08:00
fatedier
637ddbce1f frpc: udpate proxies check and start logic 2018-01-26 00:23:48 +08:00