banman: reformulate nBanUtil calculation

dongcarl · dongcarl · commit 1ffa4ce27d4e · 2019-01-16T13:54:18.000-05:00
Avoid reassigning parameters.
diff --git a/src/banman.cpp b/src/banman.cpp
@@ -104,11 +104,14 @@ void BanMan::Ban(const CSubNet& subNet, const BanReason& banReason, int64_t bant
 {
     CBanEntry banEntry(GetTime());
     banEntry.banReason = banReason;
+
+    int64_t normalized_bantimeoffset = bantimeoffset;
+    bool normalized_sinceUnixEpoch = sinceUnixEpoch;
     if (bantimeoffset <= 0) {
-        bantimeoffset = m_default_ban_time;
-        sinceUnixEpoch = false;
+        normalized_bantimeoffset = m_default_ban_time;
+        normalized_sinceUnixEpoch = false;
     }
-    banEntry.nBanUntil = (sinceUnixEpoch ? 0 : GetTime()) + bantimeoffset;
+    banEntry.nBanUntil = (normalized_sinceUnixEpoch ? 0 : GetTime()) + normalized_bantimeoffset;
 
     {
         LOCK(m_cs_banned);

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,14 @@ void BanMan::Ban(const CSubNet& subNet, const BanReason& banReason, int64_t bant`
`104`	`104`	`{`
`105`	`105`	`CBanEntry banEntry(GetTime());`
`106`	`106`	`banEntry.banReason = banReason;`
	`107`	`+`
	`108`	`+ int64_t normalized_bantimeoffset = bantimeoffset;`
	`109`	`+ bool normalized_sinceUnixEpoch = sinceUnixEpoch;`
`107`	`110`	`if (bantimeoffset <= 0) {`
`108`		`- bantimeoffset = m_default_ban_time;`
`109`		`- sinceUnixEpoch = false;`
	`111`	`+ normalized_bantimeoffset = m_default_ban_time;`
	`112`	`+ normalized_sinceUnixEpoch = false;`
`110`	`113`	`}`
`111`		`- banEntry.nBanUntil = (sinceUnixEpoch ? 0 : GetTime()) + bantimeoffset;`
	`114`	`+ banEntry.nBanUntil = (normalized_sinceUnixEpoch ? 0 : GetTime()) + normalized_bantimeoffset;`
`112`	`115`
`113`	`116`	`{`
`114`	`117`	`LOCK(m_cs_banned);`