redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-06-30 03:37:45 +00:00
Code Activity

More unknown IPC handling fixes

Browse source
This commit is contained in:
Joshua Goins 2025-06-26 21:06:54 -04:00
parent a3d32b67aa
commit 05f909497c
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/bin/kawari-lobby.rs
View file

@ -174,6 +174,7 @@ async fn main() {
.send_enter_world(*sequence, *content_id, our_actor_id)
.await;
}
_ => {}
},
SegmentData::KeepAliveRequest { id, timestamp } => {
send_keep_alive::<ServerLobbyIpcSegment>(

1
src/bin/kawari-world.rs
View file

@ -923,6 +923,7 @@ async fn client_loop(
})
.await;
}
_ => {},
}
}
SegmentData::KeepAliveRequest { id, timestamp } => {

9
src/ipc/chat/mod.rs
View file

@ -36,9 +36,14 @@ impl Default for ServerChatIpcSegment {
}
#[binrw]
#[br(import(_magic: &ServerChatIpcType))]
#[br(import(magic: &ServerChatIpcType))]
#[derive(Debug, Clone)]
pub enum ServerChatIpcData {
/// Sent by the server to Initialize something chat-related?
LoginReply { timestamp: u32, sid: u32 },
#[br(pre_assert(*magic == ServerChatIpcType::LoginReply))]
LoginReply {
timestamp: u32,
sid: u32,
},
Unknown,
}

11
src/ipc/lobby/mod.rs
View file

@ -127,13 +127,15 @@ pub enum ClientLobbyIpcData {
/// Sent by the client when they request something about the character (e.g. deletion.)
#[br(pre_assert(*magic == ClientLobbyIpcType::CharaMake))]
CharaMake(CharaMake),
Unknown,
}
#[binrw]
#[br(import(_magic: &ServerLobbyIpcType))]
#[br(import(magic: &ServerLobbyIpcType))]
#[derive(Debug, Clone)]
pub enum ServerLobbyIpcData {
/// Sent by the server to indicate an lobby error occured.
#[br(pre_assert(*magic == ServerLobbyIpcType::NackReply))]
NackReply {
sequence: u64,
error: u32,
@ -143,10 +145,13 @@ pub enum ServerLobbyIpcData {
unk1: u16,
},
/// Sent by the server to inform the client of their service accounts.
#[br(pre_assert(*magic == ServerLobbyIpcType::LoginReply))]
LoginReply(LoginReply),
/// Sent by the server to inform the client of their characters.
#[br(pre_assert(*magic == ServerLobbyIpcType::ServiceLoginReply))]
ServiceLoginReply(ServiceLoginReply),
// Assumed what this is, but probably incorrect
#[br(pre_assert(*magic == ServerLobbyIpcType::CharaMakeReply))]
CharaMakeReply {
sequence: u64,
unk1: u8,
@ -158,6 +163,7 @@ pub enum ServerLobbyIpcData {
details: CharacterDetails,
},
/// Sent by the server to tell the client how to connect to the world server.
#[br(pre_assert(*magic == ServerLobbyIpcType::GameLoginReply))]
GameLoginReply {
sequence: u64,
actor_id: u32,
@ -178,14 +184,17 @@ pub enum ServerLobbyIpcData {
host: String,
},
/// Sent by the server to inform the client of their servers.
#[br(pre_assert(*magic == ServerLobbyIpcType::DistWorldInfo))]
DistWorldInfo(DistWorldInfo),
/// Sent by the server to inform the client of their retainers.
#[br(pre_assert(*magic == ServerLobbyIpcType::DistRetainerInfo))]
DistRetainerInfo {
// TODO: what is in here?
#[brw(pad_before = 7)]
#[brw(pad_after = 202)]
unk1: u8,
},
Unknown,
}
#[cfg(test)]