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
fatedier
fdc6902a90
proxy protocol: fix detect method for IPV4 and IPV6
2019-08-26 11:13:33 +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
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
9c4ec56491
support proxy protocol
2019-03-29 19:01:18 +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
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
48990da22e
go vet
2019-01-31 16:49:23 +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
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