arkitu/pico-website
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

keep that for the records if I need dhcparse options

Browse Source
This commit is contained in:
Arkitu 2025-04-22 20:58:39 +02:00
parent 2a15f4c503
commit a6ef2702a3
3 changed files with 192 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Cargo.toml
View File

@ -4,8 +4,11 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[features] [features]
wifi-connect = ["dep:serde-json-core", "dep:serde"] # you need to add a wifi.conf file with your wifi credentials (for example : "Example Wifi name:pa$$w0rd") wifi-connect = [
default = ["wifi-connect"] "dep:serde-json-core",
"dep:serde",
] # you need to add a wifi.conf file with your wifi credentials (for example : "Example Wifi name:pa$$w0rd")
default = []
[dependencies] [dependencies]
embassy-executor = { git = "https://github.com/embassy-rs/embassy", features = [ embassy-executor = { git = "https://github.com/embassy-rs/embassy", features = [
@ -22,8 +25,8 @@ embassy-rp = { git = "https://github.com/embassy-rs/embassy", features = [
"time-driver", "time-driver",
"critical-section-impl", "critical-section-impl",
] } ] }
embassy-time = {git = "https://github.com/embassy-rs/embassy"} embassy-time = { git = "https://github.com/embassy-rs/embassy" }
embassy-usb-logger = {git = "https://github.com/embassy-rs/embassy"} embassy-usb-logger = { git = "https://github.com/embassy-rs/embassy" }
embassy-net = { git = "https://github.com/embassy-rs/embassy", features = [ embassy-net = { git = "https://github.com/embassy-rs/embassy", features = [
"defmt", "defmt",
"proto-ipv4", "proto-ipv4",
@ -31,8 +34,8 @@ embassy-net = { git = "https://github.com/embassy-rs/embassy", features = [
"udp", "udp",
"dhcpv4", "dhcpv4",
] } ] }
cyw43-pio = {git = "https://github.com/embassy-rs/embassy"} cyw43-pio = { git = "https://github.com/embassy-rs/embassy" }
cyw43 = {git = "https://github.com/embassy-rs/embassy"} cyw43 = { git = "https://github.com/embassy-rs/embassy" }
embedded-io-async = "*" embedded-io-async = "*"
defmt = "*" defmt = "*"
@ -46,6 +49,8 @@ heapless = "*"
rand_core = "*" rand_core = "*"
log = "*" log = "*"
serde-json-core = {version = "*", optional = true} serde-json-core = { version = "*", optional = true }
serde = {version = "*", optional = true, default-features = false, features = ["derive"]} serde = { version = "*", optional = true, default-features = false, features = [
dhcparse = {version = "*", default-features = false} "derive",
] }
dhcparse = { version = "*", default-features = false }

8
src/lib.rs
View File

@ -2,17 +2,17 @@
use core::fmt::Debug; use core::fmt::Debug;
use embassy_time::Timer; use embassy_time::Timer;
use log::error; use log::info;
pub async fn unwrap<T, E: Debug>(res: Result<T, E>) -> T { pub async fn unwrap<T, E: Debug>(res: Result<T, E>) -> T {
match res { match res {
Ok(v) => v, Ok(v) => v,
Err(e) => { Err(e) => {
error!("FATAL ERROR : {:?}", e); info!("FATAL ERROR : {:?}", e);
loop { loop {
error!("FATAL ERROR : {:?}", e); info!("FATAL ERROR : {:?}", e);
Timer::after_secs(5).await; Timer::after_secs(5).await;
} }
} }
} }
} }

224
src/main.rs
View File

@ -5,12 +5,15 @@
#![feature(slice_split_once)] #![feature(slice_split_once)]
use core::net::Ipv4Addr; use core::net::Ipv4Addr;
use core::slice;
use cyw43_pio::{DEFAULT_CLOCK_DIVIDER, PioSpi}; use cyw43_pio::{DEFAULT_CLOCK_DIVIDER, PioSpi};
use dhcparse::dhcpv4::{DhcpOption, Encode as _, MessageType, OpCode}; use dhcparse::dhcpv4::{DhcpOption, Encode as _, MessageType, OpCode};
use dhcparse::{dhcpv4, v4_options}; use dhcparse::{dhcpv4, v4_options};
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_net::udp::{PacketMetadata, UdpMetadata, UdpSocket}; use embassy_net::udp::{PacketMetadata, UdpMetadata, UdpSocket};
use embassy_net::{Config, DhcpConfig, IpEndpoint, StackResources}; use embassy_net::{
Config, DhcpConfig, EthernetAddress, HardwareAddress, IpEndpoint, Ipv4Cidr, StackResources,
};
use embassy_rp::bind_interrupts; use embassy_rp::bind_interrupts;
use embassy_rp::clocks::RoscRng; use embassy_rp::clocks::RoscRng;
use embassy_rp::gpio::{Level, Output}; use embassy_rp::gpio::{Level, Output};
@ -18,16 +21,16 @@ use embassy_rp::peripherals::USB;
use embassy_rp::peripherals::{DMA_CH0, PIO0}; use embassy_rp::peripherals::{DMA_CH0, PIO0};
use embassy_rp::pio::{InterruptHandler as PioInterruptHandler, Pio}; use embassy_rp::pio::{InterruptHandler as PioInterruptHandler, Pio};
use embassy_rp::usb::{Driver, InterruptHandler as UsbInterruptHandler}; use embassy_rp::usb::{Driver, InterruptHandler as UsbInterruptHandler};
use embassy_time::Timer; use embassy_time::{Instant, Timer};
use heapless::Vec; use heapless::Vec;
use log::info; use log::info;
use pico_website::unwrap;
use rand_core::RngCore; use rand_core::RngCore;
use static_cell::StaticCell; use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _}; use {defmt_rtt as _, panic_probe as _};
use pico_website::unwrap;
mod socket;
mod game; mod game;
mod socket;
bind_interrupts!(struct Irqs { bind_interrupts!(struct Irqs {
USBCTRL_IRQ => UsbInterruptHandler<USB>; USBCTRL_IRQ => UsbInterruptHandler<USB>;
@ -87,14 +90,18 @@ async fn main(spawner: Spawner) {
#[cfg(not(feature = "wifi-connect"))] #[cfg(not(feature = "wifi-connect"))]
// Use a link-local address for communication without DHCP server // Use a link-local address for communication without DHCP server
let config = Config::ipv4_static(embassy_net::StaticConfigV4 { let config = Config::ipv4_static(embassy_net::StaticConfigV4 {
address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::new(192, 254, 0, 2), 16), address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::new(192, 254, 0, 2), 24),
dns_servers: heapless::Vec::new(), dns_servers: heapless::Vec::new(),
gateway: None, gateway: None,
}); });
#[cfg(feature = "wifi-connect")] #[cfg(feature = "wifi-connect")]
let (wifi_conf, config) = { let (wifi_conf, config) = {
let wifi_conf = unwrap(serde_json_core::from_slice::<WifiConnectConf>(include_bytes!("../wifi.json"))).await.0; let wifi_conf = unwrap(serde_json_core::from_slice::<WifiConnectConf>(
include_bytes!("../wifi.json"),
))
.await
.0;
// Use a link-local address for communication without DHCP server // Use a link-local address for communication without DHCP server
// let config = Config::dhcpv4(embassy_net::DhcpConfig::default()); // let config = Config::dhcpv4(embassy_net::DhcpConfig::default());
let config = match wifi_conf.ip { let config = match wifi_conf.ip {
@ -103,12 +110,11 @@ async fn main(spawner: Spawner) {
dns_servers: heapless::Vec::new(), dns_servers: heapless::Vec::new(),
gateway: None, gateway: None,
}), }),
None => Config::dhcpv4(DhcpConfig::default()) None => Config::dhcpv4(DhcpConfig::default()),
}; };
(wifi_conf, config) (wifi_conf, config)
}; };
// Generate random seed // Generate random seed
let seed = rng.next_u64(); let seed = rng.next_u64();
@ -131,7 +137,10 @@ async fn main(spawner: Spawner) {
{ {
loop { loop {
match control match control
.join(wifi_conf.name, cyw43::JoinOptions::new(wifi_conf.password.as_bytes())) .join(
wifi_conf.name,
cyw43::JoinOptions::new(wifi_conf.password.as_bytes()),
)
.await .await
{ {
Ok(_) => break, Ok(_) => break,
@ -164,8 +173,15 @@ async fn main(spawner: Spawner) {
let mut tx_meta = [PacketMetadata::EMPTY; 16]; let mut tx_meta = [PacketMetadata::EMPTY; 16];
let mut buf = [0; 4096]; let mut buf = [0; 4096];
let mut res_buf = Vec::<u8, 4096>::new(); let mut res_buf = Vec::<u8, 4096>::new();
let mut res_head = Vec::<u8, 2048>::new();
loop { loop {
let mut socket = UdpSocket::new(stack, &mut rx_meta, &mut rx_buffer, &mut tx_meta, &mut tx_buffer); let mut socket = UdpSocket::new(
stack,
&mut rx_meta,
&mut rx_buffer,
&mut tx_meta,
&mut tx_buffer,
);
unwrap(socket.bind(67)).await; unwrap(socket.bind(67)).await;
loop { loop {
@ -176,8 +192,10 @@ async fn main(spawner: Spawner) {
// } // }
// info!("may recv"); // info!("may recv");
// Timer::after_secs(0).await; // Timer::after_secs(0).await;
info!("receiving");
let (n, ep) = unwrap(socket.recv_from(&mut buf).await).await; let (n, ep) = unwrap(socket.recv_from(&mut buf).await).await;
info!("received");
Timer::after_secs(0).await;
// if let Ok(s) = core::str::from_utf8(&buf[..n]) { // if let Ok(s) = core::str::from_utf8(&buf[..n]) {
// info!("rxd str from {}: {}", ep, s); // info!("rxd str from {}: {}", ep, s);
@ -189,6 +207,17 @@ async fn main(spawner: Spawner) {
let msg = unwrap(dhcpv4::Message::new(&buf[..n])).await; let msg = unwrap(dhcpv4::Message::new(&buf[..n])).await;
let opts = unwrap(v4_options!(msg; MessageType required)).await; let opts = unwrap(v4_options!(msg; MessageType required)).await;
for o in unwrap(msg.options()).await {
info!(
"{:?}",
match o {
Err(_) => break,
Ok(o) => o,
}
);
}
info!("{:?}", opts);
Timer::after_secs(0).await;
match opts { match opts {
dhcpv4::MessageType::DISCOVER => { dhcpv4::MessageType::DISCOVER => {
@ -199,54 +228,149 @@ async fn main(spawner: Spawner) {
res_buf.push(0).unwrap(); // hops res_buf.push(0).unwrap(); // hops
res_buf.extend_from_slice(&buf[4..8]).unwrap(); // xid res_buf.extend_from_slice(&buf[4..8]).unwrap(); // xid
res_buf.extend_from_slice(&[0; 2]).unwrap(); // secs res_buf.extend_from_slice(&[0; 2]).unwrap(); // secs
res_buf.extend_from_slice(&buf[10..12]).unwrap(); // flags res_buf.extend_from_slice(&[0x80, 0x00]).unwrap(); // flags
res_buf.extend_from_slice(&[0; 4]).unwrap(); // ciaddr res_buf.extend_from_slice(&[0; 4]).unwrap(); // ciaddr
res_buf.extend_from_slice(&[192, 254, 0, 12]).unwrap(); // yiaddr res_buf.extend_from_slice(&[192, 254, 0, 12]).unwrap(); // yiaddr
res_buf.extend_from_slice(&[192, 254, 0, 2]).unwrap(); // siaddr res_buf.extend_from_slice(&[0; 4]).unwrap(); // siaddr
res_buf.extend_from_slice(&buf[24..28]).unwrap(); // giaddr res_buf.extend_from_slice(&buf[24..28]).unwrap(); // giaddr
res_buf.extend_from_slice(&buf[28..44]).unwrap(); // chaddr res_buf.extend_from_slice(&buf[28..44]).unwrap(); // chaddr
res_buf.extend_from_slice(&[0; 192]).unwrap(); // sname/file res_buf.extend_from_slice(&[0; 192]).unwrap(); // sname/file
res_buf.extend_from_slice(&[99, 130, 83, 99]).unwrap(); // magic cookie res_buf.extend_from_slice(&[99, 130, 83, 99]).unwrap(); // magic cookie
// options
res_buf.extend_from_slice(&[53, 1, 2]).unwrap(); // message type res_buf.extend_from_slice(&[0; 4]).unwrap();
res_buf.extend_from_slice(&[1, 4, 255, 255, 255, 0]).unwrap(); // subnet mask info!("{}", res_buf.len());
res_buf.extend_from_slice(&[3, 4, 192, 254, 0, 2]).unwrap(); // router Timer::after_secs(0).await;
res_buf.extend_from_slice(&[6, 4, 0, 0, 0, 0]).unwrap(); // dns
res_buf.extend_from_slice(&[15, 1, 0]).unwrap(); // domain name let mut res_opts = Vec::<DhcpOption, 255>::new();
res_buf.extend_from_slice(&[26, 2, 0x5, 0xEA]).unwrap(); // mtu for o in unwrap(v4_options!(msg; ParameterRequestList))
res_buf.extend_from_slice(&[28, 4, 192, 254, 0, 255]).unwrap(); // domain name .await
res_buf.extend_from_slice(&[51, 4, 0, 0, 0x2, 0xBC]).unwrap(); // address lease time = 700s .unwrap_or(&[])
res_buf.extend_from_slice(&[58, 4, 0, 0, 0x2, 0x58]).unwrap(); // renewal time = 600s {
res_buf.extend_from_slice(&[59, 4, 0, 0, 0x2, 0x58]).unwrap(); // rebinding time = 600s let opt = match o {
res_buf.extend_from_slice(&[43, 1, 0]).unwrap(); // vendor specific 1 => DhcpOption::SubnetMask(&dhcpv4::Addr([255, 255, 255, 0])),
let captive_portal_uri = "http://192.254.0.2:80/"; 2 => DhcpOption::TimeOffset(3600),
res_buf.extend_from_slice(&[114, captive_portal_uri.len() as u8]).unwrap(); // captive portal 3 => DhcpOption::Router(&[dhcpv4::Addr([192, 254, 0, 2])]),
res_buf.extend_from_slice(captive_portal_uri.as_bytes()).unwrap(); 6 => DhcpOption::DomainNameServer(&[dhcpv4::Addr([0, 0, 0, 0])]),
res_buf.extend_from_slice(&[108, 4, 0, 0, 0, 0]).unwrap(); // ipv6 only 12 => DhcpOption::HostName(b"blue"),
15 => DhcpOption::DomainName(b"LocalDomain"),
26 => DhcpOption::Unknown(26, &[0x5, 0xEA]), // mtu
28 => DhcpOption::Unknown(28, &[192, 254, 0, 255]), // broadcast
51 => DhcpOption::AddressLeaseTime(700),
54 => DhcpOption::ServerIdentifier(&dhcpv4::Addr([192, 254, 0, 2])),
58 => DhcpOption::Unknown(58, &[0, 0, 0x1, 0xF4]), // renewal time = 500s
59 => DhcpOption::Unknown(59, &[0, 0, 0x2, 0x58]), // rebinding time = 600s
_ => {
info!("Unhandled requested option : {}", o);
Timer::after_secs(0).await;
continue;
}
};
res_buf.push(o).unwrap();
match opt {
}
}
unwrap(res_opts.push(DhcpOption::End)).await;
// res_buf.clear();
// unwrap(
// dhcpv4::Encoder
// .append_options(res_opts)
// .encode(&unwrap(dhcpv4::Message::new(&res_head)).await, &mut res_buf),
// )
// .await;
// // options
// res_buf.extend_from_slice(&[53, 1, 2]).unwrap(); // message type
// res_buf
// .extend_from_slice(&[1, 4, 255, 255, 255, 0])
// .unwrap(); // subnet mask
// res_buf.extend_from_slice(&[3, 4, 192, 254, 0, 2]).unwrap(); // router
// res_buf.extend_from_slice(&[6, 4, 0, 0, 0, 0]).unwrap(); // dns
// res_buf.extend_from_slice(&[15, 1, 0]).unwrap(); // domain name
// res_buf.extend_from_slice(&[26, 2, 0x5, 0xEA]).unwrap(); // mtu
// res_buf
// .extend_from_slice(&[28, 4, 192, 254, 0, 255])
// .unwrap(); // domain name
// res_buf
// .extend_from_slice(&[51, 4, 0, 0, 0x2, 0xBC])
// .unwrap(); // address lease time = 700s
// res_buf
// .extend_from_slice(&[58, 4, 0, 0, 0x2, 0x58])
// .unwrap(); // renewal time = 600s
// res_buf
// .extend_from_slice(&[59, 4, 0, 0, 0x2, 0x58])
// .unwrap(); // rebinding time = 600s
// res_buf.extend_from_slice(&[43, 1, 0]).unwrap(); // vendor specific
// let captive_portal_uri = "http://192.254.0.2:80/";
// res_buf
// .extend_from_slice(&[114, captive_portal_uri.len() as u8])
// .unwrap(); // captive portal
// res_buf
// .extend_from_slice(captive_portal_uri.as_bytes())
// .unwrap();
// res_buf.extend_from_slice(&[108, 4, 0, 0, 0, 0]).unwrap(); // ipv6 only
// res_buf.push(255).unwrap(); // end mark
for o in unwrap(unwrap(dhcpv4::Message::new(&res_buf)).await.options()).await { for o in unwrap(unwrap(dhcpv4::Message::new(&res_buf)).await.options()).await {
info!("{:?}", match o { info!(
Err(_) => break, "{:?}",
Ok(o) => o match o {
}); Err(_) => break,
Ok(o) => o,
}
);
Timer::after_secs(0).await;
} }
// let mut mac = [0; 6];
// mac.clone_from_slice(&buf[28..34]);
// info!("mac : {:?}", mac);
// Timer::after_secs(0).await;
// let mut stack_inner = unwrap(stack.inner.try_borrow_mut()).await;
// let now = stack_inner.iface.inner.now;
// stack_inner.iface.inner.neighbor_cache.fill(
// Ipv4Addr::new(192, 254, 0, 12).into(),
// HardwareAddress::Ethernet(EthernetAddress(mac)),
// now,
// );
// info!("neighbor cache filled");
// Timer::after_secs(0).await;
unwrap(socket.send_to(&res_buf, UdpMetadata { // unwrap(
endpoint: IpEndpoint::new(Ipv4Addr::new(193, 254, 0, 12).into(), 68), // stack_inner
local_address: Some(Ipv4Addr::new(192, 254, 0, 2).into()), // .iface
meta: Default::default() // .inner
}).await).await; // .ip_addrs
}, // .push(Ipv4Cidr::new(Ipv4Addr::new(192, 254, 0, 12), 24).into()),
// )
// .await;
// info!("ip addr added");
// Timer::after_secs(0).await;
// drop(stack_inner);
unwrap(
socket
.send_to(
&res_buf,
UdpMetadata {
endpoint: IpEndpoint::new(
Ipv4Addr::new(255, 255, 255, 255).into(),
68,
),
local_address: Some(Ipv4Addr::new(192, 254, 0, 2).into()),
meta: Default::default(),
},
)
.await,
)
.await;
info!("offer sent");
Timer::after_secs(0).await;
}
_ => {} _ => {}
} }
for o in unwrap(msg.options()).await {
info!("{:?}", match o {
Err(_) => break,
Ok(o) => o
});
}
info!("{:?}", opts);
Timer::after_secs(0).await;
// unwrap(socket.send_to(&buf[..n], ep).await).await; // unwrap(socket.send_to(&buf[..n], ep).await).await;
} }
} }
@ -255,10 +379,10 @@ async fn main(spawner: Spawner) {
// unwrap(spawner.spawn(socket::listen_task(stack, game::Team::One, 81))).await; // unwrap(spawner.spawn(socket::listen_task(stack, game::Team::One, 81))).await;
} }
#[cfg(feature="wifi-connect")] #[cfg(feature = "wifi-connect")]
#[derive(serde::Deserialize)] #[derive(serde::Deserialize)]
struct WifiConnectConf<'a> { struct WifiConnectConf<'a> {
name: &'a str, name: &'a str,
password: &'a str, password: &'a str,
ip: Option<Ipv4Addr> ip: Option<Ipv4Addr>,
} }