Add proxy support (fixes #271)

2015-10-12 19:30:14 +01:00
parent 2b56961b54
commit 985ea29940
6 changed files with 102 additions and 7 deletions
--- a/lib/upnp/upnp.go
+++ b/lib/upnp/upnp.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"

+	"github.com/syncthing/syncthing/lib/dialer"
 	"github.com/syncthing/syncthing/lib/sync"
 )

@@ -289,7 +290,7 @@ func parseResponse(deviceType string, resp []byte) (IGD, error) {
 }

 func localIP(url *url.URL) (string, error) {
-	conn, err := net.Dial("tcp", url.Host)
+	conn, err := dialer.Dial("tcp", url.Host)
 	if err != nil {
 		return "", err
 	}