i got send/recv mixed up

This commit is contained in:
Milo Turner 2020-03-07 15:40:35 -05:00
parent 078c026858
commit 03eff314a7
2 changed files with 39 additions and 39 deletions

View File

@ -1,41 +1,5 @@
use std::str::FromStr;
extern crate hptp;
#[derive(Debug)]
struct Hostname {
ip: String,
port: u16,
}
struct InvalidHostnameError;
impl FromStr for Hostname {
type Err = InvalidHostnameError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
let i = s.find(':').ok_or(InvalidHostnameError)?;
Ok(Hostname {
ip: s[..i].into(),
port: s[i + 1..].parse().map_err(|_| InvalidHostnameError)?,
})
}
}
fn usage() {
print!("usage:\n./3700recv <host-ip>:<host-port>\n")
}
fn parse_args() -> Result<Hostname, ()> {
std::env::args().nth(1).ok_or(())?.parse().map_err(|_| ())
}
fn main() {
match parse_args() {
Ok(x) => start(x),
Err(_) => usage(),
}
}
fn start(hn: Hostname) {
println!("ip={}, port={}", hn.ip, hn.port)
println!("{}", hptp::RECV_GREETING);
}

View File

@ -1,5 +1,41 @@
use std::str::FromStr;
extern crate hptp;
fn main() {
println!("{}", hptp::SEND_GREETING);
#[derive(Debug)]
struct Hostname {
ip: String,
port: u16,
}
struct InvalidHostnameError;
impl FromStr for Hostname {
type Err = InvalidHostnameError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
let i = s.find(':').ok_or(InvalidHostnameError)?;
Ok(Hostname {
ip: s[..i].into(),
port: s[i + 1..].parse().map_err(|_| InvalidHostnameError)?,
})
}
}
fn usage() {
print!("usage:\n./3700send <host-ip>:<host-port>\n")
}
fn parse_args() -> Result<Hostname, ()> {
std::env::args().nth(1).ok_or(())?.parse().map_err(|_| ())
}
fn main() {
match parse_args() {
Ok(x) => start(x),
Err(_) => usage(),
}
}
fn start(hn: Hostname) {
println!("ip={}, port={}", hn.ip, hn.port)
}