55 Commits

This Branch

This Branch

All Branches

• 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

  Gogs · 2016-03-22 17:18:05 +08:00
  20afe25ef1
• doc: update version in doc to v0.2.0
  fatedier · 2016-03-17 10:49:38 +08:00
  90349a48b0
• Merge pull request #7 from fatedier/dev

  Release version 0.2.0

  fatedier · 2016-03-17 10:45:04 +08:00
  51114f2afd
• all: change heartbeat interval time
  fatedier · 2016-03-17 10:25:23 +08:00
  f130886f69
• add Dockerfile
  fatedier · 2016-03-16 17:20:53 +08:00
  cdd79aee52
• test: typo
  fatedier · 2016-03-15 18:53:27 +08:00
  30d79e66be
• test: typo
  fatedier · 2016-03-15 18:50:49 +08:00
  5c6f03afcf
• test: improve test case
  fatedier · 2016-03-15 18:45:57 +08:00
  8ed55e1288
• doc: update README.md for Contributing
  fatedier · 2016-03-14 16:18:29 +08:00
  a52e77f6ed
• doc: add quick_start_en.md
  fatedier · 2016-03-14 16:11:02 +08:00
  d1c3badce2
• Update quick_start_zh.md
  fatedier · 2016-03-14 15:42:29 +08:00
  95ae70234d
• Update quick_start_zh.md
  fatedier · 2016-03-14 15:30:23 +08:00
  a092af28a6
• Update quick_start_zh.md
  fatedier · 2016-03-14 15:29:43 +08:00
  9f5465b08d
• Update README.md
  fatedier · 2016-03-14 15:27:54 +08:00
  d9bca30c9b
• doc: add quick_start_zh.md
  fatedier · 2016-03-14 15:26:26 +08:00
  d03f2753d0
• doc: update architecture.png
  fatedier · 2016-03-14 14:31:48 +08:00
  db3abd304e
• doc: add architecture.png
  fatedier · 2016-03-14 14:28:37 +08:00
  b4acba9480
• add license info
  fatedier · 2016-03-14 11:18:24 +08:00
  6e458229f6
• add support for command line with frpc
  fatedier · 2016-03-14 00:48:22 +08:00
  a56b29b153
• models/server: fix bug, program will core if listener is nil
  fatedier · 2016-03-14 00:39:32 +08:00
  3218eda481
• add support for command line
  fatedier · 2016-03-14 00:21:40 +08:00
  975c2a97c8
• [utils/version] add version.go
  fatedier · 2016-03-07 01:19:07 +08:00
  838dc10c6e
• cmd/client: if no local_ip set in proxy config, use 127.0.0.1 as default
  fatedier · 2016-02-29 14:56:47 +08:00
  3cbe432889
• Merge pull request #6 from Hurricanezwf/add_func

  enable client to connect non-local [ip:port]

  fatedier · 2016-02-29 13:16:40 +08:00
  586d63f662
• enable client to connect non-local [ip:port]
  Hurricanezwf · 2016-02-29 12:38:45 +08:00
  f02ed95ef1
• Merge pull request #5 from fatedier/dev

  Release version 0.1.0

  fatedier · 2016-02-28 18:01:55 +08:00
  d0a5400a7b
• Merge pull request #4 from Hurricanezwf/fix_bug

  fix heartbeat bug

  fatedier · 2016-02-26 12:04:10 +08:00
  c7b0687b2c
• add heartbeat echo from server to client
  Hurricanezwf · 2016-02-26 10:52:22 +08:00
  a2f1897ab4
• Merge pull request #3 from fatedier/dev

  Merge pull request #3 from fatedier/dev

  Hurricanezwf · 2016-02-25 17:53:41 +08:00
  b2ca78fa04
• 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.

  fatedier · 2016-02-25 17:38:34 +08:00
  09127a3b55
• update go version to 1.5.1
  fatedier · 2016-02-25 15:45:27 +08:00
  f32cc7a840
• all: improvement in utils/conn
  fatedier · 2016-02-25 10:28:34 +08:00
  42e062b3b5
• Merge pull request #2 from fatedier/dev

  Merge pull request #1 from fatedier/dev

  Hurricanezwf · 2016-02-23 12:55:54 +08:00
  b8620b9e4d
• 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

  fatedier · 2016-02-19 17:01:47 +08:00
  26479cf92a
• Add package "broadcast" for transmitting message to goroutines at the same time
  fatedier · 2016-02-19 00:18:34 +08:00
  0f7271312a
• Move config.go to models/xxx
  fatedier · 2016-02-18 18:24:48 +08:00
  84f8addd6a
• Change directory structure, move models and utils to root directory
  fatedier · 2016-02-18 16:56:55 +08:00
  50165053f8
• Merge branch 'Hurricanezwf-fix_some_bugs' into dev
  fatedier · 2016-02-18 11:43:19 +08:00
  30da2a2d15
• 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

  fatedier · 2016-02-18 11:42:31 +08:00
  e805acd1e3
• format代码
  Hurricanezwf · 2016-02-05 16:49:52 +08:00
  60c9804776
• (1)新增心跳检测发送间隔和超时时间的配置
  Hurricanezwf · 2016-02-05 14:36:04 +08:00
  04c26d1c31
• (1)优化重连和心跳检测
  Hurricanezwf · 2016-02-05 14:18:26 +08:00
  5d6f37aa82
• (1)新增client向server发送心跳检测
  Hurricanezwf · 2016-02-04 11:29:04 +08:00
  af6fc61537
• (1)分离出连接服务器的逻辑 (2)新增client断线重连功能
  Hurricanezwf · 2016-02-04 10:55:10 +08:00
  f065562ec3
• Use go fmt before build
  fatedier · 2016-02-03 18:46:24 +08:00
  fa9356936b
• Add travis-ci build status in README.md
  fatedier · 2016-02-03 18:40:46 +08:00
  bdcdafd768
• Change internal package import to github/fatedier
  fatedier · 2016-02-03 18:23:30 +08:00
  79195d7177
• Support travis-ci
  fatedier · 2016-02-03 18:14:16 +08:00
  0b719326bc
• Merge pull request #2 from vashstorm/master

  Add crypto module

  fatedier · 2016-02-03 14:38:46 +08:00
  f427e3bc33
• add ppcrypto_test
  hp · 2016-02-03 11:46:12 +08:00
  b77738e619