Commit Graph

61 Commits

Author SHA1 Message Date
fatedier
80fc76da52 all: now messages between frps and frpc can be encryped when use_encryption set true 2016-03-31 18:48:18 +08:00
fatedier
45c21b2705 utils/conn: add func joinMore 2016-03-28 11:22:36 +08:00
Gogs
20afe25ef1 modified: src/frp/models/client/client.go
modified:   src/frp/models/server/server.go
	modified:   src/frp/utils/conn/conn.go
	modified:   src/frp/utils/pcrypto/pcrypto.go
	modified:   src/frp/utils/pcrypto/pcrypto_test.go
2016-03-22 17:18:05 +08:00
fatedier
a56b29b153 add support for command line with frpc 2016-03-14 00:48:22 +08:00
fatedier
975c2a97c8 add support for command line 2016-03-14 00:21:40 +08:00
fatedier
3cbe432889 cmd/client: if no local_ip set in proxy config, use 127.0.0.1 as default 2016-02-29 14:56:47 +08:00
Hurricanezwf
f02ed95ef1 enable client to connect non-local [ip:port] 2016-02-29 12:38:45 +08:00
fatedier
42e062b3b5 all: improvement in utils/conn 2016-02-25 10:28:34 +08:00
fatedier
e805acd1e3 Merge branch 'fix_some_bugs' of https://github.com/Hurricanezwf/frp into Hurricanezwf-fix_some_bugs
Conflicts:
	cmd/frpc/config.go
	cmd/frpc/control.go
	cmd/frpc/main.go
	cmd/frps/config.go
	cmd/frps/control.go
	cmd/frps/main.go
	pkg/models/server.go
2016-02-18 11:42:31 +08:00
Hurricanezwf
04c26d1c31 (1)新增心跳检测发送间隔和超时时间的配置 2016-02-05 14:36:04 +08:00
fatedier
7030d16e80 First available commit 2016-01-27 21:24:36 +08:00