slight file reordering

This commit is contained in:
soypat
2025-06-07 13:44:28 -03:00
parent 6cf5896543
commit dab7951cbd
3 changed files with 11 additions and 14 deletions
+1 -4
View File
@@ -51,7 +51,6 @@ func main() {
if err != nil {
log.Fatal(err)
}
defer tap.Close()
tap.ReadDiscard() // Discard all unread content.
fmt.Println("hosting server at ", addrPort.String(), "over tap interface of mtu:", mtu, "prefix:", ippfx, "gateway:", net.HardwareAddr(gatewayMAC[:]).String())
@@ -155,12 +154,10 @@ func doHTTP(conn *internet.TCPConn, hdr *httpraw.Header) error {
}
type Stack struct {
ethernet internet.StackLinkLayer
ethernet internet.StackEthernet
ip internet.StackIP
tcpports internet.StackPorts
arp internet.NodeARP
onlyConn internet.TCPConn
}
func (stack *Stack) OpenPassiveTCP(port uint16, iss tcp.Value) (*internet.TCPConn, error) {
@@ -11,7 +11,7 @@ import (
"github.com/soypat/lneto/ethernet"
)
type StackLinkLayer struct {
type StackEthernet struct {
connID uint64
handlers []node
logger
@@ -20,11 +20,11 @@ type StackLinkLayer struct {
mtu uint16
}
func (ls *StackLinkLayer) Reset6(mac, gateway [6]byte, mtu int) error {
func (ls *StackEthernet) Reset6(mac, gateway [6]byte, mtu int) error {
if mtu > math.MaxUint16 || mtu < 256 {
return errors.New("invalid MTU")
}
*ls = StackLinkLayer{
*ls = StackEthernet{
connID: ls.connID + 1,
handlers: ls.handlers[:0],
logger: ls.logger,
@@ -35,15 +35,15 @@ func (ls *StackLinkLayer) Reset6(mac, gateway [6]byte, mtu int) error {
return nil
}
func (ls *StackLinkLayer) MTU() int { return int(ls.mtu) }
func (ls *StackEthernet) MTU() int { return int(ls.mtu) }
func (ls *StackLinkLayer) ConnectionID() *uint64 { return &ls.connID }
func (ls *StackEthernet) ConnectionID() *uint64 { return &ls.connID }
func (ls *StackLinkLayer) LocalPort() uint16 { return 0 }
func (ls *StackEthernet) LocalPort() uint16 { return 0 }
func (ls *StackLinkLayer) Protocol() uint64 { return 1 }
func (ls *StackEthernet) Protocol() uint64 { return 1 }
func (ls *StackLinkLayer) Register(h StackNode) error {
func (ls *StackEthernet) Register(h StackNode) error {
proto := h.Protocol()
if proto > math.MaxUint16 || proto <= 1500 {
return errInvalidProto
@@ -63,7 +63,7 @@ func (ls *StackLinkLayer) Register(h StackNode) error {
return nil
}
func (ls *StackLinkLayer) Demux(carrierData []byte, frameOffset int) (err error) {
func (ls *StackEthernet) Demux(carrierData []byte, frameOffset int) (err error) {
pkt := carrierData[frameOffset:]
efrm, err := ethernet.NewFrame(pkt)
if err != nil {
@@ -91,7 +91,7 @@ DROP:
return nil
}
func (ls *StackLinkLayer) Encapsulate(carrierData []byte, frameOffset int) (n int, err error) {
func (ls *StackEthernet) Encapsulate(carrierData []byte, frameOffset int) (n int, err error) {
mtu := ls.mtu
dst := carrierData[frameOffset:]
if len(dst) < int(mtu) {