From a7858cd77151430b3fab0bcdcacdc14375f77980 Mon Sep 17 00:00:00 2001 From: Max Audron Date: Sun, 12 Jan 2020 18:01:18 +0100 Subject: initial implementation done --- src/net.rs | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/net.rs') diff --git a/src/net.rs b/src/net.rs index 94cae21..3d56437 100644 --- a/src/net.rs +++ b/src/net.rs @@ -6,25 +6,26 @@ use std::net::TcpStream; use std::vec::Vec; extern crate log; -use log::{info, warn, debug}; +// use log::{info, warn, debug}; use super::types; +use super::types::Serialize; -pub struct Server { - TcpStream: TcpStream, +pub struct Client { + tcp_stream: TcpStream, pub address: &'static str, pub port: u32, pub tls: bool, pub compression: bool, } -// impl Server { -// pub fn login(&self, user: &'static str, pass: &'static str) { -// println!("{:?}", basic::Void); -// } -// } +impl Client { + pub fn login(&mut self, user: &'static str, pass: &'static str, client: types::handshake::ClientInit) { + self.tcp_stream.write(&client.serialize()).unwrap(); + } +} -pub fn connect(address: &'static str, port: u32, tls: bool, compression: bool) -> Result { +pub fn connect(address: &'static str, port: u32, tls: bool, compression: bool) -> Result { //let mut s = BufWriter::new(TcpStream::connect(format!("{}:{}", address, port)).unwrap()); let mut s = TcpStream::connect(format!("{}:{}", address, port)).unwrap(); @@ -46,10 +47,10 @@ pub fn connect(address: &'static str, port: u32, tls: bool, compression: bool) - let mut buf = [0; 4]; s.read_exact(&mut buf)?; - println!("Received: {:?}", types::basic::VOID); + println!("Received: {:?}", buf); - let mut server: Server = Server { - TcpStream: s, + let server: Client = Client { + tcp_stream: s, address: address, port: port, tls: tls, -- cgit v1.2.3