Commit Graph

8 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
8a6d6c534a vendor: udpate 2018-05-08 02:13:30 +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
54bbfe26b0 support udp 2017-03-13 02:44:47 +08:00
fatedier
a1023fdfc2 add more log 2017-03-12 03:22:35 +08:00
fatedier
88083d21e8 start refactoring 2017-03-09 22:44:42 +08:00