soypat/lneto
1
0
Fork 0
mirror of https://github.com/soypat/lneto.git synced 2026-08-19 06:04:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

internet: further use handlers data structure

Browse Source
This commit is contained in:
Patricio Whittingslow
2025-12-18 19:16:35 -03:00
parent ac7f752447
commit eaa36a589a
4 changed files with 89 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internet/stack-ethernet.go
+13 -24
View File
@@ -14,10 +14,9 @@ import (
type StackEthernet struct {
connID uint64
handlers handlers
logger
mac [6]byte
gwmac [6]byte
mtu uint16
mac [6]byte
gwmac [6]byte
mtu uint16
}
func (ls *StackEthernet) SetGateway6(gw [6]byte) {
@@ -42,11 +41,10 @@ func (ls *StackEthernet) Reset6(mac, gateway [6]byte, mtu, maxNodes int) error {
} else if maxNodes <= 0 {
return errZeroMaxNodesArg
}
ls.handlers.reset(maxNodes)
ls.handlers.reset("StackEthernet", maxNodes)
*ls = StackEthernet{
connID: ls.connID + 1,
handlers: ls.handlers,
logger: ls.logger,
mac: mac,
gwmac: gateway,
mtu: uint16(mtu),
@@ -86,18 +84,11 @@ func (ls *StackEthernet) Demux(carrierData []byte, frameOffset int) (err error)
if vld.HasError() {
return vld.ErrPop()
}
{
h := ls.handlers.nodeByProto(uint16(etype))
if h != nil {
err := h.demux(efrm.Payload(), 0)
if ls.handlers.tryHandleError(h, err) {
err = nil
}
return err
}
if h, err := ls.handlers.demuxByProto(efrm.Payload(), 0, uint16(etype)); h != nil {
return err
}
DROP:
ls.info("LinkStack:drop-packet", slog.String("dsthw", net.HardwareAddr(dstaddr[:]).String()), slog.String("ethertype", efrm.EtherTypeOrSize().String()))
ls.handlers.info("LinkStack:drop-packet", slog.String("dsthw", net.HardwareAddr(dstaddr[:]).String()), slog.String("ethertype", efrm.EtherTypeOrSize().String()))
return lneto.ErrPacketDrop
}
@@ -114,14 +105,12 @@ func (ls *StackEthernet) Encapsulate(carrierData []byte, frameOffset int) (n int
*efrm.DestinationHardwareAddr() = ls.gwmac
var h *node
h, n, err = ls.handlers.encapsulateAny(dst[:mtu], 14)
if n > 0 {
// Found packet
*efrm.SourceHardwareAddr() = ls.mac
efrm.SetEtherType(ethernet.Type(h.proto))
n += 14
if err != nil {
ls.error("Ethernet:encapuslate", slog.String("err", err.Error()))
}
if n == 0 {
return n, err
}
// Found packet
*efrm.SourceHardwareAddr() = ls.mac
efrm.SetEtherType(ethernet.Type(h.proto))
n += 14
return n, err
}