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

121 Commits

Author SHA1 Message Date
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
12cc53d699 update bandwidth_limit 2019-11-09 01:13:30 +08:00
fatedier
6da093a402 support bandwith limit for one proxy 2019-11-03 01:20:49 +08:00
fatedier
649f47c345 change log method 2019-10-12 20:13:12 +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
haidy
64427f8e38 cmd 2019-10-03 14:09:46 +08:00
fatedier
5dc8175fc8
Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption 
fix #1347:  bad encryption and compression when use xtcp
 2019-09-01 20:49:13 +08:00
zhouwenfeng
dc6a5a29c1 fix bad encryption and compression when use xtcp 2019-08-31 21:24:20 +08:00
fatedier
fdc6902a90 proxy protocol: fix detect method for IPV4 and IPV6 2019-08-26 11:13:33 +08:00
Tyler Compton
4dfd851c46 Add docs for common config fields & sessions 
Now that the common configuration objects and session objects are part
of a public API, they need to be documented in a way that can be read
with godoc. This commit should lead to easier development with FRP as a
library.
 2019-08-24 15:20:34 -07: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
Tyler Compton
bc46e3330a Add an "assets_dir" option for frpc 
This option allows users to specify where they want assets to be loaded
from, like the "assets_dir" option that already exists for frps. This
allows library users to use the admin panel without having to bundle
assets with statik.
 2019-08-19 16:51:03 -07:00
Tyler Compton
00bd0a8af4 Load assets for dashboard/admin panel on demand 
The client and server services now only attempt to load assets if the
dashboard or admin panel are enabled. This change makes it possible to
use FRP as a library without having to manage assets. If a library user
wants to start a server with the dashboard enabled, they will need to
set the DashboardPort and AssetsDir fields of ServerCommonConf.
 2019-08-19 10:10:50 -07:00
haidy
b86ff20d5a Merge branch 'frp/master' 
# Conflicts:
#	client/service.go
#	server/group/tcp.go
#	server/service.go
 2019-08-13 22:16:51 +08:00
fatedier
757b3613fe fix health check bug, fix #1367 2019-08-09 12:47:27 +08:00
haidy
d320d7c030 frp client 2019-08-03 21:25:48 +08:00
fatedier
394af08561 close session in login() 2019-08-03 16:43:21 +08:00
fatedier
5680a88267 fix connection leak when login_fail_exit is false, fix #1335 2019-07-31 00:50:38 +08:00
haidy
cefd81e873 Merge branch 'frp/master' 2019-04-27 12:01:38 +08:00
fatedier
6a1f15b25e support proxy protocol in unix_domain_socket 2019-04-25 12:01:57 +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
b7a73d3469 support proxy protocol for type http 2019-04-10 10:51:01 +08:00
fatedier
7f9d88c10a fix 2019-04-08 15:39:14 +08:00
haidy
cfb520379f Merge branch 'frp/master' 2019-03-30 11:40:02 +08:00
fatedier
9c4ec56491 support proxy protocol 2019-03-29 19:01:18 +08:00
fatedier
9ac8f2a047 fix health check unclosed resp body, fix #1155 2019-03-25 18:17:33 +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
e691a40260 improve the stability of xtcp 2019-03-11 15:53:58 +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
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
3df27b9c04 xtcp: wrap yamux on kcp connections 2019-03-05 11:18:17 +08:00
fatedier
ba45d29b7c fix xtcp cmd 2019-03-03 23:44:44 +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