merge bitcoin#25814: simplify GetLocalAddress()

kwvg · kwvg · commit 79e67fd96a3b · 2024-09-12T14:42:57.000Z
diff --git a/src/net.cpp b/src/net.cpp
@@ -238,12 +238,11 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)
 // one by discovery.
 CService GetLocalAddress(const CNetAddr& addrPeer)
 {
-    CService ret{CNetAddr(), GetListenPort()};
     CService addr;
     if (GetLocal(addr, &addrPeer)) {
-        ret = CService{addr};
+        return addr;
     }
-    return ret;
+    return CService{CNetAddr(), GetListenPort()};
 }
 
 static int GetnScore(const CService& addr)

Original file line number	Diff line number	Diff line change
`@@ -238,12 +238,11 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)`
`238`	`238`	`// one by discovery.`
`239`	`239`	`CService GetLocalAddress(const CNetAddr& addrPeer)`
`240`	`240`	`{`
`241`		`- CService ret{CNetAddr(), GetListenPort()};`
`242`	`241`	`CService addr;`
`243`	`242`	`if (GetLocal(addr, &addrPeer)) {`
`244`		`- ret = CService{addr};`
	`243`	`+ return addr;`
`245`	`244`	`}`
`246`		`- return ret;`
	`245`	`+ return CService{CNetAddr(), GetListenPort()};`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`static int GetnScore(const CService& addr)`