OrgGo
/
frp
mirror of https://github.com/fatedier/frp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
718 Commits 2 Branches 101 Tags 80 MiB
Commit Graph

718 Commits

Author SHA1 Message Date
fatedier 30da2a2d15 Merge branch 'Hurricanezwf-fix_some_bugs' into dev 2016-02-18 11:43:19 +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 60c9804776 format代码 2016-02-05 16:49:52 +08:00
Hurricanezwf 04c26d1c31 (1)新增心跳检测发送间隔和超时时间的配置 2016-02-05 14:36:04 +08:00
Hurricanezwf 5d6f37aa82 (1)优化重连和心跳检测 2016-02-05 14:18:26 +08:00
Hurricanezwf af6fc61537 (1)新增client向server发送心跳检测 2016-02-04 11:29:04 +08:00
Hurricanezwf f065562ec3 (1)分离出连接服务器的逻辑 (2)新增client断线重连功能 2016-02-04 10:55:10 +08:00
fatedier fa9356936b Use go fmt before build 2016-02-03 18:46:24 +08:00
fatedier bdcdafd768 Add travis-ci build status in README.md 2016-02-03 18:40:46 +08:00
fatedier 79195d7177 Change internal package import to github/fatedier 2016-02-03 18:23:30 +08:00
fatedier 0b719326bc Support travis-ci 2016-02-03 18:14:16 +08:00
fatedier f427e3bc33 Merge pull request #2 from vashstorm/master 
Add crypto module
 2016-02-03 14:38:46 +08:00
hp b77738e619 add ppcrypto_test 2016-02-03 11:46:12 +08:00
hp fe806500e9 add pcrupto.go 2016-02-03 11:07:36 +08:00
fatedier 793624c379 Merge pull request #1 from fatedier/master 
First available commit
 2016-01-27 21:29:18 +08:00
fatedier 7030d16e80 First available commit 2016-01-27 21:24:36 +08:00
fatedier 7ea8751e56 Create README.md 2015-12-21 23:25:54 +08:00
fatedier 13d61956db Initial commit 2015-12-21 23:24:59 +08:00