theater/picomap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop send_raw parameter threading: arp/icmp/igmp/ipv4 call net_send_raw directly

Browse Source
This commit is contained in:
Ian Gulliver
2026-04-17 14:35:10 -07:00
parent cdc113285a
commit e2daf04bed
10 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/include/arp.h
View File

@@ -1,5 +1,4 @@
#pragma once
#include <functional>
#include <span>
#include "eth.h"
#include "ipv4.h"
@@ -21,7 +20,6 @@ struct __attribute__((packed)) header {
static_assert(sizeof(header) == 28);
void handle(std::span<const uint8_t> frame, span_writer& tx,
eth::mac_addr our_mac, ipv4::ip4_addr our_ip,
std::function<void(std::span<const uint8_t>)> send_raw);
eth::mac_addr our_mac, ipv4::ip4_addr our_ip);
} // namespace arp

4
firmware/include/icmp.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include <cstdint>
#include <functional>
#include <span>
#include "eth.h"
#include "ipv4.h"
@@ -18,8 +17,7 @@ struct __attribute__((packed)) echo {
static_assert(sizeof(echo) == 8);
void handle(std::span<const uint8_t> frame, span_writer& tx,
eth::mac_addr our_mac, ipv4::ip4_addr our_ip,
std::function<void(std::span<const uint8_t>)> send_raw);
eth::mac_addr our_mac, ipv4::ip4_addr our_ip);
template <typename Buf>
void prepend_echo_request(Buf& buf,

10
firmware/include/igmp.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include <cstdint>
#include <functional>
#include <span>
#include "eth.h"
#include "ipv4.h"
@@ -24,15 +23,12 @@ bool is_member(const ipv4::ip4_addr& ip);
bool is_member_mac(const eth::mac_addr& mac);
void join(const ipv4::ip4_addr& group,
eth::mac_addr our_mac, ipv4::ip4_addr our_ip,
std::function<void(std::span<const uint8_t>)> send_raw);
eth::mac_addr our_mac, ipv4::ip4_addr our_ip);
void send_all_reports(eth::mac_addr our_mac, ipv4::ip4_addr our_ip,
std::function<void(std::span<const uint8_t>)> send_raw);
void send_all_reports(eth::mac_addr our_mac, ipv4::ip4_addr our_ip);
void handle(std::span<const uint8_t> frame, span_writer& tx,
eth::mac_addr our_mac, ipv4::ip4_addr our_ip,
std::function<void(std::span<const uint8_t>)> send_raw);
eth::mac_addr our_mac, ipv4::ip4_addr our_ip);
template <typename Buf>
void prepend_report(Buf& buf, const eth::mac_addr& src_mac, ipv4::ip4_addr src_ip,

1
firmware/include/ipv4.h
View File

@@ -58,7 +58,6 @@ void prepend(Buf& buf, const eth::mac_addr& dst_mac, const eth::mac_addr& src_ma
void handle(std::span<const uint8_t> frame, span_writer& tx,
eth::mac_addr our_mac, ip4_addr our_ip, ip4_addr subnet_broadcast,
std::function<void(std::span<const uint8_t>)> send_raw,
std::function<void(std::span<const uint8_t>, span_writer&)> handle_udp);
} // namespace ipv4