From 9f1a92d1b353bae5e704a3ebca95aacf0da8bf39 Mon Sep 17 00:00:00 2001
From: legitnull <legitnull0@gmail.com>
Date: Sat, 18 Feb 2023 14:01:55 -0700
Subject: [PATCH] fix threading in invade

---
 src/main.rs           |  2 +-
 src/modules/invade.rs | 34 ++++++++++++++--------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 58ef021..27f7cfe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -74,7 +74,7 @@ fn main() {
 
                 // RESPOND TO PINGS
                 if message.starts_with("PING") {
-                    println!("[%] PONG");
+                    println!("[%] PONG {}", config.nick);
                     ssl_stream.write_all("PONG ircd.chat\r\n".as_bytes()).unwrap();
                     continue; // skip processing the PING message further
                 }
diff --git a/src/modules/invade.rs b/src/modules/invade.rs
index d57edc8..e048bcf 100644
--- a/src/modules/invade.rs
+++ b/src/modules/invade.rs
@@ -1,7 +1,7 @@
 use crate::modules::Command;
 
 use std::cell::RefCell;
-use std::io::{BufRead, BufReader, Write};
+use std::io::{Write};
 use std::net::TcpStream;
 use std::rc::Rc;
 
@@ -9,8 +9,6 @@ use openssl::ssl::{SslConnector, SslMethod};
 use serde::Deserialize;
 use toml::Value;
 
-
-
 #[derive(Clone, Deserialize)]
 struct Config {
     invaders: Vec<String>,
@@ -39,34 +37,30 @@ impl Command for InvadeCommand {
                 let thread_invader = invader.to_string();
                 let config_clone = config.clone();
                 let screaming = scream.to_string();
-                
 
                 std::thread::spawn(move || {
-                    let stream = TcpStream::connect(format!("{}:{}", config_clone.server, config_clone.port)).unwrap();
+                    let stream = TcpStream::connect((config_clone.server.as_str(), config_clone.port)).unwrap();
                     let connector = SslConnector::builder(SslMethod::tls()).unwrap().build();
-                    let ssl_stream = connector.connect(&config_clone.server, stream).unwrap();
-                    let ssl_stream = Rc::new(RefCell::new(ssl_stream));
+                    let mut ssl_stream = connector.connect(config_clone.server.as_str(), stream).unwrap();
                     let nick_command = format!("NICK {}\r\n", thread_invader);
                     let user_command = format!("USER {} 0 * :{}\r\n", thread_invader, thread_invader);
-                    ssl_stream.borrow_mut().write_all(nick_command.as_bytes()).unwrap();
-                    ssl_stream.borrow_mut().write_all(user_command.as_bytes()).unwrap();
+                    ssl_stream.write_all(nick_command.as_bytes()).unwrap();
+                    ssl_stream.write_all(user_command.as_bytes()).unwrap();
                     let join_command = format!("JOIN {} \r\n", thread_channel);
-                    ssl_stream.borrow_mut().write_all(join_command.as_bytes()).unwrap();
+                    ssl_stream.write_all(join_command.as_bytes()).unwrap();
                     let msg = format!("PRIVMSG {} :{}\r\n", thread_channel, screaming);
-                    ssl_stream.borrow_mut().write_all(msg.as_bytes()).unwrap();
-
+                    ssl_stream.write_all(msg.as_bytes()).unwrap();
 
                     loop {
-                        let mut ssl_stream_ref = ssl_stream.borrow_mut();
-                        let mut reader = BufReader::new(&mut *ssl_stream_ref);
-                                        
-                        let mut message = String::new();
-                        match reader.read_line(&mut message) {
+                        let mut buffer = [0; 512];
+                        match ssl_stream.ssl_read(&mut buffer) {
                             Ok(0) => break,
-                            Ok(_) => {
+                            Ok(n) => {
+                                let message = String::from_utf8_lossy(&buffer[..n]);
                                 if message.starts_with("PING") {
                                     let response = message.replace("PING", "PONG");
-                                    ssl_stream.borrow_mut().write_all(response.as_bytes()).unwrap();
+                                    println!("[%] PONG {}", thread_invader);
+                                    ssl_stream.write_all(response.as_bytes()).unwrap();
                                 }
                             }
                             Err(e) => {
@@ -83,4 +77,4 @@ impl Command for InvadeCommand {
 
         response
     }
-}
+}
\ No newline at end of file