ryzokuken/cosmoline
ryzokuken
/
cosmoline
2
2
Fork 1
Code Issues 5 Pull Requests 1 Projects 1 Releases Activity

src: break network into peer and discovery

This commit is contained in:
Ujjwal Sharma 2021-04-02 08:18:06 +05:30
parent 500198e593
commit 808f979f06
Signed by: ryzokuken
GPG Key ID: 460B292812C67D9F
3 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/discovery.rs Normal file
View File

@ -0,0 +1,47 @@
use async_std::net::UdpSocket;
use async_std::sync::Arc;
use async_std::task;
use ed25519_dalek::PublicKey;
use crate::keypair::SSBPublicKey;
use crate::peer::{Address, Handshake, Peer, Protocol};
pub async fn recv() {
let socket = UdpSocket::bind(":::8008").await.unwrap();
let mut buf = [0u8; 1024];
loop {
let (amt, peer) = socket.recv_from(&mut buf).await.unwrap();
let buf = &mut buf[..amt];
let packet = String::from_utf8(buf.to_vec()).unwrap();
println!(
"{} {}",
peer,
Peer::from_discovery_packet(&packet).to_discovery_packet()
);
}
}
pub async fn send(pubkey: Arc<String>) {
let socket = UdpSocket::bind(":::0").await.unwrap();
let msg = Peer::new(
Vec::from([Address::new(
Protocol::Net,
"1.2.3.4".parse().unwrap(),
8023,
Handshake::Shs,
)]),
PublicKey::from_base64(pubkey.as_str()),
)
.to_discovery_packet();
let buf = msg.as_bytes();
socket.set_broadcast(true).unwrap();
loop {
println!("Sending packet: {:?}", &msg);
socket.send_to(&buf, "255.255.255.255:8008").await.unwrap();
socket.send_to(&buf, "[FF02::1]:8008").await.unwrap();
task::sleep(std::time::Duration::from_secs(1)).await;
}
}

9
src/main.rs
View File

@ -4,10 +4,11 @@ use async_std::{fs, task};
use clap::{load_yaml, App};
use ed25519_dalek::Keypair;
mod discovery;
mod keypair;
use keypair::{SSBKeypair, SSBPublicKey};
mod peer;
mod network;
use keypair::{SSBKeypair, SSBPublicKey};
#[async_std::main]
async fn main() {
@ -38,6 +39,6 @@ async fn main() {
let pubkey = keypair.public.to_base64();
task::spawn(network::peer_discovery_recv());
task::spawn(network::peer_discovery_send(Arc::new(pubkey))).await;
task::spawn(discovery::recv());
task::spawn(discovery::send(Arc::new(pubkey))).await;
}

54
src/network.rs → src/peer.rs
View File

@ -1,22 +1,20 @@
use async_std::net::{IpAddr, UdpSocket};
use async_std::sync::Arc;
use async_std::task;
use async_std::net::IpAddr;
use ed25519_dalek::PublicKey;
use crate::keypair::SSBPublicKey;
enum Protocol {
pub enum Protocol {
Net,
Ws,
Wss,
}
enum Handshake {
pub enum Handshake {
Shs,
Shs2,
}
struct Address {
pub struct Address {
protocol: Protocol,
host: IpAddr,
port: u16,
@ -24,7 +22,7 @@ struct Address {
}
impl Address {
fn new(protocol: Protocol, host: IpAddr, port: u16, handshake: Handshake) -> Self {
pub fn new(protocol: Protocol, host: IpAddr, port: u16, handshake: Handshake) -> Self {
Self {
protocol,
host,
@ -40,7 +38,7 @@ pub struct Peer {
}
impl Peer {
fn new(addresses: Vec<Address>, key: PublicKey) -> Self {
pub fn new(addresses: Vec<Address>, key: PublicKey) -> Self {
Self { addresses, key }
}
@ -116,43 +114,3 @@ impl Peer {
}
}
}
pub async fn peer_discovery_recv() {
let socket = UdpSocket::bind(":::8008").await.unwrap();
let mut buf = [0u8; 1024];
loop {
let (amt, peer) = socket.recv_from(&mut buf).await.unwrap();
let buf = &mut buf[..amt];
let packet = String::from_utf8(buf.to_vec()).unwrap();
println!(
"{} {}",
peer,
Peer::from_discovery_packet(&packet).to_discovery_packet()
);
}
}
pub async fn peer_discovery_send(pubkey: Arc<String>) {
let socket = UdpSocket::bind(":::0").await.unwrap();
let msg = Peer::new(
Vec::from([Address::new(
Protocol::Net,
"1.2.3.4".parse().unwrap(),
8023,
Handshake::Shs,
)]),
PublicKey::from_base64(pubkey.as_str()),
)
.to_discovery_packet();
let buf = msg.as_bytes();
socket.set_broadcast(true).unwrap();
loop {
println!("Sending packet: {:?}", &msg);
socket.send_to(&buf, "255.255.255.255:8008").await.unwrap();
socket.send_to(&buf, "[FF02::1]:8008").await.unwrap();
task::sleep(std::time::Duration::from_secs(1)).await;
}
}