github
/
frp
mirror of https://github.com/fatedier/frp
1
0
Fork 0
Code Issues Releases Wiki Activity
1,233 Commits
3 Branches
101 Tags
80 MiB
Commit Graph

1233 Commits (2855ac71e3fc3fb2859f4c75f97f97e99f131f1b)

Author SHA1 Message Date
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
fatedier 586d63f662 Merge pull request #6 from Hurricanezwf/add_func 
enable client to connect non-local [ip:port]
 2016-02-29 13:16:40 +08:00
Hurricanezwf f02ed95ef1 enable client to connect non-local [ip:port] 2016-02-29 12:38:45 +08:00
fatedier d0a5400a7b Merge pull request #5 from fatedier/dev 
Release version 0.1.0
 2016-02-28 18:01:55 +08:00
fatedier c7b0687b2c Merge pull request #4 from Hurricanezwf/fix_bug 
fix heartbeat bug
 2016-02-26 12:04:10 +08:00
Hurricanezwf a2f1897ab4 add heartbeat echo from server to client 2016-02-26 10:52:22 +08:00
Hurricanezwf b2ca78fa04 Merge pull request #3 from fatedier/dev 
Merge pull request #3 from fatedier/dev
 2016-02-25 17:53:41 +08:00
fatedier 09127a3b55 all: improve the method of import for internal packages 
1. Change directory structure and Makefile to let GOPATH=`pwd`, so wherever the project directory is, just use make to build.
 2016-02-25 17:38:34 +08:00
fatedier f32cc7a840 update go version to 1.5.1 2016-02-25 15:45:27 +08:00
fatedier 42e062b3b5 all: improvement in utils/conn 2016-02-25 10:28:34 +08:00
Hurricanezwf b8620b9e4d Merge pull request #2 from fatedier/dev 
Merge pull request #1 from fatedier/dev
 2016-02-23 12:55:54 +08:00
fatedier 26479cf92a all: fix bug when client shutdown and reconnect, server response already use 
1. if client is offline, server will release all resources
2. use a graceful method to shutdown go net.Listeners
3. add closeFlag for Conn, so startHeartBeat func can exit correctly now
 2016-02-19 17:01:47 +08:00
fatedier 0f7271312a Add package "broadcast" for transmitting message to goroutines at the same time 2016-02-19 00:18:34 +08:00
fatedier 84f8addd6a Move config.go to models/xxx 2016-02-18 18:24:48 +08:00
fatedier 50165053f8 Change directory structure, move models and utils to root directory 2016-02-18 16:56:55 +08:00
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