embed/limen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract arp into its own static library; add empty arp::init() called from dispatch_init to anchor the .o so the self-registration constructor links in

Browse Source
This commit is contained in:
Ian Gulliver
2026-05-01 13:35:40 -07:00
parent f64cdcaacf
commit 2d7ff98b82
5 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/arp.cpp
View File

@@ -1,49 +0,0 @@
#include "arp.h"
#include "eth.h"
#include "ipv4.h"
#include "parse_buffer.h"
#include "prepend_buffer.h"
namespace arp {
static constexpr uint16_t ARP_HTYPE_ETH = __builtin_bswap16(1);
static constexpr uint16_t ARP_PTYPE_IPV4 = __builtin_bswap16(0x0800);
static constexpr uint16_t ARP_OP_REQUEST = __builtin_bswap16(1);
static constexpr uint16_t ARP_OP_REPLY = __builtin_bswap16(2);
void handle(std::span<const uint8_t> frame, span_writer& tx) {
const auto& mac = eth::get_mac();
const auto& ip = ipv4::get_ip();
parse_buffer pb(frame);
pb.consume<eth::header>();
auto* arp_hdr = pb.consume<header>();
if (!arp_hdr) return;
if (arp_hdr->htype != ARP_HTYPE_ETH) return;
if (arp_hdr->ptype != ARP_PTYPE_IPV4) return;
if (arp_hdr->hlen != 6 || arp_hdr->plen != 4) return;
if (arp_hdr->oper != ARP_OP_REQUEST) return;
if (arp_hdr->tpa != ip) return;
prepend_buffer<4096> buf;
auto* reply = buf.template prepend<header>();
reply->htype = ARP_HTYPE_ETH;
reply->ptype = ARP_PTYPE_IPV4;
reply->hlen = 6;
reply->plen = 4;
reply->oper = ARP_OP_REPLY;
reply->sha = mac;
reply->spa = ip;
reply->tha = arp_hdr->sha;
reply->tpa = arp_hdr->spa;
eth::prepend(buf, arp_hdr->sha, mac, eth::ETH_ARP);
eth::send_raw(buf.span());
}
__attribute__((constructor))
static void register_ethertype() {
eth::register_ethertype(eth::ETH_ARP, handle);
}
} // namespace arp

2
src/dispatch.cpp
View File

@@ -5,6 +5,7 @@
#include "timer_queue.h"
#include "eth.h"
#include "ipv4.h"
#include "arp.h"
#include "igmp.h"
#include "udp.h"
#include "debug_log.h"
@@ -37,6 +38,7 @@ void dispatch_init(uint16_t port_be) {
udp::register_port(port_be, on_udp_message);
eth::init();
ipv4::init();
arp::init();
dispatch_schedule_ms(60000, igmp_reannounce);
dlog("dispatch_init complete");
}