dht: getId renamed to getNodeId

include/opendht/dht.h

@@ -78,9 +78,9 @@ public:
     virtual ~Dht();
 
     /**
-     * Get the ID of the node, which was provided in the constructor.
+     * Get the ID of the node.
      */
-    inline const InfoHash& getId() const { return myid; }
+    inline const InfoHash& getNodeId() const { return myid; }
 
     /**
      * Get the current status of the node for the given family.

include/opendht/dhtrunner.h

@@ -150,10 +150,15 @@ public:
         return dht_->getId();
     }
 
-    InfoHash getRoutingId() const {
+    InfoHash getNodeId() const {
         if (!dht_)
             return {};
-        return dht_->getRoutingId();
+        return dht_->getNodeId();
+    }
+
+    //[[deprecated]]
+    InfoHash getRoutingId() const {
+        return getNodeId();
     }
 
     std::vector<Dht::NodeExport> exportNodes() const {

include/opendht/securedht.h

@@ -61,10 +61,6 @@ public:
         return key_->getPublicKey().getId();
     }
 
-    InfoHash getRoutingId() const {
-        return Dht::getId();
-    }
-
     ValueType secureType(ValueType&& type);
 
     ValueType secureType(const ValueType& type) {

tools/dhtchat.cpp

@@ -82,7 +82,7 @@ main(int argc, char **argv)
         i += 2;
     }
 
-    std::cout << "OpenDht node " << dht.getRoutingId() << " running on port " <<  port<<  std::endl;
+    std::cout << "OpenDht node " << dht.getNodeId() << " running on port " <<  port<<  std::endl;
     std::cout << "Public key ID " << dht.getId() << std::endl;
     std::cout << "  type 'c {hash}' to join a channel" << std::endl << std::endl;
 

tools/dhtnode.cpp

@@ -113,7 +113,7 @@ main(int argc, char **argv)
         i += 2;
     }
 
-    std::cout << "OpenDht node " << dht.getRoutingId() << " running on port " <<  port<<  std::endl;
+    std::cout << "OpenDht node " << dht.getNodeId() << " running on port " <<  port<<  std::endl;
     std::cout << "Public key ID " << dht.getId() << std::endl;
     std::cout << " (type 'h' or 'help' for a list of possible commands)" << std::endl << std::endl;