From 937aafb099e2fc31ec72430bb74cab2111d2d97b Mon Sep 17 00:00:00 2001 From: Arkitu <85173315+Arkitu@users.noreply.github.com> Date: Sun, 27 Apr 2025 15:21:33 +0200 Subject: [PATCH] change wifi name + handle client bad request --- src/main.rs | 4 ++-- src/socket.rs | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 11deeb8..03280c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -123,8 +123,8 @@ async fn main(spawner: Spawner) { unwrap(spawner.spawn(net_task(runner))).await; #[cfg(not(feature = "wifi-connect"))] - //control.start_ap_open("cyw43", 5).await; - control.start_ap_wpa2("cyw43", "password", 5).await; + control.start_ap_open("TicTacToe", 5).await; + // control.start_ap_wpa2("TicTacToe", "password", 5).await; #[cfg(feature = "wifi-connect")] { diff --git a/src/socket.rs b/src/socket.rs index 38d923d..7e67863 100644 --- a/src/socket.rs +++ b/src/socket.rs @@ -5,7 +5,6 @@ use embassy_time::{Duration, Timer}; use embedded_io_async::Write as _; use heapless::Vec; use log::{info, warn}; -use pico_website::unwrap; use crate::game::{GameClient, Team}; @@ -77,7 +76,17 @@ pub async fn listen_task(stack: embassy_net::Stack<'static>, team: Team, port: u Some(b"GET") => HttpRequestType::Get, Some(b"POST") => HttpRequestType::Post, Some(t) => { - warn!("Unknown request type : {}", unwrap(from_utf8(t)).await); + match from_utf8(t) { + Ok(t) => { + warn!("Unknown request type : {}", t); + } + Err(e) => { + warn!( + "Error while parsing request type : {}\nRaw type : {:?}", + e, t + ); + } + } break; } None => { @@ -86,7 +95,16 @@ pub async fn listen_task(stack: embassy_net::Stack<'static>, team: Team, port: u } }, match l1.next() { - Some(path) => unwrap(from_utf8(path)).await, + Some(path) => match from_utf8(path) { + Ok(p) => p, + Err(e) => { + warn!( + "Error while parsing requested path : {}\nRaw path : {:?}", + e, path + ); + break; + } + }, None => { warn!("No path"); break;