Bump rand, drop SockAddr size by an additional 4 bytes

[dnsseed-rust] / src / datastore.rs

diff --git a/src/datastore.rs b/src/datastore.rs
index 90ebbd923585b74b340bdd21a7784b6493d2b034..1f2221029d6d2d76f79626f574c6fc64b066f86b 100644 (file)
--- a/src/datastore.rs
+++ b/src/datastore.rs
@@ -5,7 +5,7 @@ use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV
 use std::time::{Duration, Instant};
 use std::io::{BufRead, BufReader};
 
-use bitcoin::network::address::Address;
+use bitcoin::network::address::{Address, AddrV2Message};
 
 use rand::thread_rng;
 use rand::seq::{SliceRandom, IteratorRandom};
@@ -132,13 +132,17 @@ struct Node {
 #[derive(Clone, PartialEq, Eq, Hash)]
 enum SockAddr {
        V4(SocketAddrV4),
-       V6((Ipv6Addr, u16)),
+       V6(([u16; 8], u16)),
+}
+#[inline]
+fn segs_to_ip6(segs: &[u16; 8]) -> Ipv6Addr {
+       Ipv6Addr::new(segs[0], segs[1], segs[2], segs[3], segs[4], segs[5], segs[6], segs[7])
 }
 impl From<SocketAddr> for SockAddr {
        fn from(addr: SocketAddr) -> SockAddr {
                match addr {
                        SocketAddr::V4(sa) => SockAddr::V4(sa),
-                       SocketAddr::V6(sa) => SockAddr::V6((sa.ip().clone(), sa.port())),
+                       SocketAddr::V6(sa) => SockAddr::V6((sa.ip().segments(), sa.port())),
                }
        }
 }
@@ -146,7 +150,7 @@ impl Into<SocketAddr> for &SockAddr {
        fn into(self) -> SocketAddr {
                match self {
                        &SockAddr::V4(sa) => SocketAddr::V4(sa),
-                       &SockAddr::V6(sa) => SocketAddr::V6(SocketAddrV6::new(sa.0, sa.1, 0, 0))
+                       &SockAddr::V6(sa) => SocketAddr::V6(SocketAddrV6::new(segs_to_ip6(&sa.0), sa.1, 0, 0))
                }
        }
 }
@@ -166,7 +170,7 @@ impl SockAddr {
        pub fn ip(&self) -> IpAddr {
                match *self {
                        SockAddr::V4(sa) => IpAddr::V4(sa.ip().clone()),
-                       SockAddr::V6((ip, _)) => IpAddr::V6(ip),
+                       SockAddr::V6((ip, _)) => IpAddr::V6(segs_to_ip6(&ip)),
                }
        }
 }
@@ -380,6 +384,14 @@ impl Store {
                        }
                }));
        }
+       pub fn add_fresh_nodes_v2(&self, addresses: &Vec<AddrV2Message>) {
+               self.add_fresh_addrs(addresses.iter().filter_map(|addr| {
+                       match addr.socket_addr() {
+                               Ok(socketaddr) => Some(socketaddr),
+                               Err(_) => None, // TODO: Handle onions
+                       }
+               }));
+       }
 
        pub fn set_node_state(&self, sockaddr: SocketAddr, state: AddressState, services: u64) -> AddressState {
                let addr: SockAddr = sockaddr.into();