曹海迪
05e71a13f2
fix build failed problem after merge
2020-11-07 08:55:18 +08:00
曹海迪
7b5d6913f9
Merge branch '0341'
...
# Conflicts:
# client/admin_api.go
# client/control.go
# client/proxy/proxy.go
# client/service.go
# cmd/frpc/sub/root.go
# pkg/util/log/log_extend.go
# pkg/util/net/kcp.go
# pkg/util/net/udp.go
# server/group/tcp.go
# server/ports/ports.go
# server/service.go
2020-11-06 08:57:59 +08:00
曹海迪
91f120371c
Merge branch 'origin_0.32.0'
...
# Conflicts:
# vendor/github.com/fatedier/golib/net/mux/mux.go
2020-10-11 23:10:34 +08:00
fatedier
3fbdea0f6b
rename models to pkg ( #2005 )
2020-09-23 13:49:14 +08:00
fatedier
262317192c
new e2e framework ( #1835 )
2020-06-02 22:48:55 +08:00
fatedier
8b75b8b837
fix by golint ( #1822 )
2020-05-24 17:48:37 +08:00
Tank
964a1bbf39
refine: frpc flags ( #1811 )
2020-05-19 10:49:29 +08:00
Tank
591023a1f0
fix: add frpc tls_enable flag and frps tls_only flag ( #1798 )
2020-05-12 14:33:34 +08:00
fatedier
1db091b381
tcp multiplexing over http connect tunnel
2020-03-05 21:47:49 +08:00
Guy Lewin
6c6607ae68
feat: add multiple authentication methods, token and oidc.
...
token is the current token comparison, and oidc generates oidc token using client-credentials flow. in addition - add ping verification using the same method
2020-03-01 10:57:01 +08:00
haidy
6e819501d9
frp 0.29.0
2019-10-06 13:27:45 +08:00
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
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
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
96d7e2da6f
add admin UI for frpc
2019-02-01 19:28:05 +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
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
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
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
haidy
0749c2eb4d
修改frpc异步执行
2018-05-14 14:37:48 +08:00
haidy
626dbaa92c
更新root.go
2018-05-11 14:21:02 +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
