From 9efe341f8e0a0743850abe9ba893681dd9356ded Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Tue, 20 Jun 2017 13:13:40 -0700
Subject: [PATCH] Add DefaultAddress to client

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 client_unix.go                 | 3 +++
 client_windows.go              | 3 +++
 cmd/containerd/config_linux.go | 4 +++-
 cmd/ctr/main.go                | 3 ++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/client_unix.go b/client_unix.go
index d5a9f63ec..f352eb4d3 100644
--- a/client_unix.go
+++ b/client_unix.go
@@ -9,6 +9,9 @@ import (
 	"time"
 )
 
+// DefaultAddress is the default unix socket address
+const DefaultAddress = "/run/containerd/containerd.sock"
+
 func dialer(address string, timeout time.Duration) (net.Conn, error) {
 	address = strings.TrimPrefix(address, "unix://")
 	return net.DialTimeout("unix", address, timeout)
diff --git a/client_windows.go b/client_windows.go
index 548024e5b..998c15c69 100644
--- a/client_windows.go
+++ b/client_windows.go
@@ -7,6 +7,9 @@ import (
 	winio "github.com/Microsoft/go-winio"
 )
 
+// DefaultAddress is the default unix socket address
+const DefaultAddress = `\\.\pipe\containerd-containerd`
+
 func dialer(address string, timeout time.Duration) (net.Conn, error) {
 	return winio.DialPipe(address, &timeout)
 }
diff --git a/cmd/containerd/config_linux.go b/cmd/containerd/config_linux.go
index b95385ce5..a562726b1 100644
--- a/cmd/containerd/config_linux.go
+++ b/cmd/containerd/config_linux.go
@@ -1,10 +1,12 @@
 package main
 
+import "github.com/containerd/containerd"
+
 func defaultConfig() *config {
 	return &config{
 		Root: "/var/lib/containerd",
 		GRPC: grpcConfig{
-			Address: "/run/containerd/containerd.sock",
+			Address: containerd.DefaultAddress,
 		},
 		Debug: debug{
 			Level:   "info",
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index e0ca777f5..ba1c4e9a3 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/version"
 	"github.com/urfave/cli"
 )
@@ -38,7 +39,7 @@ containerd CLI
 		cli.StringFlag{
 			Name:  "address, a",
 			Usage: "address for containerd's GRPC server",
-			Value: "/run/containerd/containerd.sock",
+			Value: containerd.DefaultAddress,
 		},
 		cli.DurationFlag{
 			Name:  "timeout",