docs(release note): update bytom version 1.1.0 release note

[bytom/bytom.git] / p2p / listener.go

diff --git a/p2p/listener.go b/p2p/listener.go
index 204b686..14117d3 100644 (file)
--- a/p2p/listener.go
+++ b/p2p/listener.go
@@ -10,9 +10,9 @@ import (
        log "github.com/sirupsen/logrus"
        cmn "github.com/tendermint/tmlibs/common"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/errors"
-       "github.com/bytom/p2p/upnp"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/p2p/upnp"
 )
 
 const (
@@ -81,27 +81,6 @@ func getUPNPExternalAddress(externalPort, internalPort int) (*NetAddress, error)
        return NewNetAddressIPPort(ext, uint16(externalPort)), nil
 }
 
-func getNaiveExternalAddress(port int, settleForLocal bool) *NetAddress {
-       addrs, err := net.InterfaceAddrs()
-       if err != nil {
-               cmn.PanicCrisis(cmn.Fmt("Could not fetch interface addresses: %v", err))
-       }
-
-       for _, a := range addrs {
-               ipnet, ok := a.(*net.IPNet)
-               if !ok {
-                       continue
-               }
-               if v4 := ipnet.IP.To4(); v4 == nil || (!settleForLocal && v4[0] == 127) {
-                       continue
-               }
-               return NewNetAddressIPPort(ipnet.IP, uint16(port))
-       }
-
-       log.Info("Node may not be connected to internet. Settling for local address")
-       return getNaiveExternalAddress(port, true)
-}
-
 func splitHostPort(addr string) (host string, port int) {
        host, portStr, err := net.SplitHostPort(addr)
        if err != nil {
@@ -135,12 +114,12 @@ func NewDefaultListener(protocol string, lAddr string, skipUPNP bool) (Listener,
                listener, err = net.Listen(protocol, lAddr)
        }
        if err != nil {
-               cmn.PanicCrisis(err)
+               log.Panic(err)
        }
 
        intAddr, err := NewNetAddressString(lAddr)
        if err != nil {
-               cmn.PanicCrisis(err)
+               log.Panic(err)
        }
 
        // Actual listener local IP & port
@@ -156,17 +135,16 @@ func NewDefaultListener(protocol string, lAddr string, skipUPNP bool) (Listener,
                log.WithFields(log.Fields{"module": logModule, "err": err}).Info("get UPNP external address")
        }
 
+       // Get the IPv4 available
        if extAddr == nil {
-               if address := GetIP(); address.Success == true {
-                       extAddr = NewNetAddressIPPort(net.ParseIP(address.IP), uint16(lAddrPort))
+               if ip, err := ExternalIPv4(); err != nil {
+                       log.WithFields(log.Fields{"module": logModule, "err": err}).Warning("get ipv4 external address")
+                       log.Panic("get ipv4 external address fail!")
+               } else {
+                       extAddr = NewNetAddressIPPort(net.ParseIP(ip), uint16(lAddrPort))
+                       log.WithFields(log.Fields{"module": logModule, "addr": extAddr}).Info("get ipv4 external address success")
                }
        }
-       if extAddr == nil {
-               extAddr = getNaiveExternalAddress(listenerPort, false)
-       }
-       if extAddr == nil {
-               cmn.PanicCrisis("could not determine external address!")
-       }
 
        dl := &DefaultListener{
                listener:    listener,
@@ -211,7 +189,7 @@ func (l *DefaultListener) listenRoutine() {
                // listener wasn't stopped,
                // yet we encountered an error.
                if err != nil {
-                       cmn.PanicCrisis(err)
+                       log.Panic(err)
                }
                l.connections <- conn
        }