Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 12:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug - p2p store was ignoring port numbers (#657)

Browse source
This commit is contained in:
Antioch Peverell 2018-01-29 09:45:01 -05:00 committed by GitHub
parent d754b8d1e4
commit 5dce526f90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p2p/src/msg.rs
View file

@ -314,6 +314,7 @@ impl Readable for GetPeerAddrs {
/// Peer addresses we know of that are fresh enough, in response to /// Peer addresses we know of that are fresh enough, in response to
/// GetPeerAddrs. /// GetPeerAddrs.
#[derive(Debug)]
pub struct PeerAddrs { pub struct PeerAddrs {
pub peers: Vec<SockAddr>, pub peers: Vec<SockAddr>,
} }
@ -375,6 +376,7 @@ impl Readable for PeerError {
/// Only necessary so we can implement Readable and Writeable. Rust disallows /// Only necessary so we can implement Readable and Writeable. Rust disallows
/// implementing traits when both types are outside of this crate (which is the /// implementing traits when both types are outside of this crate (which is the
/// case for SocketAddr and Readable/Writeable). /// case for SocketAddr and Readable/Writeable).
#[derive(Debug)]
pub struct SockAddr(pub SocketAddr); pub struct SockAddr(pub SocketAddr);
impl Writeable for SockAddr { impl Writeable for SockAddr {

4
p2p/src/store.rs
View file

@ -130,7 +130,7 @@ impl PeerStore {
} }
/// List all known peers /// List all known peers
/// Used for /v1/peers, for seed / sync (debug & if too few peers connected) /// Used for /v1/peers/all api endpoint
pub fn all_peers(&self) -> Vec<PeerData> { pub fn all_peers(&self) -> Vec<PeerData> {
self.db self.db
.iter::<PeerData>(&to_key(PEER_PREFIX, &mut "".to_string().into_bytes())) .iter::<PeerData>(&to_key(PEER_PREFIX, &mut "".to_string().into_bytes()))
@ -155,5 +155,5 @@ impl PeerStore {
} }
fn peer_key(peer_addr: SocketAddr) -> Vec<u8> { fn peer_key(peer_addr: SocketAddr) -> Vec<u8> {
to_key(PEER_PREFIX, &mut format!("{}", peer_addr.ip()).into_bytes()) to_key(PEER_PREFIX, &mut format!("{}:{}", peer_addr.ip(), peer_addr.port()).into_bytes())
} }