github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 10:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from weaveworks/socks-update

Browse Source 
Update socks proxy for upstream changes.
This commit is contained in:
Tom Wilkie
2016-03-23 10:57:51 +00:00
parent 495e875a59 f9042035f8
commit f26a5b2320
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
socks/main.go
View File

@@ -11,6 +11,7 @@ import (
socks5 "github.com/armon/go-socks5" socks5 "github.com/armon/go-socks5"
"github.com/docker/docker/pkg/mflag" "github.com/docker/docker/pkg/mflag"
"github.com/weaveworks/weave/common/mflagext" "github.com/weaveworks/weave/common/mflagext"
"golang.org/x/net/context"
) )
type pacFileParameters struct { type pacFileParameters struct {
@@ -72,11 +73,11 @@ type aliasingResolver struct {
socks5.NameResolver socks5.NameResolver
} }
func (r aliasingResolver) Resolve(name string) (net.IP, error) { func (r aliasingResolver) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) {
if alias, ok := r.aliases[name]; ok { if alias, ok := r.aliases[name]; ok {
return r.NameResolver.Resolve(alias) return r.NameResolver.Resolve(ctx, alias)
} }
return r.NameResolver.Resolve(name) return r.NameResolver.Resolve(ctx, name)
} }
func socksProxy(aliases map[string]string) { func socksProxy(aliases map[string]string) {