net: define NodeId as an int64_t

theuni · theuni · commit c851be4b2590 · 2017-04-12T13:42:02.000-04:00
This should make occurances of NodeId wrapping essentially impossible for
real-world usage.
diff --git a/src/net.h b/src/net.h
@@ -92,7 +92,7 @@ static const ServiceFlags REQUIRED_SERVICES = NODE_NETWORK;
 // NOTE: When adjusting this, update rpcnet:setban's help ("24h")
 static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24;  // Default 24-hour ban
 
-typedef int NodeId;
+typedef int64_t NodeId;
 
 struct AddedNodeInfo
 {
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
@@ -166,7 +166,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
         switch(index.column())
         {
         case NetNodeId:
-            return rec->nodeStats.nodeid;
+            return (qint64)rec->nodeStats.nodeid;
         case Address:
             return QString::fromStdString(rec->nodeStats.addrName);
         case Subversion:
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -1118,7 +1118,7 @@ void RPCConsole::disconnectSelectedNode()
     for(int i = 0; i < nodes.count(); i++)
     {
         // Get currently selected peer address
-        NodeId id = nodes.at(i).data().toInt();
+        NodeId id = nodes.at(i).data().toLongLong();
         // Find the node, disconnect it and clear the selected node
         if(g_connman->DisconnectNode(id))
             clearSelectedNode();
@@ -1135,7 +1135,7 @@ void RPCConsole::banSelectedNode(int bantime)
     for(int i = 0; i < nodes.count(); i++)
     {
         // Get currently selected peer address
-        NodeId id = nodes.at(i).data().toInt();
+        NodeId id = nodes.at(i).data().toLongLong();
 
 	// Get currently selected peer address
 	int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(id);

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ static const ServiceFlags REQUIRED_SERVICES = NODE_NETWORK;`
`92`	`92`	`// NOTE: When adjusting this, update rpcnet:setban's help ("24h")`
`93`	`93`	`static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24; // Default 24-hour ban`
`94`	`94`
`95`		`-typedef int NodeId;`
	`95`	`+typedef int64_t NodeId;`
`96`	`96`
`97`	`97`	`struct AddedNodeInfo`
`98`	`98`	`{`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const`
`166`	`166`	`switch(index.column())`
`167`	`167`	`{`
`168`	`168`	`case NetNodeId:`
`169`		`- return rec->nodeStats.nodeid;`
	`169`	`+ return (qint64)rec->nodeStats.nodeid;`
`170`	`170`	`case Address:`
`171`	`171`	`return QString::fromStdString(rec->nodeStats.addrName);`
`172`	`172`	`case Subversion:`