bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 09:25:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

general: bump version

Browse Source
This commit is contained in:
nadoo 2019-09-19 18:03:48 +08:00
parent d6d706b5ee
commit 2c4aa26055
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -114,7 +114,7 @@ glider -config CONFIGPATH -listen :8080 -verbose
## Usage ## Usage
```bash ```bash
glider v0.7.0 usage: glider 0.8.0 usage:
-checkinterval int -checkinterval int
proxy check interval(seconds) (default 30) proxy check interval(seconds) (default 30)
-checktimeout int -checktimeout int

6
dns/client.go
View File

@ -123,13 +123,15 @@ func (c *Client) Exchange(reqBytes []byte, clientAddr string, preferTCP bool) ([
} }
// exchange choose a upstream dns server based on qname, communicate with it on the network. // exchange choose a upstream dns server based on qname, communicate with it on the network.
func (c *Client) exchange(qname string, reqBytes []byte, preferTCP bool) (server, network, dialerAddr string, respBytes []byte, err error) { func (c *Client) exchange(qname string, reqBytes []byte, preferTCP bool) (
server, network, dialerAddr string, respBytes []byte, err error) {
// use tcp to connect upstream server default // use tcp to connect upstream server default
network = "tcp" network = "tcp"
dialer := c.proxy.NextDialer(qname + ":53") dialer := c.proxy.NextDialer(qname + ":53")
// if we are resolving the dialer's domain, then use Direct to avoid denpency loop // if we are resolving the dialer's domain, then use Direct to avoid denpency loop
// TODO: dialer.Addr() == "reject", tricky // TODO: dialer.Addr() == "REJECT", tricky
if strings.Contains(dialer.Addr(), qname) || dialer.Addr() == "REJECT" { if strings.Contains(dialer.Addr(), qname) || dialer.Addr() == "REJECT" {
dialer = proxy.Default dialer = proxy.Default
} }

2
main.go
View File

@ -29,7 +29,7 @@ import (
_ "github.com/nadoo/glider/proxy/ws" _ "github.com/nadoo/glider/proxy/ws"
) )
var version = "dev" var version = "0.8.0"
func main() { func main() {
// read configs // read configs

4
rule/config.go
View File

@ -13,7 +13,7 @@ import (
// Config , every rule dialer points to a rule file // Config , every rule dialer points to a rule file
type Config struct { type Config struct {
name string Name string
Forward []string Forward []string
StrategyConfig strategy.Config StrategyConfig strategy.Config
@ -28,7 +28,7 @@ type Config struct {
// NewConfFromFile . // NewConfFromFile .
func NewConfFromFile(ruleFile string) (*Config, error) { func NewConfFromFile(ruleFile string) (*Config, error) {
p := &Config{name: ruleFile} p := &Config{Name: ruleFile}
f := conflag.NewFromFile("rule", ruleFile) f := conflag.NewFromFile("rule", ruleFile)
f.StringSliceUniqVar(&p.Forward, "forward", nil, "forward url, format: SCHEME://[USER|METHOD:PASSWORD@][HOST]:PORT?PARAMS[,SCHEME://[USER|METHOD:PASSWORD@][HOST]:PORT?PARAMS]") f.StringSliceUniqVar(&p.Forward, "forward", nil, "forward url, format: SCHEME://[USER|METHOD:PASSWORD@][HOST]:PORT?PARAMS[,SCHEME://[USER|METHOD:PASSWORD@][HOST]:PORT?PARAMS]")