Merge branch 'gossip-tls' of github.com:libangzhu/plugin into gossip-tls

plugin/p2p/gossip/netaddress.go

@@ -173,7 +173,7 @@ func (na *NetAddress) DialTimeout(version int32, creds credentials.TransportCred
 			return err
 		}
 
-		if bList != nil && bList.Has(ip)|| bList!=nil &&bList.Has(na.String()) {
+		if bList != nil && bList.Has(ip) || bList != nil && bList.Has(na.String()) {
 			return fmt.Errorf("interceptor blacklist peer  %v no authorized", na.String())
 		}
 
@@ -195,7 +195,6 @@ func (na *NetAddress) DialTimeout(version int32, creds credentials.TransportCred
 		return streamer(ctx, desc, cc, method, opts...)
 	}
 
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
 	defer cancel()
 	conn, err := grpc.DialContext(ctx, na.String(),

plugin/p2p/gossip/node.go

@@ -8,10 +8,11 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"google.golang.org/grpc/credentials"
 	"io/ioutil"
 	"math/rand"
 
+	"google.golang.org/grpc/credentials"
+
 	"github.com/33cn/chain33/p2p"
 
 	//"strings"

plugin/p2p/gossip/p2p_test.go

@@ -6,13 +6,14 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/33cn/chain33/common/pubsub"
-	"google.golang.org/grpc/credentials"
 	"net"
 	"sort"
 	"sync/atomic"
 	"time"
 
+	"github.com/33cn/chain33/common/pubsub"
+	"google.golang.org/grpc/credentials"
+
 	"github.com/33cn/chain33/p2p"
 
 	"github.com/33cn/chain33/p2p/utils"
@@ -690,12 +691,12 @@ uZ+EF9dHu0nEBcdZFJnAdMWf6MhTCHRQR9wSf9M8CJ5TQKNHpIFLUWJU
 
 	node.listenPort = 13332
 	node.nodeInfo.servCreds = servCreds
-	node.pubsub= pubsub.NewPubSub(10200)
-	l:= newListener("tcp", &node)
+	node.pubsub = pubsub.NewPubSub(10200)
+	l := newListener("tcp", &node)
 	assert.NotNil(t, l)
 	go l.Start()
 	defer l.Close()
-	netAddr, err := NewNetAddressString(fmt.Sprintf("127.0.0.1:%v",node.listenPort))
+	netAddr, err := NewNetAddressString(fmt.Sprintf("127.0.0.1:%v", node.listenPort))
 	assert.Nil(t, err)
 
 	conn, err := grpc.Dial(netAddr.String(), grpc.WithTransportCredentials(cliCreds))

plugin/p2p/gossip/p2pcli.go

@@ -295,7 +295,7 @@ func (m *Cli) SendVersion(peer *Peer, nodeinfo *NodeInfo) (string, error) {
 			log.Debug("sendVersion", "expect ip", ip, "pre externalip", nodeinfo.GetExternalAddr().IP.String())
 			if peer.IsPersistent() {
 				//永久加入黑名单
-				nodeinfo.blacklist.Add(resp.GetAddrRecv(), 0)//把自己的IP:PORT 加入黑名单，防止连接到自己
+				nodeinfo.blacklist.Add(resp.GetAddrRecv(), 0) //把自己的IP:PORT 加入黑名单，防止连接到自己
 			}
 		}
 	}

plugin/p2p/gossip/tls.go

@@ -16,8 +16,6 @@ import (
 	"google.golang.org/grpc/credentials"
 )
 
-
-
 //Tls defines the specific interface for all the live gRPC wire
 // protocols and supported transport security protocols (e.g., TLS, SSL).
 type Tls struct {
@@ -29,11 +27,13 @@ type certInfo struct {
 	ip     string
 	serial string
 }
-var(
-	serials = make(map[string]*certInfo)
-	revokeLock sync.Mutex
+
+var (
+	serials       = make(map[string]*certInfo)
+	revokeLock    sync.Mutex
 	latestSerials sync.Map
 )
+
 //serialNum -->ip
 func addCertSerial(serial *big.Int, ip string) {
 	revokeLock.Lock()