move ip func

This commit is contained in:
Asim Aslam 2017-01-12 13:52:49 +00:00
parent a9889730d6
commit a47d916b50

View File

@ -17,6 +17,7 @@ import (
"sync" "sync"
"time" "time"
maddr "github.com/micro/misc/lib/addr"
mls "github.com/micro/misc/lib/tls" mls "github.com/micro/misc/lib/tls"
) )
@ -56,45 +57,6 @@ type httpTransportListener struct {
listener net.Listener listener net.Listener
} }
func getIPAddrs() []string {
ifaces, err := net.Interfaces()
if err != nil {
return nil
}
var ipAddrs []string
for _, i := range ifaces {
addrs, err := i.Addrs()
if err != nil {
continue
}
for _, addr := range addrs {
var ip net.IP
switch v := addr.(type) {
case *net.IPNet:
ip = v.IP
case *net.IPAddr:
ip = v.IP
}
if ip == nil {
continue
}
ip = ip.To4()
if ip == nil {
continue
}
ipAddrs = append(ipAddrs, ip.String())
}
}
return ipAddrs
}
func listen(addr string, fn func(string) (net.Listener, error)) (net.Listener, error) { func listen(addr string, fn func(string) (net.Listener, error)) (net.Listener, error) {
// host:port || host:min-max // host:port || host:min-max
parts := strings.Split(addr, ":") parts := strings.Split(addr, ":")
@ -479,7 +441,7 @@ func (h *httpTransport) Listen(addr string, opts ...ListenOption) (Listener, err
// check if its a valid host:port // check if its a valid host:port
if host, _, err := net.SplitHostPort(addr); err == nil { if host, _, err := net.SplitHostPort(addr); err == nil {
if len(host) == 0 { if len(host) == 0 {
hosts = getIPAddrs() hosts = maddr.IPs()
} else { } else {
hosts = []string{host} hosts = []string{host}
} }