keep working on dhcp

soypat · Nov 26, 2023 · 61a805e · 61a805e
1 parent 86d7cb4
commit 61a805e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/stacks/dhcp_server.go b/stacks/dhcp_server.go
@@ -100,7 +100,7 @@ func (d *DHCPServer) HandleUDP(resp []byte, packet *UDPPacket) (_ int, err error
 	}
 
 	mac := packet.Eth.Source
-	client, _ := d.hosts[mac]
+	client := d.hosts[mac]
 	var msgType uint8
 	rcvHdr, err = parseDHCP(incpayload, func(opt dhcpOption) error {
 		switch opt.Opt {

diff --git a/stacks/portstack.go b/stacks/portstack.go
@@ -220,7 +220,7 @@ func (ps *PortStack) RecvEth(ethernetFrame []byte) (err error) {
 	case ipOffset < eth.SizeIPv4Header:
 		return errInvalidIHL
 
-	case ps.ip != ihdr.Destination:
+	case ps.ip != ihdr.Destination && ps.ip != [4]byte{}:
 		return nil // Not for us.
 	case uint16(offset) > end || int(offset) > len(payload) || int(end) > len(payload):
 		return errors.New("bad IP TotalLength/IHL")

diff --git a/stacks/stacks_test.go b/stacks/stacks_test.go
@@ -16,16 +16,19 @@ import (
 const exchangesToEstablish = 4
 
 func TestDHCP(t *testing.T) {
-	const networkSize = 20 // How many distinct IP/MAC addresses on network.
+	const networkSize = 2 // How many distinct IP/MAC addresses on network.
+	requestedIP := netip.AddrFrom4([4]byte{192, 168, 1, 69})
 	Stacks := createPortStacks(t, networkSize)
 	clientStack := Stacks[0]
 	serverStack := Stacks[1]
 
 	client := stacks.DHCPv4Client{
-		MAC: clientStack.MACAs6(),
+		MAC:         clientStack.MACAs6(),
+		RequestedIP: requestedIP.As4(),
 	}
 	server := stacks.NewDHCPServer(67, serverStack.MACAs6(), serverStack.Addr())
-
+	clientStack.SetAddr(netip.AddrFrom4([4]byte{}))
+	serverStack.SetAddr(netip.AddrFrom4([4]byte{}))
 	err := clientStack.OpenUDP(68, client.HandleUDP)
 	if err != nil {
 		t.Fatal(err)