From 21935fc6b95c5f66049fd2a55b250036d370f1f6 Mon Sep 17 00:00:00 2001
From: nadoo <287492+nadoo@users.noreply.github.com>
Date: Sat, 13 Jan 2018 14:34:49 +0800
Subject: [PATCH] conn: change OutboundIP to return string

---
 conn.go | 10 ++++------
 http.go |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/conn.go b/conn.go
index 6ce6c6d..ddab0c6 100644
--- a/conn.go
+++ b/conn.go
@@ -3,7 +3,6 @@ package main
 import (
 	"bufio"
 	"io"
-	"log"
 	"net"
 	"time"
 )
@@ -82,14 +81,13 @@ func timedCopy(dst net.PacketConn, target net.Addr, src net.PacketConn, timeout
 }
 
 // OutboundIP returns preferred outbound ip of this machine
-func OutboundIP() net.IP {
+func OutboundIP() string {
 	conn, err := net.Dial("udp", "8.8.8.8:80")
 	if err != nil {
-		log.Fatal(err)
+		logf("get outbound ip error: %s", err)
+		return ""
 	}
 	defer conn.Close()
 
-	localAddr := conn.LocalAddr().(*net.UDPAddr)
-
-	return localAddr.IP
+	return conn.LocalAddr().(*net.UDPAddr).IP.String()
 }
diff --git a/http.go b/http.go
index a129c16..48b6684 100644
--- a/http.go
+++ b/http.go
@@ -37,7 +37,7 @@ func NewHTTP(addr, user, pass, rawQuery string, cDialer Dialer, sDialer Dialer)
 		user:      user,
 		password:  pass,
 		xff:       false,
-		selfip:    OutboundIP().String(),
+		selfip:    OutboundIP(),
 	}
 
 	p, _ := url.ParseQuery(rawQuery)