add some logging
All checks were successful
Build and Test / puyopuyo (push) Successful in 3m26s
Build and Test / wii-u-chat (push) Successful in 3m50s
Build and Test / splatoon (push) Successful in 4m13s
Build and Test / friends (push) Successful in 4m36s
Build and Test / mario-tennis (push) Successful in 4m37s
Build and Test / splatoon-testfire (push) Successful in 5m0s
Build and Test / wii-sports-club (push) Successful in 5m29s
Build and Test / minecraft-wiiu (push) Successful in 6m47s
Build and Test / fast-racing-neo (push) Successful in 7m18s
Build and Test / super-mario-maker (push) Successful in 7m19s
Build and Test / sonic-transformed (push) Successful in 17m37s
All checks were successful
Build and Test / puyopuyo (push) Successful in 3m26s
Build and Test / wii-u-chat (push) Successful in 3m50s
Build and Test / splatoon (push) Successful in 4m13s
Build and Test / friends (push) Successful in 4m36s
Build and Test / mario-tennis (push) Successful in 4m37s
Build and Test / splatoon-testfire (push) Successful in 5m0s
Build and Test / wii-sports-club (push) Successful in 5m29s
Build and Test / minecraft-wiiu (push) Successful in 6m47s
Build and Test / fast-racing-neo (push) Successful in 7m18s
Build and Test / super-mario-maker (push) Successful in 7m19s
Build and Test / sonic-transformed (push) Successful in 17m37s
This commit is contained in:
parent
2024c80575
commit
1a47d28362
2 changed files with 16 additions and 8 deletions
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"rust-analyzer.cargo.features": [
|
"rust-analyzer.cargo.features": [
|
||||||
"friends"
|
"v3-8-15", "splatoon", "prudpv1"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -37,7 +37,7 @@ use std::env;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
use cfg_if::cfg_if;
|
use cfg_if::cfg_if;
|
||||||
use log::{error, info};
|
use log::{error, info, warn};
|
||||||
use macros::rmc_struct;
|
use macros::rmc_struct;
|
||||||
use rnex_core::prudp::socket_addr::PRUDPSockAddr;
|
use rnex_core::prudp::socket_addr::PRUDPSockAddr;
|
||||||
use rnex_core::rmc::protocols::notifications::{NotificationEvent, RemoteNotification};
|
use rnex_core::rmc::protocols::notifications::{NotificationEvent, RemoteNotification};
|
||||||
|
|
@ -100,7 +100,7 @@ impl Secure for User {
|
||||||
) -> Result<(QResult, u32, StationUrl), ErrorCode> {
|
) -> Result<(QResult, u32, StationUrl), ErrorCode> {
|
||||||
let cid = self.matchmake_manager.next_cid();
|
let cid = self.matchmake_manager.next_cid();
|
||||||
|
|
||||||
println!("{:?}", station_urls);
|
// println!("{:?}", station_urls);
|
||||||
|
|
||||||
let mut users = self.matchmake_manager.users.write().await;
|
let mut users = self.matchmake_manager.users.write().await;
|
||||||
users.insert(cid, self.this.clone());
|
users.insert(cid, self.this.clone());
|
||||||
|
|
@ -135,11 +135,15 @@ impl Secure for User {
|
||||||
async fn replace_url(&self, target_url: StationUrl, dest: StationUrl) -> Result<(), ErrorCode> {
|
async fn replace_url(&self, target_url: StationUrl, dest: StationUrl) -> Result<(), ErrorCode> {
|
||||||
let mut lock = self.station_url.write().await;
|
let mut lock = self.station_url.write().await;
|
||||||
|
|
||||||
|
info!("debug: target URL is {:?}", target_url);
|
||||||
|
|
||||||
let Some(target_addr) = target_url.options.iter().find(|v| matches!(v, Address(_))) else {
|
let Some(target_addr) = target_url.options.iter().find(|v| matches!(v, Address(_))) else {
|
||||||
|
warn!("address doesnt match");
|
||||||
return Err(ErrorCode::Core_InvalidArgument);
|
return Err(ErrorCode::Core_InvalidArgument);
|
||||||
};
|
};
|
||||||
|
|
||||||
let Some(target_port) = target_url.options.iter().find(|v| matches!(v, Port(_))) else {
|
let Some(target_port) = target_url.options.iter().find(|v| matches!(v, Port(_))) else {
|
||||||
|
warn!("port doesnt match");
|
||||||
return Err(ErrorCode::Core_InvalidArgument);
|
return Err(ErrorCode::Core_InvalidArgument);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -147,6 +151,7 @@ impl Secure for User {
|
||||||
url.options.iter().any(|o| o == target_addr)
|
url.options.iter().any(|o| o == target_addr)
|
||||||
&& url.options.iter().any(|o| o == target_port)
|
&& url.options.iter().any(|o| o == target_port)
|
||||||
}) else {
|
}) else {
|
||||||
|
warn!("the third one failed");
|
||||||
return Err(ErrorCode::Core_InvalidArgument);
|
return Err(ErrorCode::Core_InvalidArgument);
|
||||||
};
|
};
|
||||||
*replacement_target = dest;
|
*replacement_target = dest;
|
||||||
|
|
@ -197,7 +202,7 @@ impl MatchmakeExtension for User {
|
||||||
&self,
|
&self,
|
||||||
create_session_param: CreateMatchmakeSessionParam,
|
create_session_param: CreateMatchmakeSessionParam,
|
||||||
) -> Result<MatchmakeSession, ErrorCode> {
|
) -> Result<MatchmakeSession, ErrorCode> {
|
||||||
println!("{:?}", create_session_param);
|
// println!("{:?}", create_session_param);
|
||||||
|
|
||||||
let gid = self.matchmake_manager.next_gid();
|
let gid = self.matchmake_manager.next_gid();
|
||||||
|
|
||||||
|
|
@ -311,7 +316,7 @@ impl MatchmakeExtension for User {
|
||||||
&self,
|
&self,
|
||||||
param: AutoMatchmakeParam,
|
param: AutoMatchmakeParam,
|
||||||
) -> Result<MatchmakeSession, ErrorCode> {
|
) -> Result<MatchmakeSession, ErrorCode> {
|
||||||
println!("{:?}", param);
|
// println!("{:?}", param);
|
||||||
|
|
||||||
let mut joining_players = vec![self.this.clone()];
|
let mut joining_players = vec![self.this.clone()];
|
||||||
|
|
||||||
|
|
@ -340,9 +345,10 @@ impl MatchmakeExtension for User {
|
||||||
for session in sessions.values() {
|
for session in sessions.values() {
|
||||||
let mut session = session.lock().await;
|
let mut session = session.lock().await;
|
||||||
|
|
||||||
println!("checking session!");
|
// println!("checking session!");
|
||||||
|
|
||||||
if !session.is_joinable() {
|
if !session.is_joinable() {
|
||||||
|
warn!("session was not joinable, skipping");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -355,6 +361,7 @@ impl MatchmakeExtension for User {
|
||||||
}
|
}
|
||||||
|
|
||||||
if bool_matched_criteria {
|
if bool_matched_criteria {
|
||||||
|
info!("{:?}", session);
|
||||||
session
|
session
|
||||||
.add_players(&joining_players, param.join_message)
|
.add_players(&joining_players, param.join_message)
|
||||||
.await;
|
.await;
|
||||||
|
|
@ -365,7 +372,8 @@ impl MatchmakeExtension for User {
|
||||||
|
|
||||||
drop(sessions);
|
drop(sessions);
|
||||||
|
|
||||||
println!("making new session!");
|
// println!("making new session!");
|
||||||
|
info!("making new session");
|
||||||
|
|
||||||
let AutoMatchmakeParam {
|
let AutoMatchmakeParam {
|
||||||
join_message,
|
join_message,
|
||||||
|
|
@ -569,7 +577,7 @@ impl Matchmake for User {
|
||||||
.ok_or(ErrorCode::RendezVous_SessionClosed)?
|
.ok_or(ErrorCode::RendezVous_SessionClosed)?
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
println!("{:?}", urls);
|
info!("getstationurls URLs: {:?}", urls);
|
||||||
|
|
||||||
if urls.is_empty() {
|
if urls.is_empty() {
|
||||||
return Err(ErrorCode::RendezVous_NotParticipatedGathering);
|
return Err(ErrorCode::RendezVous_NotParticipatedGathering);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue