cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
937 Commits 3 Branches 105 Tags 84 MiB
7b5d6913f9
Commit Graph

66 Commits

Author SHA1 Message Date
曹海迪
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
曹海迪
5c57b914a4 Merge branch '0321' 
# Conflicts:
#	client/control.go
 2020-11-06 08:29:19 +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
lonwern
0f8040b875
fix create tls work connection (#2013) 2020-09-29 15:44:52 +08:00
fatedier
3fbdea0f6b
rename models to pkg (#2005) 2020-09-23 13:49:14 +08:00
yuyulei
4fff3c7472
Add tls configuration to both client and server (#1974) 2020-09-18 19:58:58 +08:00
fatedier
8b75b8b837
fix by golint (#1822) 2020-05-24 17:48:37 +08:00
Tank
caa6e8cf01
fix: frpc reconnect frps frequently lead to memory leak (#1722) 2020-04-02 10:58:37 +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
曹海迪
575b7d569b frp 0.31.2 2020-02-17 10:56:45 +08:00
haidy
2c1eaf2faf Merge branch 'frp/master' 
# Conflicts:
#	client/control.go
#	client/proxy/proxy.go
#	client/service.go
#	client/visitor.go
#	server/service.go
#	utils/net/listener.go
#	utils/net/tcp.go
 2019-12-18 22:01:34 +08:00
fatedier
649f47c345 change log method 2019-10-12 20:13:12 +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
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
fatedier
9c4ec56491 support proxy protocol 2019-03-29 19:01:18 +08:00
haidy
003682366c 修复崩溃的bug 2019-03-24 09:29:38 +08:00
haidy
1eb4a917fe 升级到 0.25.1 2019-03-24 08:33:36 +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
fatedier
d812488767 support tls connection 2019-03-11 14:14:31 +08:00
haidy
fb756e03de 修复内存泄漏的问题 2019-03-07 21:45:38 +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
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
35278ad17f mv folders 2018-12-09 22:06:22 +08:00
fatedier
08c17c3247 frpc: support health check 2018-12-07 18:40:17 +08:00
fatedier
b33ea9274c client/control: refactor code 2018-11-06 18:35:05 +08:00
fatedier
698219b621 frpc: support health check 2018-09-11 18:33:02 +08:00
fatedier
c33b5152e7 split visitors from proxies and add health check config 2018-06-25 18:22:35 +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
de3b19cbb2 更新frpc 2018-05-16 14:15:08 +08:00
Haidy
9d383a5b5b 更新代码 2018-05-16 01:11:43 +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
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
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
fatedier
3f6799c06a add remoteAddr in NewProxyResp message 2018-01-17 15:01:26 +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
0559865fe5 support xtcp for making nat hole 2017-10-25 01:27:04 +08:00
fatedier
d246400a71 frpc: add admin server for reload configure file 2017-07-13 02:20:49 +08:00