From a8d4e8d7ca9edeb7bf055b5a33024b4b70e02a54 Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Sat, 8 Jan 2022 23:57:30 +0800 Subject: [PATCH] chore: update documents --- .goreleaser.yml | 1 - README.md | 4 ++-- proxy/direct.go | 8 +++----- proxy/mixed/mixed.go | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 42514a6..a280daa 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -39,7 +39,6 @@ builds: - mipsle - mips64 - mips64le - - riscv64 goarm: - 6 - 7 diff --git a/README.md b/README.md index f253673..e2e92ac 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Go Report Card](https://goreportcard.com/badge/github.com/nadoo/glider?style=flat-square)](https://goreportcard.com/report/github.com/nadoo/glider) [![GitHub release](https://img.shields.io/github/v/release/nadoo/glider.svg?style=flat-square&include_prereleases)](https://github.com/nadoo/glider/releases) [![Actions Status](https://img.shields.io/github/workflow/status/nadoo/glider/Build?style=flat-square)](https://github.com/nadoo/glider/actions) +[![Go Version](https://img.shields.io/github/go-mod/go-version/nadoo/glider?style=flat-square)](https://go.dev/dl/) glider is a forward proxy with multiple protocols support, and also a dns/dhcp server with ipset management features(like dnsmasq). @@ -100,7 +101,7 @@ glider -h click to see details ```bash -glider 0.15.2 usage: +glider 0.15.3 usage: -check string check=tcp[://HOST:PORT]: tcp port connect check check=http://HOST[:PORT][/URI][#expect=REGEX_MATCH_IN_RESP_LINE] @@ -227,7 +228,6 @@ Trojan server scheme: trojan://pass@host:port?cert=PATH&key=PATH[&fallback=127.0.0.1] trojanc://pass@host:port[?fallback=127.0.0.1] (cleartext, without TLS) - TLS client scheme: tls://host:port[?serverName=SERVERNAME][&skipVerify=true][&cert=PATH][&alpn=proto1][&alpn=proto2] diff --git a/proxy/direct.go b/proxy/direct.go index a3fd276..dc5c3ed 100644 --- a/proxy/direct.go +++ b/proxy/direct.go @@ -131,14 +131,12 @@ func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) // IFaceIPs returns ip addresses according to the specified interface. func (d *Direct) IFaceIPs() (ips []net.IP) { - ipnets, err := d.iface.Addrs() + ipNets, err := d.iface.Addrs() if err != nil { return } - - for _, ipnet := range ipnets { - ips = append(ips, ipnet.(*net.IPNet).IP) //!ip.IsLinkLocalUnicast() + for _, ipNet := range ipNets { + ips = append(ips, ipNet.(*net.IPNet).IP) //!ip.IsLinkLocalUnicast() } - return } diff --git a/proxy/mixed/mixed.go b/proxy/mixed/mixed.go index 6a0e52e..683a4b0 100644 --- a/proxy/mixed/mixed.go +++ b/proxy/mixed/mixed.go @@ -64,7 +64,7 @@ func (m *Mixed) ListenAndServe() { return } - log.F("[mixed] listening TCP on %s", m.addr) + log.F("[mixed] http & socks5 server listening TCP on %s", m.addr) for { c, err := l.Accept()