Commit Graph

7 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
649f47c345 change log method 2019-10-12 20:13:12 +08:00
haidy
f2512f8fce support ipv6 2019-01-04 22:21:57 +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
1e905839f0 update kcp connection options 2017-10-25 03:02:25 +08:00
fatedier
0559865fe5 support xtcp for making nat hole 2017-10-25 01:27:04 +08:00
fatedier
80ba931326 support protocol kcp 2017-06-04 19:56:21 +08:00