From bab614da2d31acc7b32f971fa17eaa505c11f098 Mon Sep 17 00:00:00 2001 From: txthinking Date: Sun, 1 Jan 2023 10:46:28 +0800 Subject: [PATCH] v20230101 --- cli/brook/main.go | 89 +++++++++++++++++++-- docs/example-zh.md | 8 +- docs/example.md | 8 +- docs/images/linux.png | Bin 0 -> 4809 bytes docs/index.html | 21 ++--- echoclient.go | 74 ++++++++++++++++++ echoserver.go | 174 ++++++++++++++++++++++++++++++++++++++++++ ping/ping.json | 2 +- socks5test.go | 46 +++++------ 9 files changed, 378 insertions(+), 44 deletions(-) create mode 100644 docs/images/linux.png create mode 100644 echoclient.go create mode 100644 echoserver.go diff --git a/cli/brook/main.go b/cli/brook/main.go index 512be8e4..65b9ee6a 100644 --- a/cli/brook/main.go +++ b/cli/brook/main.go @@ -50,7 +50,7 @@ var debugAddress string func main() { app := cli.NewApp() app.Name = "Brook" - app.Version = "20221212" + app.Version = "20230101" app.Usage = "A cross-platform network tool designed for developers" app.Authors = []*cli.Author{ { @@ -221,7 +221,7 @@ func main() { }, &cli.StringFlag{ Name: "http", - Usage: "Where to listen for HTTP connections", + Usage: "Where to listen for HTTP proxy connections", }, &cli.IntFlag{ Name: "tcpTimeout", @@ -443,7 +443,7 @@ func main() { }, &cli.StringFlag{ Name: "http", - Usage: "Where to listen for HTTP connections", + Usage: "Where to listen for HTTP proxy connections", }, &cli.IntFlag{ Name: "tcpTimeout", @@ -712,7 +712,7 @@ func main() { }, &cli.StringFlag{ Name: "http", - Usage: "Where to listen for HTTP connections", + Usage: "Where to listen for HTTP proxy connections", }, &cli.IntFlag{ Name: "tcpTimeout", @@ -1509,7 +1509,7 @@ func main() { }, &cli.StringFlag{ Name: "http", - Usage: "Where to listen for HTTP connections", + Usage: "Where to listen for HTTP proxy connections", }, &cli.IntFlag{ Name: "tcpTimeout", @@ -2090,7 +2090,12 @@ func main() { var cmd *exec.Cmd var err error go func() { - cmd = exec.Command("brook", "connect", "--link", c.String("link"), "--socks5", c.String("socks5")) + var s string + s, err = os.Executable() + if err != nil { + return + } + cmd = exec.Command(s, "connect", "--link", c.String("link"), "--socks5", c.String("socks5")) b, _ := cmd.CombinedOutput() err = errors.New(string(b)) }() @@ -2103,6 +2108,76 @@ func main() { return err1 }, }, + &cli.Command{ + Name: "echoserver", + Usage: "Echo server, echo UDP and TCP address of routes", + BashComplete: func(c *cli.Context) { + l := c.Command.VisibleFlags() + for _, v := range l { + fmt.Println("--" + v.Names()[0]) + } + }, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "listen", + Aliases: []string{"l"}, + Usage: "Listen address, like: ':7777'", + }, + }, + Action: func(c *cli.Context) error { + if c.String("listen") == "" { + return cli.ShowSubcommandHelp(c) + } + s, err := brook.NewEchoServer(c.String("listen")) + if err != nil { + return err + } + g := runnergroup.New() + g.Add(&runnergroup.Runner{ + Start: func() error { + return s.ListenAndServe() + }, + Stop: func() error { + return s.Shutdown() + }, + }) + go func() { + sigs := make(chan os.Signal, 1) + signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) + <-sigs + g.Done() + }() + return g.Wait() + }, + }, + &cli.Command{ + Name: "echoclient", + Usage: "Connect to echoserver, echo UDP and TCP address of routes", + BashComplete: func(c *cli.Context) { + l := c.Command.VisibleFlags() + for _, v := range l { + fmt.Println("--" + v.Names()[0]) + } + }, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "server", + Aliases: []string{"s"}, + Usage: "Echo server address, such as 1.2.3.4:7777", + }, + &cli.IntFlag{ + Name: "times", + Value: 1, + Usage: "Times of interactions", + }, + }, + Action: func(c *cli.Context) error { + if c.String("server") == "" { + return cli.ShowSubcommandHelp(c) + } + return brook.EchoClient(c.String("server"), c.Int("times")) + }, + }, &cli.Command{ Name: "completion", Usage: "Generate shell completions", @@ -2188,7 +2263,7 @@ complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete brook }, }, &cli.Command{ - Name: "markdown", + Name: "mdpage", Usage: "Generate markdown page", BashComplete: func(c *cli.Context) { l := c.Command.VisibleFlags() diff --git a/docs/example-zh.md b/docs/example-zh.md index 5fc0da5d..ced85b46 100644 --- a/docs/example-zh.md +++ b/docs/example-zh.md @@ -259,7 +259,8 @@ brook dnsserveroverbrook ... --listen 127.0.0.1:53 **无需操作 iptables！** ``` -opkg install ca-certificates openssl-util ca-bundle coreutils-nohup iptables-mod-tproxy +opkg update +opkg install ca-certificates openssl-util ca-bundle coreutils-nohup iptables-mod-tproxy iptables-mod-socket ``` ``` @@ -310,7 +311,10 @@ brook tproxy --link 'brook://...' --dnsListen :53 ### 官网原版 OpenWrt 图形客户端 -> **依赖: ca-certificates openssl-util ca-bundle coreutils-nohup iptables-mod-tproxy** +``` +opkg update +opkg install ca-certificates openssl-util ca-bundle coreutils-nohup iptables-mod-tproxy iptables-mod-socket +``` **无需操作 iptables！** diff --git a/docs/example.md b/docs/example.md index 9b8b554e..aa78b049 100644 --- a/docs/example.md +++ b/docs/example.md @@ -259,7 +259,8 @@ Rule **No need to manipulate iptables!** ``` -opkg install ca-certificates openssl-util ca-bundle coreutils-nohup iptables-mod-tproxy +opkg update +opkg install ca-certificates openssl-util ca-bundle coreutils-nohup iptables iptables-mod-tproxy iptables-mod-socket ``` ``` @@ -310,7 +311,10 @@ brook tproxy --link 'brook://...' --dnsListen :53 ### GUI for official OpenWrt -> **Dependencies: ca-certificates openssl-util ca-bundle coreutils-nohup iptables-mod-tproxy** +``` +opkg update +opkg install ca-certificates openssl-util ca-bundle coreutils-nohup iptables iptables-mod-tproxy iptables-mod-socket +``` **No need to manipulate iptables!** diff --git a/docs/images/linux.png b/docs/images/linux.png new file mode 100644 index 0000000000000000000000000000000000000000..7e882a5da099c9f10b5cf39cfda90169c74d546b GIT binary patch literal 4809 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 
pacman -S brook
@@ -217,16 +217,19 @@
Windows EXE
- +
- -
OpenWrt IPK
+ +
Linux GUI
 - deps + +
- -
Chrome EXT
+ +
OpenWrt IPK
 @@ -284,9 +287,9 @@
{{ zh ? '移除某个开机命令' : 'Remove one added command' }}
-