haidy
59aa7cd710
Merge branch 'frp/master'
...
# Conflicts:
# client/admin_api.go
# client/control.go
# client/proxy/proxy.go
# client/service.go
# client/visitor.go
# cmd/frpc/sub/root.go
# server/service.go
2019-10-03 14:19:23 +08:00
Tyler Compton
666f122a72
Pass client configuration as an argument
...
The ClientCommonConf, configuration file path, and server UDP port are
now passed around as arguments instead of being shared between
components as global variables. This allows for multiple clients to
exist in the same process, and allows client.Session to be used as a
library more easily.
2019-08-20 14:08:01 -07:00
fatedier
388b016842
support disable_log_color for console mode
2019-08-12 00:47:35 +08:00
haidy
d320d7c030
frp client
2019-08-03 21:25:48 +08:00
haidy
d3f88fe5ea
Merge branch 'frp/master'
...
# Conflicts:
# server/service.go
2019-07-20 13:05:28 +08:00
Jiajun Huang
2d24879fa3
fix
2019-05-31 15:56:05 +08:00
Jiajun Huang
75383a95b3
resp.Body must be closed after function return
...
whether it's success or fail, otherwise it will cause memory leak
ref: https://golang.org/pkg/net/http/
2019-05-30 22:32:36 +08:00
haidy
10091ba351
Merge branch 'frp/master'
...
# Conflicts:
# client/control.go
# client/proxy/proxy.go
2019-04-17 21:49:35 +08:00
fatedier
7f9d88c10a
fix
2019-04-08 15:39:14 +08:00
haidy
d51527959b
Merge branch 'frp/master'
...
# Conflicts:
# client/control.go
# client/proxy/proxy.go
# client/service.go
# client/visitor.go
# server/service.go
2019-03-24 08:30:06 +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
ba45d29b7c
fix xtcp cmd
2019-03-03 23:44:44 +08:00
fatedier
2481dfab64
fix api
2019-02-11 14:37:52 +08:00
fatedier
96d7e2da6f
add admin UI for frpc
2019-02-01 19:28:05 +08:00
haidy
61a3797c55
Merge branch 'frp/master'
2019-01-27 22:10:32 +08:00
fatedier
385c4d3dd5
frpc/cmd: update protocol description
2019-01-26 12:52:12 +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
荒野無燈
a2ccb6c190
frpc: fixup ini config parse problem in sub command status and reload.
2019-01-16 13:12:25 +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
aea9f9fbcc
health: add more ci cases and fix bugs
2018-12-09 21:56:46 +08:00
haidy
f3813c32a0
更新frp接口
2018-11-26 22:28:48 +08:00
fatedier
42ee536dae
add module comments for vgo
2018-06-27 11:46:53 +08:00
fatedier
c33b5152e7
split visitors from proxies and add health check config
2018-06-25 18:22:35 +08:00
haidy
48c763e282
Merge remote-tracking branch 'upstream/master'
2018-05-21 13:13:23 +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
Haidy
db6feaa0ea
修改frpc Exit(0)问题
2018-05-17 00:30:21 +08:00
fatedier
3e349455a0
commands for xtcp, stcp add 'bind_port', fix #767
2018-05-16 23:45:44 +08:00
haidy
de3b19cbb2
更新frpc
2018-05-16 14:15:08 +08:00
Haidy
9d383a5b5b
更新代码
2018-05-16 01:11:43 +08:00
fatedier
01b1df2b91
update cmd help info
2018-05-14 15:01:16 +08:00
haidy
0749c2eb4d
修改frpc异步执行
2018-05-14 14:37:48 +08:00
haidy
626dbaa92c
更新root.go
2018-05-11 14:21:02 +08:00
fatedier
8a6d6c534a
vendor: udpate
2018-05-08 02:13:30 +08:00
fatedier
60ecd1d58c
cmd: change http_user and http_pwd default value to empty
2018-05-03 10:20:09 +08:00
fatedier
9abbe33790
typo
2018-04-24 01:51:52 +08:00
fatedier
00b9ba95ae
frpc: support specify default dns server, close #700
2018-04-23 02:59:40 +08:00
fatedier
0f6f674a64
cmd: support more cli command
2018-04-23 02:00:25 +08:00
fatedier
9e8980429f
typo
2018-02-07 11:39:30 +08:00
fatedier
637ddbce1f
frpc: udpate proxies check and start logic
2018-01-26 00:23:48 +08:00
fatedier
b2c846664d
new feature: assign a random port if remote_port is 0 in type tcp and
...
udp
2018-01-17 22:18:34 +08:00
fatedier
584e098e8e
frpc: add status command
2018-01-17 01:09:33 +08:00
fatedier
bd1e9a3010
update doc and fix vistor -> visitor
2017-12-05 01:34:33 +08:00
fatedier
6320f15a7c
typo for default config file name used for frpc
2017-07-19 22:56:12 +08:00
fatedier
ee9ddf52cd
frpc: support --reload command
2017-07-13 02:30:25 +08:00
fatedier
d246400a71
frpc: add admin server for reload configure file
2017-07-13 02:20:49 +08:00
fatedier
aede4e54f8
close all proxies if protocol = kcp
2017-06-27 01:59:30 +08:00
