lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcp4: make interface and state directory configurable

Browse Source 
This is useful for manual testing on separate interfaces.
This commit is contained in:
Michael Stapelberg 2019-06-06 07:52:08 +02:00
parent 54843950dd
commit 373c83196d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/dhcp4/dhcp4.go
View File

@ -40,12 +40,17 @@ import (
var log = teelogger.NewConsole() var log = teelogger.NewConsole()
var (
netInterface = flag.String("interface", "uplink0", "network interface to operate on")
stateDir = flag.String("state_dir", "/perm/dhcp4", "directory in which to store lease data (wire/lease.json) and last ACK (wire/ack)")
)
func logic() error { func logic() error {
const leasePath = "/perm/dhcp4/wire/lease.json" leasePath := filepath.Join(*stateDir, "wire/lease.json")
if err := os.MkdirAll(filepath.Dir(leasePath), 0755); err != nil { if err := os.MkdirAll(filepath.Dir(leasePath), 0755); err != nil {
return err return err
} }
iface, err := net.InterfaceByName("uplink0") iface, err := net.InterfaceByName(*netInterface)
if err != nil { if err != nil {
return err return err
} }
@ -54,16 +59,15 @@ func logic() error {
// still use the old hardware address. We overwrite it with the address that // still use the old hardware address. We overwrite it with the address that
// netconfigd is going to use to fix this issue without additional // netconfigd is going to use to fix this issue without additional
// synchronization. // synchronization.
details, err := netconfig.Interface("/perm", "uplink0") details, err := netconfig.Interface("/perm", *netInterface)
if err != nil { if err == nil {
return err if spoof := details.SpoofHardwareAddr; spoof != "" {
} if addr, err := net.ParseMAC(spoof); err == nil {
if spoof := details.SpoofHardwareAddr; spoof != "" { hwaddr = addr
if addr, err := net.ParseMAC(spoof); err == nil { }
hwaddr = addr
} }
} }
const ackFn = "/perm/dhcp4/wire/ack" ackFn := filepath.Join(*stateDir, "wire/ack")
var ack *layers.DHCPv4 var ack *layers.DHCPv4
ackB, err := ioutil.ReadFile(ackFn) ackB, err := ioutil.ReadFile(ackFn)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {