From 8e2253ef6da8fdb352d4e879aa9a7b51c30fe46d Mon Sep 17 00:00:00 2001
From: fearlseefe <505380967@qq.com>
Date: Sun, 4 Feb 2024 18:20:03 +0800
Subject: [PATCH] fix: add log and add static ip

---
 cmd/hive/shisui.sqlite          | Bin 0 -> 12288 bytes
 p2p/discover/portal_protocol.go |  19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 cmd/hive/shisui.sqlite

diff --git a/cmd/hive/shisui.sqlite b/cmd/hive/shisui.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..dd30b9242b14bde9d5dbff0085e177281c5d156e
GIT binary patch
literal 12288
zcmeI#y-LJD5Ww->C~5*nuDc@5mI^9}FJK}m#E2TNNfjcla9m6<w|8jioA^4uk)^vK
zsjv3<5A4Te*oFP2ny1HXVYGT}ySK`yOEDEviYujr5Ymo4JH~MN{+QU+<=aAv^X_{R
z{t7Q_MA(Es+YV4i009ILKmY**5I_I{1Q0;r{|glIa27@K%Qw|?t(TjXX}fXpuJbgW
zr)nN2S*nJbIu3k)sXtYc-6!fHzqyO^Lfxjtsr|mG>b34Gfq!!59n9iLibeCHKUVLx
z?dr>FZQ4FBhwI9VVdMJxBj-7B)6`7_0tg_000IagfB*srAb<b@2<)mr;2uW*zpKBO
YcOifP0tg_000IagfB*srAkYi^0Y45jrT_o{

literal 0
HcmV?d00001

diff --git a/p2p/discover/portal_protocol.go b/p2p/discover/portal_protocol.go
index 107d9e215d..e6717927c6 100644
--- a/p2p/discover/portal_protocol.go
+++ b/p2p/discover/portal_protocol.go
@@ -13,6 +13,7 @@ import (
 	"math/big"
 	"math/rand"
 	"net"
+	"os"
 	"sort"
 	"time"
 
@@ -183,8 +184,24 @@ func NewPortalProtocol(config *PortalProtocolConfig, protocolId string, privateK
 
 	localNode := enode.NewLocalNode(nodeDB, privateKey)
 	localNode.SetFallbackIP(net.IP{127, 0, 0, 1})
+	addrs, err := net.InterfaceAddrs()
+
+	if err != nil {
+		return nil, err
+	}
+
+	for _, address := range addrs {
+
+		// check ip addr is loopback addr 
+		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				localNode.SetStaticIP(ipnet.IP)
+			}
+		}
+	}
 	closeCtx, cancelCloseCtx := context.WithCancel(context.Background())
 
+	log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, true)))
 	protocol := &PortalProtocol{
 		protocolId:     protocolId,
 		ListenAddr:     config.ListenAddr,
@@ -361,7 +378,7 @@ func (p *PortalProtocol) pingInner(node *enode.Node) (*portalwire.Pong, error) {
 		CustomPayload: customPayloadBytes,
 	}
 
-	p.log.Trace("Sending ping request", "protocol", p.protocolId, "source", p.Self().ID(), "target", node.ID(), "ping", pingRequest)
+	p.log.Trace("Sending ping request", "protocol", p.protocolId, "ip", p.Self().IP().String(), "source", p.Self().ID(), "target", node.ID(), "ping", pingRequest)
 	pingRequestBytes, err := pingRequest.MarshalSSZ()
 	if err != nil {
 		return nil, err