Bugfix: GUI: Recognise NETWORK_LIMITED in formatServicesStr

luke-jr · luke-jr · commit df77de8c2157 · 2019-11-14T05:01:50.000Z
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -819,9 +819,8 @@ QString formatServicesStr(quint64 mask)
 {
     QStringList strList;
 
-    // Just scan the last 8 bits for now.
-    for (int i = 0; i < 8; i++) {
-        uint64_t check = 1 << i;
+    for (int i = 0; i < 64; i++) {
+        uint64_t check = 1LL << i;
         if (mask & check)
         {
             switch (check)
@@ -838,8 +837,15 @@ QString formatServicesStr(quint64 mask)
             case NODE_WITNESS:
                 strList.append("WITNESS");
                 break;
+            case NODE_NETWORK_LIMITED:
+                strList.append("NETWORK_LIMITED");
+                break;
             default:
-                strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));
+                if (i < 8) {
+                    strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));
+                } else {
+                    strList.append(QString("%1[2^%2]").arg("UNKNOWN").arg(i));
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -819,9 +819,8 @@ QString formatServicesStr(quint64 mask)`
`819`	`819`	`{`
`820`	`820`	`QStringList strList;`
`821`	`821`
`822`		`- // Just scan the last 8 bits for now.`
`823`		`- for (int i = 0; i < 8; i++) {`
`824`		`- uint64_t check = 1 << i;`
	`822`	`+ for (int i = 0; i < 64; i++) {`
	`823`	`+ uint64_t check = 1LL << i;`
`825`	`824`	`if (mask & check)`
`826`	`825`	`{`
`827`	`826`	`switch (check)`
`@@ -838,8 +837,15 @@ QString formatServicesStr(quint64 mask)`
`838`	`837`	`case NODE_WITNESS:`
`839`	`838`	`strList.append("WITNESS");`
`840`	`839`	`break;`
	`840`	`+ case NODE_NETWORK_LIMITED:`
	`841`	`+ strList.append("NETWORK_LIMITED");`
	`842`	`+ break;`
`841`	`843`	`default:`
`842`		`- strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));`
	`844`	`+ if (i < 8) {`
	`845`	`+ strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));`
	`846`	`+ } else {`
	`847`	`+ strList.append(QString("%1[2^%2]").arg("UNKNOWN").arg(i));`
	`848`	`+ }`
`843`	`849`	`}`
`844`	`850`	`}`
`845`	`851`	`}`