add support for tokio & improve net crate api

2 files changed, 7 insertions, 5 deletions

diff --git a/p2p/src/routing_table/entry.rs b/p2p/src/routing_table/entry.rs
index 3fc8a6b..1427c2b 100644
--- a/p2p/src/routing_table/entry.rs
+++ b/p2p/src/routing_table/entry.rs
@@ -5,6 +5,9 @@ use karyon_net::{Addr, Port};
 /// Specifies the size of the key, in bytes.
 pub const KEY_SIZE: usize = 32;
 
+/// The unique key identifying the peer.
+pub type Key = [u8; KEY_SIZE];
+
 /// An Entry represents a peer in the routing table.
 #[derive(Encode, Decode, Clone, Debug)]
 pub struct Entry {
@@ -20,14 +23,11 @@ pub struct Entry {
 
 impl PartialEq for Entry {
     fn eq(&self, other: &Self) -> bool {
-        // TODO: this should also compare both addresses (the self.addr == other.addr)
+        // XXX: should we compare both self.addr and other.addr???
         self.key == other.key
     }
 }
 
-/// The unique key identifying the peer.
-pub type Key = [u8; KEY_SIZE];
-
 /// Calculates the XOR distance between two provided keys.
 ///
 /// The XOR distance is a metric used in Kademlia to measure the closeness
diff --git a/p2p/src/routing_table/mod.rs b/p2p/src/routing_table/mod.rs
index 6854546..bbf4801 100644
--- a/p2p/src/routing_table/mod.rs
+++ b/p2p/src/routing_table/mod.rs
@@ -266,7 +266,7 @@ impl RoutingTable {
 }
 
 /// Check if two addresses belong to the same subnet.
-pub fn subnet_match(addr: &Addr, other_addr: &Addr) -> bool {
+fn subnet_match(addr: &Addr, other_addr: &Addr) -> bool {
     match (addr, other_addr) {
         (Addr::Ip(IpAddr::V4(ip)), Addr::Ip(IpAddr::V4(other_ip))) => {
             // TODO: Consider moving this to a different place
@@ -275,6 +275,8 @@ pub fn subnet_match(addr: &Addr, other_addr: &Addr) -> bool {
             }
             ip.octets()[0..3] == other_ip.octets()[0..3]
         }
+
+        // TODO:  check ipv6
         _ => false,
     }
 }