saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix Copy derive and related issues in net

Browse source
This commit is contained in:
bunnie 2024-09-22 21:55:20 +08:00
parent e423bfd347
commit 95a31a369c
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/net/src/api.rs
View file

@ -375,7 +375,7 @@ pub enum ScanState {
/// Indicates that the wifi susbsystem is off
Off,
}
#[derive(Debug, Archive, Serialize, Deserialize, Copy, Clone, Default)]
#[derive(Debug, Archive, Serialize, Deserialize, Clone, Default)]
pub(crate) struct SsidList {
/// IPC memory structures have to pre-allocate all their memory, but are always allocated in 4096-byte
/// chunks. We could allocate up to maybe 100+ return values, but then we'd have to write a default

2
services/net/src/api/ping.rs
View file

@ -22,7 +22,7 @@ pub enum NetPingCallback {
}
//////// Intra-crate Ping structures
#[derive(Debug, Archive, Serialize, Deserialize, Copy, Clone)]
#[derive(Debug, Archive, Serialize, Deserialize, Clone)]
pub(crate) struct NetPingPacket {
/// the address we are pinging
pub endpoint: NetIpAddr,

2
services/net/src/api/rkyv_enum.rs
View file

@ -19,7 +19,7 @@ use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use rkyv::{Archive, Deserialize, Serialize};
use smoltcp::wire::IpAddress;
#[derive(Debug, Archive, Serialize, Deserialize, Copy, Clone)]
#[derive(Debug, Archive, Serialize, Deserialize, Clone)]
pub enum XousServerId {
/// A SID that is shared directly with the Net crate; a private, single-use SID for best security
PrivateSid([u32; 4]),

2
services/net/src/lib.rs
View file

@ -184,7 +184,7 @@ impl NetManager {
let mut ret = Vec::<SsidRecord>::new();
for maybe_item in ssid_list.list.iter() {
if let Some(item) = maybe_item {
ret.push(*item);
ret.push(item.clone());
}
}
Ok((ret, ssid_list.state))

8
services/net/src/protocols/ping.rs
View file

@ -81,11 +81,11 @@ impl Ping {
/// Send a single ping immediately, with the result going to an asynchronous callback
pub fn ping(&self, remote: IpAddr) -> bool {
if let Some(cbs) = self.callback_server {
if let Some(cbs) = self.callback_server.as_ref() {
if let Some(dispatch_op) = self.dispatch_opcode {
let ping = NetPingPacket {
endpoint: NetIpAddr::from(remote),
server: cbs,
server: cbs.clone(),
return_opcode: dispatch_op,
sent_ok: None,
};
@ -113,7 +113,7 @@ impl Ping {
/// Send multiple pings by spawning a helper thread. Results go to the asynchronous callback
/// specified during the creation of the Ping object.
pub fn ping_spawn_thread(&self, remote: IpAddr, count: usize, delay_ms: usize) -> Option<JoinHandle<()>> {
if let Some(cbs) = self.callback_server {
if let Some(cbs) = &self.callback_server {
if let Some(dispatch_op) = self.dispatch_opcode {
let handle = thread::spawn({
let cbs = cbs.clone();
@ -125,7 +125,7 @@ impl Ping {
while cur_count < count {
let ping = NetPingPacket {
endpoint: NetIpAddr::from(remote),
server: cbs,
server: cbs.clone(),
return_opcode: dispatch_op,
sent_ok: None,
};