checkpoint

going to rewrite this in C++ I think

server/BUILD.bazel

@@ -3,15 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "server",
     srcs = [
-        "addr.go",
         "config.go",
         "packet.go",
         "server.go",
     ],
     importpath = "git.wntrmute.dev/kyle/kdhcp/server",
     visibility = ["//visibility:public"],
-    deps = [
-        "//bazel-kdhcp/external/com_github_davecgh_go_spew/spew",
-        "//log",
-    ],
+    deps = ["//log"],
 )

server/addr.go

@@ -1,61 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net"
-
-	"git.wntrmute.dev/kyle/kdhcp/bazel-kdhcp/external/com_github_davecgh_go_spew/spew"
-	"git.wntrmute.dev/kyle/kdhcp/log"
-)
-
-type addr struct {
-	ifi *net.Interface
-	IP  net.IP
-	ipn *net.IPNet
-}
-
-func addrsForDevice(dev string) ([]addr, error) {
-	netInterface, err := net.InterfaceByName(dev)
-	if err != nil {
-		return nil, fmt.Errorf("while selecting interface %s: %w", dev, err)
-	}
-
-	spew.Dump(netInterface)
-
-	var addrs []addr
-	devAddrs, err := netInterface.Addrs()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, devAddr := range devAddrs {
-		log.Debugf("consider %s", devAddr.String())
-		ip, ipn, err := net.ParseCIDR(devAddr.String())
-		if err != nil {
-			continue
-		}
-
-		if ip == nil {
-			continue // address isn't an IP address
-		}
-
-		log.Debugf("found IP: %s", ip)
-		ip = ip.To4()
-
-		// DHCP should only listen on private addresses.
-		if !ip.IsPrivate() {
-			log.Debugln("skipping non-private")
-			continue
-		}
-
-		// only support IPv4 for now
-		if len(ip) != 4 {
-			log.Debugf("%d IP, only supporting v4 right now", len(ip))
-			continue
-		}
-
-		addrs = append(addrs, addr{netInterface, ip, ipn})
-	}
-
-	return addrs, nil
-}

server/packet.go

@@ -1,8 +1,14 @@
 package server
 
-import "net"
+import (
+	"net"
+
+	"github.com/insomniacslk/dhcp/dhcpv4"
+)
 
 type Packet struct {
 	Data []byte
 	Addr net.Addr
+
+	Raw *dhcpv4.DHCPv4
 }

server/server.go

@@ -5,10 +5,9 @@ import (
 	"net"
 
 	"git.wntrmute.dev/kyle/kdhcp/log"
+	"github.com/insomniacslk/dhcp/dhcpv4"
 )
 
-// github.com/insomniacslk/dhcp
-
 type Server struct {
 	cfg  *Config
 	conn net.PacketConn
@@ -42,10 +41,16 @@ func (srv *Server) ReadFrom() (*Packet, error) {
 		return nil, err
 	}
 
-	return &Packet{
+	packet := &Packet{
 		Data: b[:n],
 		Addr: addr,
-	}, nil
+	}
+	packet.Raw, err = dhcpv4.FromBytes(b[:n])
+	if err != nil {
+		return packet, err
+	}
+
+	return packet, nil
 }
 
 func NewServer(cfg *Config) (*Server, error) {