Skip to content

Commit

Permalink
add $ brook tunnel fixed txthinking#102
Browse files Browse the repository at this point in the history
  • Loading branch information
@txthinking
txthinking committed Jan 12, 2018
1 parent 61d84b3 commit 7facbe9
Show file tree
Hide file tree
Showing 11 changed files with 432 additions and 578 deletions.
52 changes: 26 additions & 26 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,11 @@
</p>

---
### New features (v20171111)

* **New Brook Protocol, TCP/UDP full supported**
* Brook Stream Protocol, TCP/UDP full supported
* Shadowsocks Protocol, TCP/UDP full supported
### New features (v20180112)

### Breaking change (v20171111)
* New command: $ brook tunnel. [#102](https://github.com/txthinking/brook/issues/102)

* Rename orignal brook protocol to `Brook Stream`, `$ brook streamserver`, `$ brook streamclient`. Music removed
* Many command arguments changed
* If you use shadowsocks protocol on Brook Android, your shadowsocks server must full support UDP
* Thanks to shdowsocks AEAD
---

### Table of Contents
Expand All @@ -43,23 +36,29 @@ Brook's goal is to reduce the configuration steps. Keep it simple, stupid.

| Download | Server/Client | OS | Arch | Remark |
| --- | --- | --- | --- | --- |
| [brook](https://github.com/txthinking/brook/releases/download/v20171113/brook) | Server & Client | Linux | amd64 | CLI |
| [brook_linux_386](https://github.com/txthinking/brook/releases/download/v20171113/brook_linux_386) | Server & Client | Linux | 386 | CLI |
| [brook_linux_arm64](https://github.com/txthinking/brook/releases/download/v20171113/brook_linux_arm64) | Server & Client | Linux | arm64 | CLI |
| [brook_linux_arm5](https://github.com/txthinking/brook/releases/download/v20171113/brook_linux_arm5) | Server & Client | Linux | arm5 | CLI |
| [brook_linux_arm6](https://github.com/txthinking/brook/releases/download/v20171113/brook_linux_arm6) | Server & Client | Linux | arm6 | CLI |
| [brook_linux_arm7](https://github.com/txthinking/brook/releases/download/v20171113/brook_linux_arm7) | Server & Client | Linux | arm7 | CLI |
| [brook_macos_amd64](https://github.com/txthinking/brook/releases/download/v20171113/brook_macos_amd64) | Server & Client | MacOS | amd64 | CLI |
| [brook_windows_amd64.exe](https://github.com/txthinking/brook/releases/download/v20171113/brook_windows_amd64.exe) | Server & Client | Windows | amd64 | CLI |
| [brook_windows_386.exe](https://github.com/txthinking/brook/releases/download/v20171113/brook_windows_386.exe) | Server & Client | Windows | 386 | CLI |
| [Brook.app.zip](https://github.com/txthinking/brook/releases/download/v20171113/Brook.app.zip) | Client | MacOS | amd64 | GUI |
| [Brook.app.white.zip](https://github.com/txthinking/brook/releases/download/v20171113/Brook.app.white.zip) | Client(white icon) | MacOS | amd64 | GUI |
| [Brook.exe](https://github.com/txthinking/brook/releases/download/v20171113/Brook.exe) | Client | Windows | amd64 | GUI |
| [Brook.white.exe](https://github.com/txthinking/brook/releases/download/v20171113/Brook.white.exe) | Client(white icon) | Windows | amd64 | GUI |
| [Brook.386.exe](https://github.com/txthinking/brook/releases/download/v20171113/Brook.386.exe) | Client | Windows | 386 | GUI |
| [Brook.386.white.exe](https://github.com/txthinking/brook/releases/download/v20171113/Brook.386.white.exe) | Client(white icon) | Windows | 386 | GUI |
| [brook](https://github.com/txthinking/brook/releases/download/v20180112/brook) | Server & Client | Linux | amd64 | CLI |
| [brook_linux_386](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_386) | Server & Client | Linux | 386 | CLI |
| [brook_linux_arm64](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_arm64) | Server & Client | Linux | arm64 | CLI |
| [brook_linux_arm5](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_arm5) | Server & Client | Linux | arm5 | CLI |
| [brook_linux_arm6](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_arm6) | Server & Client | Linux | arm6 | CLI |
| [brook_linux_arm7](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_arm7) | Server & Client | Linux | arm7 | CLI |
| [brook_linux_mips](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_mips) | Server & Client | Linux | mips | CLI |
| [brook_linux_mipsle](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_mipsle) | Server & Client | Linux | mipsle | CLI |
| [brook_linux_mips64](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_mips64) | Server & Client | Linux | mips64 | CLI |
| [brook_linux_mips64le](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_mips64le) | Server & Client | Linux | mips64le | CLI |
| [brook_linux_ppc64](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_ppc64) | Server & Client | Linux | ppc64 | CLI |
| [brook_linux_ppc64le](https://github.com/txthinking/brook/releases/download/v20180112/brook_linux_ppc64le) | Server & Client | Linux | ppc64le | CLI |
| [brook_macos_amd64](https://github.com/txthinking/brook/releases/download/v20180112/brook_macos_amd64) | Server & Client | MacOS | amd64 | CLI |
| [brook_windows_amd64.exe](https://github.com/txthinking/brook/releases/download/v20180112/brook_windows_amd64.exe) | Server & Client | Windows | amd64 | CLI |
| [brook_windows_386.exe](https://github.com/txthinking/brook/releases/download/v20180112/brook_windows_386.exe) | Server & Client | Windows | 386 | CLI |
| [Brook.app.zip](https://github.com/txthinking/brook/releases/download/v20180112/Brook.app.zip) | Client | MacOS | amd64 | GUI |
| [Brook.app.white.zip](https://github.com/txthinking/brook/releases/download/v20180112/Brook.app.white.zip) | Client(white icon) | MacOS | amd64 | GUI |
| [Brook.exe](https://github.com/txthinking/brook/releases/download/v20180112/Brook.exe) | Client | Windows | amd64 | GUI |
| [Brook.white.exe](https://github.com/txthinking/brook/releases/download/v20180112/Brook.white.exe) | Client(white icon) | Windows | amd64 | GUI |
| [Brook.386.exe](https://github.com/txthinking/brook/releases/download/v20180112/Brook.386.exe) | Client | Windows | 386 | GUI |
| [Brook.386.white.exe](https://github.com/txthinking/brook/releases/download/v20180112/Brook.386.white.exe) | Client(white icon) | Windows | 386 | GUI |
| [App Store](https://itunes.apple.com/us/app/brook-brook-shadowsocks-vpn-proxy/id1216002642) | Client | iOS | - | GUI |
| [Google Play](https://play.google.com/store/apps/details?id=com.txthinking.brook) / [Brook.apk](https://github.com/txthinking/brook/releases/download/v20171113/Brook.apk) | Client | Android | - | GUI |
| [Google Play](https://play.google.com/store/apps/details?id=com.txthinking.brook) / [Brook.apk](https://github.com/txthinking/brook/releases/download/v20180112/Brook.apk) | Client | Android | - | GUI |

**See [wiki](https://github.com/txthinking/brook/wiki) for more tutorials**

Expand All @@ -73,7 +72,7 @@ USAGE:
brook [global options] command [command options] [arguments...]
VERSION:
20171113
20180112
AUTHOR:
Cloud <[email protected]>
Expand All @@ -82,6 +81,7 @@ COMMANDS:
server Run as server mode
servers Run as multiple servers mode
client Run as client mode
tunnel Run as tunnel mode
streamserver Run as server mode
streamservers Run as multiple servers mode
streamclient Run as client mode
Expand Down
6 changes: 6 additions & 0 deletions cli/brook/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ brook_linux_arm5
brook_macos_amd64
brook_windows_amd64.exe
brook_windows_386.exe
brook_linux_mips
brook_linux_mipsle
brook_linux_mips64
brook_linux_mips64le
brook_linux_ppc64
brook_linux_ppc64le
6 changes: 6 additions & 0 deletions cli/brook/buildAll.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ GOOS=linux GOARCH=arm64 go build -o brook_linux_arm64 .
GOOS=linux GOARCH=arm GOARM=7 go build -o brook_linux_arm7 .
GOOS=linux GOARCH=arm GOARM=6 go build -o brook_linux_arm6 .
GOOS=linux GOARCH=arm GOARM=5 go build -o brook_linux_arm5 .
GOOS=linux GOARCH=mips go build -o brook_linux_mips .
GOOS=linux GOARCH=mipsle go build -o brook_linux_mipsle .
GOOS=linux GOARCH=mips64 go build -o brook_linux_mips64 .
GOOS=linux GOARCH=mips64le go build -o brook_linux_mips64le .
GOOS=linux GOARCH=ppc64 go build -o brook_linux_ppc64 .
GOOS=linux GOARCH=ppc64le go build -o brook_linux_ppc64le .
GOOS=darwin GOARCH=amd64 go build -o brook_macos_amd64 .
GOOS=windows GOARCH=amd64 go build -o brook_windows_amd64.exe .
GOOS=windows GOARCH=386 go build -o brook_windows_386.exe .
55 changes: 51 additions & 4 deletions cli/brook/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var debugAddress string
func main() {
app := cli.NewApp()
app.Name = "Brook"
app.Version = "20171113"
app.Version = "20180112"
app.Usage = "A Cross-Platform Proxy Software"
app.Author = "Cloud"
app.Email = "[email protected]"
Expand Down Expand Up @@ -56,7 +56,7 @@ func main() {
},
cli.IntFlag{
Name: "tcpDeadline",
Value: 60,
Value: 0,
Usage: "connection deadline time (s)",
},
cli.IntFlag{
Expand Down Expand Up @@ -91,7 +91,7 @@ func main() {
},
cli.IntFlag{
Name: "tcpDeadline",
Value: 60,
Value: 0,
Usage: "connection deadline time (s)",
},
cli.IntFlag{
Expand Down Expand Up @@ -151,7 +151,7 @@ func main() {
},
cli.IntFlag{
Name: "tcpDeadline",
Value: 60,
Value: 0,
Usage: "connection deadline time (s)",
},
cli.IntFlag{
Expand Down Expand Up @@ -183,6 +183,53 @@ func main() {
return brook.RunClient(c.String("listen"), c.String("ip"), c.String("server"), c.String("password"), c.Int("tcpTimeout"), c.Int("tcpDeadline"), c.Int("udpDeadline"), c.Int("udpSessionTime"))
},
},
cli.Command{
Name: "tunnel",
Usage: "Run as tunnel mode",
Flags: []cli.Flag{
cli.StringFlag{
Name: "listen, l",
Usage: "Client listen address, like: 127.0.0.1:1080",
},
cli.StringFlag{
Name: "to, t",
Usage: "Tunnel to where, like: 8.8.8.8:53",
},
cli.StringFlag{
Name: "server, s",
Usage: "Server address, like: 1.2.3.4:1080",
},
cli.StringFlag{
Name: "password, p",
Usage: "Server password",
},
cli.IntFlag{
Name: "tcpTimeout",
Value: 60,
Usage: "connection tcp keepalive timeout (s)",
},
cli.IntFlag{
Name: "tcpDeadline",
Value: 0,
Usage: "connection deadline time (s)",
},
cli.IntFlag{
Name: "udpDeadline",
Value: 60,
Usage: "connection deadline time (s)",
},
},
Action: func(c *cli.Context) error {
if c.String("listen") == "" || c.String("to") == "" || c.String("server") == "" || c.String("password") == "" {
cli.ShowCommandHelp(c, "client")
return nil
}
if debug {
enableDebug()
}
return brook.RunTunnel(c.String("listen"), c.String("to"), c.String("server"), c.String("password"), c.Int("tcpTimeout"), c.Int("tcpDeadline"), c.Int("udpDeadline"))
},
},
cli.Command{
Name: "streamserver",
Usage: "Run as server mode",
Expand Down
1 change: 0 additions & 1 deletion client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ func (x *Client) ListenAndServeHTTP(m HTTPMiddleman) error {

// HTTPHandle handle http request
func (x *Client) HTTPHandle(c *net.TCPConn) error {
log.Println("Got http connection")
b := make([]byte, 0, 1024)
for {
var b1 [1024]byte
Expand Down
Loading

0 comments on commit 7facbe9

Please sign in to comment.