Commit Graph

858 Commits

Author SHA1 Message Date
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 6e57135533 typo 2016-03-17 17:52:59 +08:00
fatedier 931c102668 fix bug in Dockerfile 2016-03-17 17:47:41 +08:00
fatedier 5700101c0e doc: typo 2016-03-17 11:04:40 +08:00
fatedier 90349a48b0 doc: update version in doc to v0.2.0 2016-03-17 10:49:38 +08:00
fatedier 51114f2afd Merge pull request #7 from fatedier/dev
Release version 0.2.0
2016-03-17 10:45:04 +08:00
fatedier f130886f69 all: change heartbeat interval time 2016-03-17 10:25:23 +08:00
fatedier cdd79aee52 add Dockerfile 2016-03-16 17:20:53 +08:00
fatedier 30d79e66be test: typo 2016-03-15 18:53:27 +08:00
fatedier 5c6f03afcf test: typo 2016-03-15 18:50:49 +08:00
fatedier 8ed55e1288 test: improve test case 2016-03-15 18:45:57 +08:00
fatedier a52e77f6ed doc: update README.md for Contributing 2016-03-14 16:18:29 +08:00
fatedier d1c3badce2 doc: add quick_start_en.md 2016-03-14 16:11:02 +08:00
fatedier 95ae70234d Update quick_start_zh.md 2016-03-14 15:42:29 +08:00
fatedier a092af28a6 Update quick_start_zh.md 2016-03-14 15:30:23 +08:00
fatedier 9f5465b08d Update quick_start_zh.md 2016-03-14 15:29:43 +08:00
fatedier d9bca30c9b Update README.md 2016-03-14 15:27:54 +08:00
fatedier d03f2753d0 doc: add quick_start_zh.md 2016-03-14 15:26:26 +08:00
fatedier db3abd304e doc: update architecture.png 2016-03-14 14:31:48 +08:00
fatedier b4acba9480 doc: add architecture.png 2016-03-14 14:28:37 +08:00
fatedier 6e458229f6 add license info 2016-03-14 11:18:24 +08:00
fatedier a56b29b153 add support for command line with frpc 2016-03-14 00:48:22 +08:00
fatedier 3218eda481 models/server: fix bug, program will core if listener is nil 2016-03-14 00:39:32 +08:00
fatedier 975c2a97c8 add support for command line 2016-03-14 00:21:40 +08:00
fatedier 838dc10c6e [utils/version] add version.go 2016-03-07 01:19:07 +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
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