update vendor

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>

Gopkg.toml

@@ -0,0 +1,49 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[override]]
+  name = "github.com/Sirupsen/logrus"
+  source = "github.com/sirupsen/logrus"
+
+[[constraint]]
+  name = "github.com/docker/go-plugins-helpers"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/docker/docker"
+  branch = "master"
+
+[[override]]
+  name = "github.com/docker/distribution"
+  branch = "master"
+
+[[override]]
+  name = "github.com/docker/go-connections"
+  branch = "master"
+
+[[override]]
+  name = "github.com/docker/go-units"
+  branch = "master"
+
+[[override]]
+  name = "github.com/opencontainers/go-digest"
+  branch = "master"

main.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/pidfile"
 	"github.com/docker/go-plugins-helpers/network"
 	"github.com/jessfraz/onion/tor"
 	"github.com/jessfraz/onion/version"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -82,7 +82,7 @@ func main() {
 		logrus.Fatal(err)
 	}
 	h := network.NewHandler(d)
-	h.ServeUnix("root", "tor")
+	h.ServeUnix("tor", 0)
 }
 
 func usageAndExit(message string, exitCode int) {

tor/bridge.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
 

tor/driver.go

@@ -5,13 +5,13 @@ import (
 	"net"
 	"sync"
 
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/client"
+	"github.com/docker/docker/client"
 	"github.com/docker/go-plugins-helpers/network"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/portmapper"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
 
@@ -118,7 +118,7 @@ func (d *Driver) CreateNetwork(r *network.CreateNetworkRequest) error {
 		Gateway:     gateway,
 		GatewayMask: mask,
 		endpoints:   map[string]*torEndpoint{},
-		portMapper:  portmapper.New(),
+		portMapper:  portmapper.New(""),
 		blockUDP:    true, // TODO: this should be configurable
 	}
 	d.networks[r.NetworkID] = ns
@@ -284,11 +284,7 @@ func (d *Driver) DeleteEndpoint(r *network.DeleteEndpointRequest) error {
 	}()
 
 	// Remove port mappings. Do not stop endpoint delete on unmap failure
-	if err := ns.releasePorts(ep); err != nil {
-		return err
-	}
-
-	return nil
+	return ns.releasePorts(ep)
 }
 
 // EndpointInfo returns information about an endpoint.

tor/portmapping.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 
 var (

tor/setup_ip_tables.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/netutils"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -154,11 +154,7 @@ func (ic *iptablesConfig) setupIPTablesInternal(enable bool) error {
 	}
 
 	// Set Accept on incoming packets for existing connections.
-	if err := programChainRule(inRule, "ACCEPT INCOMING", enable); err != nil {
-		return err
-	}
-
-	return nil
+	return programChainRule(inRule, "ACCEPT INCOMING", enable)
 }
 
 func programChainRule(rule iptRule, ruleDescr string, enable bool) error {

tor/utils.go

@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/network"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )