From 3940196de0d1621a8e7d7916b158c0c998199e77 Mon Sep 17 00:00:00 2001
From: Xiang Li <xiang.li@coreos.com>
Date: Tue, 13 Aug 2013 12:23:35 -0700
Subject: [PATCH] move trans related func to trans.go

---
 etcd.go        | 27 ---------------------------
 transporter.go | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/etcd.go b/etcd.go
index d174b96c2..515c709ae 100644
--- a/etcd.go
+++ b/etcd.go
@@ -7,9 +7,7 @@ import (
 	"flag"
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/web"
-
 	"io/ioutil"
-	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -225,31 +223,6 @@ func main() {
 
 }
 
-// Create transporter using by raft server
-// Create http or https transporter based on
-// whether the user give the server cert and key
-func newTransporter(scheme string, tlsConf tls.Config) transporter {
-	t := transporter{}
-
-	tr := &http.Transport{
-		Dial: dialTimeout,
-	}
-
-	if scheme == "https" {
-		tr.TLSClientConfig = &tlsConf
-		tr.DisableCompression = true
-	}
-
-	t.client = &http.Client{Transport: tr}
-
-	return t
-}
-
-// Dial with timeout
-func dialTimeout(network, addr string) (net.Conn, error) {
-	return net.DialTimeout(network, addr, HTTPTimeout)
-}
-
 // Start to listen and response client command
 func startEtcdTransport(info Info, scheme string, tlsConf tls.Config) {
 	u, err := url.Parse(info.EtcdURL)
diff --git a/transporter.go b/transporter.go
index 59a385bb3..74bd33da9 100644
--- a/transporter.go
+++ b/transporter.go
@@ -2,10 +2,12 @@ package main
 
 import (
 	"bytes"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"github.com/coreos/go-raft"
 	"io"
+	"net"
 	"net/http"
 )
 
@@ -14,6 +16,31 @@ type transporter struct {
 	client *http.Client
 }
 
+// Create transporter using by raft server
+// Create http or https transporter based on
+// whether the user give the server cert and key
+func newTransporter(scheme string, tlsConf tls.Config) transporter {
+	t := transporter{}
+
+	tr := &http.Transport{
+		Dial: dialTimeout,
+	}
+
+	if scheme == "https" {
+		tr.TLSClientConfig = &tlsConf
+		tr.DisableCompression = true
+	}
+
+	t.client = &http.Client{Transport: tr}
+
+	return t
+}
+
+// Dial with timeout
+func dialTimeout(network, addr string) (net.Conn, error) {
+	return net.DialTimeout(network, addr, HTTPTimeout)
+}
+
 // Sends AppendEntries RPCs to a peer when the server is the leader.
 func (t transporter) SendAppendEntriesRequest(server *raft.Server, peer *raft.Peer, req *raft.AppendEntriesRequest) *raft.AppendEntriesResponse {
 	var aersp *raft.AppendEntriesResponse