nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-30 00:01:19 +00:00
Code Releases Activity

go: Update Go to 1.7.3, patch DNS (fixes #723)

Browse source
This commit is contained in:
Audrius Butkevicius 2016-11-30 21:42:58 +00:00
parent c72d0b64ef
commit 6f01894c67
2 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/golang/go

@ -1 +1 @@
Subproject commit 57e459e02b4b01567f92542f92cd9afde209e193 Subproject commit 2f6557233c5a5c311547144c34b4045640ff9f71

71
patches/golang/all/dns.patch
View file

@ -1,37 +1,22 @@
diff --git a/net/dnsclient_unix.go b/net/dnsclient_unix.go --- /net/dnsconfig_unix.go 2016-08-20 08:14:05.763235602 -0400
index 17188f0..15a1663 100644 +++ /net/dnsconfig_unix.go 2016-08-20 08:14:05.763235602 -0400
--- a/net/dnsclient_unix.go @@ -9,15 +9,58 @@
+++ b/net/dnsclient_unix.go
@@ -279,12 +279,6 @@ func (conf *resolverConfig) tryUpdate(name string) {
return
}
conf.modTime = fi.ModTime()
- } else {
- // If modTime wasn't set prior, assume nothing has changed.
- if conf.modTime.IsZero() {
- return
- }
- conf.modTime = time.Time{}
}
dnsConf := dnsReadConfig(name)
diff --git a/net/dnsconfig_unix.go b/net/dnsconfig_unix.go
index 6073fdb..bd6ca41 100644
--- a/net/dnsconfig_unix.go
+++ b/net/dnsconfig_unix.go
@@ -8,7 +8,53 @@
package net package net
-var defaultNS = []string{"127.0.0.1", "::1"} import (
+import (
+ "fmt" + "fmt"
"os"
+ "os/exec" + "os/exec"
+ "strings" + "strings"
+) "time"
+ )
+var currentNS []string
+ var (
- defaultNS = []string{"127.0.0.1:53", "[::1]:53"}
+ currentNS []string
getHostname = os.Hostname // variable for testing
)
+func getDefaultNS() []string { +func getDefaultNS() []string {
+ var servers []string + var servers []string
+ for _, prop := range []string{"net.dns1", "net.dns2"} { + for _, prop := range []string{"net.dns1", "net.dns2"} {
@ -42,12 +27,12 @@ index 6073fdb..bd6ca41 100644
+ } + }
+ output := strings.Trim(string(outputBytes), "\n") + output := strings.Trim(string(outputBytes), "\n")
+ if ParseIP(output) != nil { + if ParseIP(output) != nil {
+ servers = append(servers, output) + servers = append(servers, output + ":53")
+ } + }
+ } + }
+ +
+ if len(servers) == 0 { + if len(servers) == 0 {
+ servers = []string{"8.8.8.8", "8.8.4.4", "4.2.2.1"} + servers = []string{"8.8.8.8:53", "8.8.4.4:53", "4.2.2.1:53"}
+ } + }
+ +
+ if !slicesEqual(currentNS, servers) { + if !slicesEqual(currentNS, servers) {
@ -71,24 +56,34 @@ index 6073fdb..bd6ca41 100644
+ +
+ return true + return true
+} +}
+
type dnsConfig struct { type dnsConfig struct {
servers []string // servers to use servers []string // server addresses (in host:port form) to use
@@ -33,7 +79,7 @@ func dnsReadConfig(filename string) *dnsConfig { search []string // rooted suffixes to append to local name
@@ -40,7 +83,7 @@
} }
file, err := open(filename) file, err := open(filename)
if err != nil { if err != nil {
- conf.servers = defaultNS - conf.servers = defaultNS
+ conf.servers = getDefaultNS() + conf.servers = getDefaultNS()
conf.search = dnsDefaultSearch()
conf.err = err conf.err = err
return conf return conf
} @@ -49,7 +92,7 @@
@@ -110,7 +156,7 @@ func dnsReadConfig(filename string) *dnsConfig { if fi, err := file.file.Stat(); err == nil {
conf.mtime = fi.ModTime()
} else {
- conf.servers = defaultNS
+ conf.servers = getDefaultNS()
conf.search = dnsDefaultSearch()
conf.err = err
return conf
@@ -126,7 +169,7 @@
} }
} }
if len(conf.servers) == 0 { if len(conf.servers) == 0 {
- conf.servers = defaultNS - conf.servers = defaultNS
+ conf.servers = getDefaultNS() + conf.servers = getDefaultNS()
} }
return conf if len(conf.search) == 0 {
} conf.search = dnsDefaultSearch()