david/rust-irc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle port bind issue, minor cleanup

Browse Source
This commit is contained in:
David Westgate 2023-11-30 21:38:56 -08:00
parent 14181b87e8
commit 12a132df93
2 changed files with 116 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.rs
View File

@ -162,8 +162,8 @@ pub fn start() {
} }
} }
// let host: String = input!("Enter the server host: "); let host: String = input!("Enter the server host: ");
let host: &str = "fab04.cecs.pdx.edu"; // let host: &str = "fab04.cecs.pdx.edu"; //hard coded host for testing
if let Ok(mut stream) = TcpStream::connect(host.to_owned() + ":6667") { if let Ok(mut stream) = TcpStream::connect(host.to_owned() + ":6667") {
println!("Connected to {}", host); println!("Connected to {}", host);

32
src/server.rs
View File

@ -11,7 +11,6 @@ use prompted::input;
use rust_irc::{clear, codes, SPACE_BYTES}; use rust_irc::{clear, codes, SPACE_BYTES};
const SERVER_ADDRESS: &str = "0.0.0.0:6667"; const SERVER_ADDRESS: &str = "0.0.0.0:6667";
const MAX_USERS: usize = 20;
#[derive(Debug)] #[derive(Debug)]
struct Server { struct Server {
@ -42,7 +41,6 @@ fn message_room(room: &str, msg: &str, sender: &str, server: &Arc<Mutex<Server>>
msg_bytes, msg_bytes,
] ]
.concat(); .concat();
println!("out buf {:?} ", out_buf.to_ascii_lowercase());
let mut guard: std::sync::MutexGuard<'_, Server> = server.lock().unwrap(); let mut guard: std::sync::MutexGuard<'_, Server> = server.lock().unwrap();
let server: &mut Server = guard.deref_mut(); let server: &mut Server = guard.deref_mut();
@ -150,7 +148,7 @@ fn handle_client(
buf_out.extend_from_slice(&[codes::RESPONSE]); buf_out.extend_from_slice(&[codes::RESPONSE]);
for (room, _user) in &unlocked_server.rooms { for (room, _user) in &unlocked_server.rooms {
buf_out.extend_from_slice(room.as_bytes()); buf_out.extend_from_slice(room.as_bytes());
buf_out.extend_from_slice(&[0x20]); buf_out.extend_from_slice(SPACE_BYTES);
} }
stream.write(&buf_out).unwrap(); stream.write(&buf_out).unwrap();
} }
@ -161,7 +159,7 @@ fn handle_client(
buf_out.extend_from_slice(&[codes::RESPONSE]); buf_out.extend_from_slice(&[codes::RESPONSE]);
for (user, _) in &unlocked_server.users { for (user, _) in &unlocked_server.users {
buf_out.extend_from_slice(user.as_bytes()); buf_out.extend_from_slice(user.as_bytes());
buf_out.extend_from_slice(&[0x20]); buf_out.extend_from_slice(SPACE_BYTES);
} }
stream.write(&buf_out).unwrap(); stream.write(&buf_out).unwrap();
} }
@ -175,7 +173,7 @@ fn handle_client(
Some(l) => { Some(l) => {
for ele in l { for ele in l {
buf_out.extend_from_slice(ele.as_bytes()); buf_out.extend_from_slice(ele.as_bytes());
buf_out.extend_from_slice(&[0x20]); buf_out.extend_from_slice(SPACE_BYTES);
} }
stream.write_all(&buf_out).unwrap(); stream.write_all(&buf_out).unwrap();
} }
@ -246,15 +244,15 @@ fn message_all_senders_rooms(
message: &str, message: &str,
stream: &mut TcpStream, stream: &mut TcpStream,
) { ) {
let rooms = get_rooms_of_user(server, sender); let rooms: Vec<String> = get_rooms_of_user(server, sender);
let mut guard = server.lock().unwrap(); let mut guard: std::sync::MutexGuard<'_, Server> = server.lock().unwrap();
let sender_bytes: &[u8] = sender.as_bytes(); let sender_bytes: &[u8] = sender.as_bytes();
let code_bytes: &[u8] = &[codes::client::MESSAGE_ROOM]; let code_bytes: &[u8] = &[codes::client::MESSAGE_ROOM];
let message_bytes: &[u8] = message.as_bytes(); let message_bytes: &[u8] = message.as_bytes();
let space_bytes: &[u8] = &[0x20]; let space_bytes: &[u8] = &[0x20];
for room in rooms { for room in rooms {
let room_bytes: &[u8] = room.as_bytes(); let room_bytes: &[u8] = room.as_bytes();
let users = guard.rooms.get(&room).unwrap().clone(); let users: Vec<String> = guard.rooms.get(&room).unwrap().clone();
let out_buf: &Vec<u8> = &[ let out_buf: &Vec<u8> = &[
code_bytes, code_bytes,
room_bytes, room_bytes,
@ -398,7 +396,9 @@ fn get_rooms_of_user(server: &Arc<Mutex<Server>>, user: &str) -> Vec<String> {
} }
pub fn start() { pub fn start() {
let listener: TcpListener = TcpListener::bind(SERVER_ADDRESS).expect("Failed to bind to port"); let listener_result: Result<TcpListener, std::io::Error> = TcpListener::bind(SERVER_ADDRESS);
match listener_result {
Ok(listener) => {
let server: Arc<Mutex<Server>> = Arc::new(Mutex::new(Server::new())); let server: Arc<Mutex<Server>> = Arc::new(Mutex::new(Server::new()));
let server_outer: Arc<Mutex<Server>> = Arc::clone(&server); let server_outer: Arc<Mutex<Server>> = Arc::clone(&server);
clear(); clear();
@ -428,13 +428,18 @@ pub fn start() {
let cmd_bytes: &[u8] = &buf_in[0..1]; let cmd_bytes: &[u8] = &buf_in[0..1];
let param_bytes: &[u8] = &buf_in[1..size]; let param_bytes: &[u8] = &buf_in[1..size];
if cmd_bytes[0] == codes::client::REGISTER_NICK { if cmd_bytes[0] == codes::client::REGISTER_NICK {
nickname = String::from_utf8_lossy(param_bytes).to_string(); nickname =
String::from_utf8_lossy(param_bytes).to_string();
register_nick(&server_inner, &nickname, &mut stream); register_nick(&server_inner, &nickname, &mut stream);
loop { loop {
match stream.read(&mut buf_in) { match stream.read(&mut buf_in) {
Ok(0) => { Ok(0) => {
println!("IP {} with nickname {} has closed the connection", stream.peer_addr().unwrap().to_string(), nickname); println!("IP {} with nickname {} has closed the connection", stream.peer_addr().unwrap().to_string(), nickname);
remove_user(&server_inner, &nickname, &mut stream); remove_user(
&server_inner,
&nickname,
&mut stream,
);
break; break;
} }
Ok(size) => { Ok(size) => {
@ -512,3 +517,8 @@ pub fn start() {
} }
} }
} }
Err(_) => {
eprintln!("Failed to bind port. Try again");
}
}
}