Move IPC opcodes to their own enum & module

src/ipc.rs

@@ -0,0 +1,11 @@
+use binrw::binrw;
+
+#[binrw]
+#[brw(repr = u16)]
+#[derive(Clone, PartialEq, Debug)]
+pub enum IPCOpCode {
+    /// Sent by the client after exchanging encryption information with the lobby server.
+    ClientVersionInfo = 0x5,
+    /// Sent by the server to inform the client of service accounts.
+    LobbyServiceAccountList = 0xC,
+}

src/lib.rs

@@ -2,11 +2,12 @@ use minijinja::Environment;
 use rand::Rng;
 use rand::distributions::Alphanumeric;
 
+mod common;
 pub mod config;
 pub mod encryption;
+pub mod ipc;
 pub mod packet;
 pub mod patchlist;
-mod common;
 
 pub fn generate_sid() -> String {
     let random_id: String = rand::thread_rng()

src/packet.rs

@@ -10,7 +10,11 @@ use tokio::{
     net::TcpStream,
 };
 
-use crate::{common::{read_bool_from, read_string, write_bool_as, write_string}, encryption::{blowfish_encode, decrypt, encrypt, generate_encryption_key}};
+use crate::{
+    common::{read_bool_from, read_string, write_bool_as, write_string},
+    encryption::{blowfish_encode, decrypt, encrypt, generate_encryption_key},
+    ipc::IPCOpCode,
+};
 
 #[binrw]
 #[brw(repr = u16)]
@@ -36,11 +40,11 @@ struct ServiceAccount {
 }
 
 #[binrw]
-#[br(import(magic: u16))]
+#[br(import(magic: &IPCOpCode))]
 #[derive(Debug, Clone)]
-enum IPCOpCode {
+enum IPCStructData {
     // Client->Server IPC
-    #[br(pre_assert(magic == 0x5u16))]
+    #[br(pre_assert(*magic == IPCOpCode::ClientVersionInfo))]
     ClientVersionInfo {
         #[brw(pad_before = 18)] // full of nonsense i don't understand yet
         #[br(count = 64)]
@@ -57,7 +61,6 @@ enum IPCOpCode {
     },
 
     // Server->Client IPC
-    //#[br(pre_assert(magic == 0x000C))]
     LobbyServiceAccountList {
         sequence: u64,
         #[brw(pad_before = 4)]
@@ -75,13 +78,13 @@ enum IPCOpCode {
 struct IPCSegment {
     unk1: u8,
     unk2: u8,
-    op_code: u16,
+    op_code: IPCOpCode,
     #[brw(pad_before = 2)] // empty
     server_id: u16,
     timestamp: u32,
     #[brw(pad_before = 4)]
-    #[br(args(op_code))]
+    #[br(args(&op_code))]
-    pub data: IPCOpCode,
+    pub data: IPCStructData,
 }
 
 impl IPCSegment {
@@ -89,8 +92,8 @@ impl IPCSegment {
         let header = 16;
         header
             + match self.data {
-                IPCOpCode::ClientVersionInfo { .. } => todo!(),
+                IPCStructData::ClientVersionInfo { .. } => todo!(),
-                IPCOpCode::LobbyServiceAccountList { .. } => 19,
+                IPCStructData::LobbyServiceAccountList { .. } => 19,
             }
     }
 }
@@ -286,7 +289,7 @@ pub async fn parse_packet(socket: &mut WriteHalf<TcpStream>, data: &[u8], state:
                     }
                     SegmentType::IPC { data } => {
                         match &data.data {
-                            IPCOpCode::ClientVersionInfo {
+                            IPCStructData::ClientVersionInfo {
                                 session_id,
                                 version_info,
                             } => {
@@ -307,7 +310,7 @@ pub async fn parse_packet(socket: &mut WriteHalf<TcpStream>, data: &[u8], state:
                                     name: "Test Service Account".to_string(),
                                 }];
 
-                                let service_account_list = IPCOpCode::LobbyServiceAccountList {
+                                let service_account_list = IPCStructData::LobbyServiceAccountList {
                                     sequence: 0,
                                     num_service_accounts: service_accounts.len() as u8,
                                     unk1: 3,
@@ -318,7 +321,7 @@ pub async fn parse_packet(socket: &mut WriteHalf<TcpStream>, data: &[u8], state:
                                 let ipc = IPCSegment {
                                     unk1: 0,
                                     unk2: 0,
-                                    op_code: 0xC, // FIXME: use enum pls
+                                    op_code: IPCOpCode::LobbyServiceAccountList,
                                     server_id: 0,
                                     timestamp,
                                     data: service_account_list,