Fix discovery msg codec hash error (#60)

[bytom/vapor.git] / p2p / netutil / net.go

diff --git a/p2p/netutil/net.go b/p2p/netutil/net.go
index 6d1ced7..17b18cd 100644 (file)
--- a/p2p/netutil/net.go
+++ b/p2p/netutil/net.go
@@ -7,11 +7,21 @@ import (
        "fmt"
        "net"
        "sort"
+       "strconv"
        "strings"
+
+       log "github.com/sirupsen/logrus"
 )
 
 var lan4, lan6, special4, special6 Netlist
 
+var (
+       logModule = "netutil"
+
+       errInvalidIP   = errors.New("ip is invalid")
+       errInvalidPort = errors.New("port is invalid")
+)
+
 func init() {
        // Lists from RFC 5735, RFC 5156,
        // https://www.iana.org/assignments/iana-ipv4-special-registry/
@@ -304,3 +314,32 @@ func (s DistinctNetSet) String() string {
        buf.WriteString("}")
        return buf.String()
 }
+
+func CheckAndSplitAddresses(addressesStr string) []string {
+       if addressesStr == "" {
+               return nil
+       }
+
+       var addresses []string
+       splits := strings.Split(addressesStr, ",")
+       for _, address := range splits {
+               ip, port, err := net.SplitHostPort(address)
+               if err != nil {
+                       log.WithFields(log.Fields{"module": logModule, "err": err, "address": address}).Warn("net.SplitHostPort")
+                       continue
+               }
+
+               if validIP := net.ParseIP(ip); validIP == nil {
+                       log.WithFields(log.Fields{"module": logModule, "err": errInvalidIP, "ip": ip}).Warn("net.ParseIP")
+                       continue
+               }
+
+               if _, err := strconv.ParseUint(port, 10, 16); err != nil {
+                       log.WithFields(log.Fields{"module": logModule, "err": errInvalidPort, "port": port}).Warn("strconv parse port")
+                       continue
+               }
+
+               addresses = append(addresses, address)
+       }
+       return addresses
+}