feat & chore: clean up and push current progress on splatfest matchmaking

src/rmc/protocols/matchmake.rs

@@ -8,4 +8,7 @@ pub trait Matchmake{
     async fn unregister_gathering(&self, gid: u32) -> Result<bool, ErrorCode>;
     #[method_id(41)]
     async fn get_session_urls(&self, gid: u32) -> Result<Vec<StationUrl>, ErrorCode>;
+
+    #[method_id(42)]
+    async fn update_session_host(&self, gid: u32, change_owner: bool) -> Result<(), ErrorCode>;
 }

src/rmc/protocols/matchmake_ext.rs

@@ -0,0 +1,9 @@
+use macros::{method_id, rmc_proto};
+use crate::prudp::station_url::StationUrl;
+use crate::rmc::response::ErrorCode;
+
+#[rmc_proto(50)]
+pub trait MatchmakeExt{
+    #[method_id(1)]
+    async fn end_participation(&self, gid: u32, message: String) -> Result<bool, ErrorCode>;
+}

src/rmc/protocols/matchmake_extension.rs

@@ -4,6 +4,9 @@ use crate::rmc::structures::matchmake::{AutoMatchmakeParam, CreateMatchmakeSessi
 
 #[rmc_proto(109)]
 pub trait MatchmakeExtension{
+    #[method_id(1)]
+    async fn close_participation(&self, gid: u32) -> Result<(), ErrorCode>;
+
     #[method_id(16)]
     async fn get_playing_session(&self, pids: Vec<u32>) -> Result<Vec<()>, ErrorCode>;
 
@@ -17,4 +20,7 @@ pub trait MatchmakeExtension{
 
     #[method_id(40)]
     async fn auto_matchmake_with_param_postpone(&self, session: AutoMatchmakeParam) -> Result<MatchmakeSession, ErrorCode>;
+
+    #[method_id(41)]
+    async fn find_matchmake_session_by_gathering_id_detail(&self, gid: u32) -> Result<MatchmakeSession, ErrorCode>;
 }

src/rmc/protocols/mod.rs

@@ -6,6 +6,7 @@ pub mod notifications;
 pub mod matchmake;
 pub mod matchmake_extension;
 pub mod nat_traversal;
+pub mod matchmake_ext;
 
 use crate::prudp::socket::{ExternalConnection, SendingConnection};
 use crate::rmc::message::RMCMessage;

src/rmc/protocols/nat_traversal.rs

@@ -10,6 +10,15 @@ pub trait NatTraversal{
     #[method_id(3)]
     async fn request_probe_initialization_ext(&self, target_list: Vec<String>, station_to_probe: String) -> Result<(),ErrorCode>;
 
+    #[method_id(4)]
+    async fn report_nat_traversal_result(&self, cid: u32, result: bool, rtt: u32) -> Result<(),ErrorCode>;
+
     #[method_id(5)]
     async fn report_nat_properties(&self, nat_mapping: u32, nat_filtering: u32, rtt: u32) -> Result<(),ErrorCode>;
-}
+}
+/*
+#[rmc_proto(3, NoReturn)]
+pub trait NatTraversalConsole{
+    #[method_id(2)]
+    async fn request_probe_initiation(&self, station_to_probe: String) -> Result<(),ErrorCode>;
+}*/

src/rmc/protocols/notifications.rs

@@ -2,7 +2,12 @@ use macros::{method_id, rmc_proto, rmc_struct, RmcSerialize};
 use crate::rmc::response::ErrorCode;
 use crate::rmc::structures::qresult::QResult;
 
-#[derive(RmcSerialize, Debug)]
+pub mod notification_types{
+    pub const OWNERSHIP_CHANGED: u32 = 4000;
+    pub const HOST_CHANGED: u32 = 110000;
+}
+
+#[derive(RmcSerialize, Debug, Default, Clone)]
 #[rmc_struct(0)]
 pub struct NotificationEvent{
     pub pid_source: u32,