perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2375 from AudriusButkevicius/proxy

Browse Source 
Add proxy support (fixes #271)
This commit is contained in:
Jakob Borg
2015-10-18 08:45:17 +02:00
parent 29b0017445 e4e3c19e96
commit 175340522f
21 changed files with 798 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/syncthing/main.go
View File

@@ -30,6 +30,7 @@ import (
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/connections"
"github.com/syncthing/syncthing/lib/db"
"github.com/syncthing/syncthing/lib/dialer"
"github.com/syncthing/syncthing/lib/discover"
"github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/logger"
@@ -435,6 +436,8 @@ func upgradeViaRest() error {
r.Header.Set("X-API-Key", cfg.GUI().APIKey())
tr := &http.Transport{
Dial: dialer.Dial,
Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
client := &http.Client{

3
cmd/syncthing/usage_report.go
View File

@@ -20,6 +20,7 @@ import (
"time"
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/dialer"
"github.com/syncthing/syncthing/lib/model"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/upgrade"
@@ -261,7 +262,7 @@ func (s *usageReportingService) sendUsageReport() error {
if BuildEnv == "android" {
// This works around the lack of DNS resolution on Android... :(
transp.Dial = func(network, addr string) (net.Conn, error) {
return net.Dial(network, "194.126.249.13:443")
return dialer.Dial(network, "194.126.249.13:443")
}
}