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

dhcp4: specify previous IP address when renewing

Browse Source
This commit is contained in:
Michael Stapelberg 2018-06-13 19:32:20 +02:00
parent 43e1b2eaae
commit 19aa03bf58
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
integrationdhcpv4_test.go
View File

@ -26,6 +26,7 @@ func TestDHCPv4(t *testing.T) {
nsSetup := []*exec.Cmd{ nsSetup := []*exec.Cmd{
exec.Command("ip", "link", "add", "veth0a", "type", "veth", "peer", "name", "veth0b", "netns", ns), exec.Command("ip", "link", "add", "veth0a", "type", "veth", "peer", "name", "veth0b", "netns", ns),
exec.Command("ip", "link", "set", "veth0a", "up"), exec.Command("ip", "link", "set", "veth0a", "up"),
exec.Command("ip", "link", "set", "veth0a", "address", "02:73:53:00:ca:fe"),
exec.Command("ip", "netns", "exec", ns, "ip", "addr", "add", "192.168.23.1/24", "dev", "veth0b"), exec.Command("ip", "netns", "exec", ns, "ip", "addr", "add", "192.168.23.1/24", "dev", "veth0b"),
exec.Command("ip", "netns", "exec", ns, "ip", "link", "set", "veth0b", "up"), exec.Command("ip", "netns", "exec", ns, "ip", "link", "set", "veth0b", "up"),
exec.Command("ip", "netns", "exec", ns, "ip", "link", "set", "veth0b"), exec.Command("ip", "netns", "exec", ns, "ip", "link", "set", "veth0b"),
@ -87,12 +88,14 @@ func TestDHCPv4(t *testing.T) {
c := dhcp4.Client{ c := dhcp4.Client{
Interface: iface, Interface: iface,
} }
for i := 0; i < 2; i++ {
if !c.ObtainOrRenew() { if !c.ObtainOrRenew() {
t.Fatal(c.Err()) t.Fatal(c.Err())
} }
if err := c.Err(); err != nil { if err := c.Err(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
}
cfg := c.Config() cfg := c.Config()
t.Logf("cfg = %+v", cfg) t.Logf("cfg = %+v", cfg)
if got, want := cfg.Router, "192.168.23.1"; got != want { if got, want := cfg.Router, "192.168.23.1"; got != want {
@ -110,20 +113,22 @@ func TestDHCPv4(t *testing.T) {
dnsmasq.Kill() // to flush logs dnsmasq.Kill() // to flush logs
got := dnsmasq.Actions() got := dnsmasq.Actions()
want := []string{ want := []string{
"DHCPDISCOVER(veth0b)", "DHCPDISCOVER(veth0b) 02:73:53:00:ca:fe",
"DHCPOFFER(veth0b)", "DHCPOFFER(veth0b) 192.168.23.4 02:73:53:00:ca:fe",
"DHCPREQUEST(veth0b)", "DHCPREQUEST(veth0b) 192.168.23.4 02:73:53:00:ca:fe",
"DHCPACK(veth0b)", "DHCPACK(veth0b) 192.168.23.4 02:73:53:00:ca:fe midna",
"DHCPRELEASE(veth0b)",
"DHCPDISCOVER(veth0b) 192.168.23.4 02:73:53:00:ca:fe",
"DHCPOFFER(veth0b) 192.168.23.4 02:73:53:00:ca:fe",
"DHCPREQUEST(veth0b) 192.168.23.4 02:73:53:00:ca:fe",
"DHCPACK(veth0b) 192.168.23.4 02:73:53:00:ca:fe midna",
"DHCPRELEASE(veth0b) 192.168.23.4 02:73:53:00:ca:fe",
} }
actionOnly := func(line string) string { trimSpace := func(line string) string {
result := line return strings.TrimSpace(line)
if idx := strings.Index(result, " "); idx > -1 {
return result[:idx]
} }
return result if diff := cmp.Diff(got, want, cmp.Transformer("TrimSpace", trimSpace)); diff != "" {
}
if diff := cmp.Diff(got, want, cmp.Transformer("ActionOnly", actionOnly)); diff != "" {
t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-got +want):\n%s", diff) t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-got +want):\n%s", diff)
} }
} }

4
internal/dhcp4/dhcp4.go
View File

@ -175,6 +175,10 @@ func (c *Client) dhcpRequest() (bool, dhcp4.Packet, error) {
discoveryPacket := c.dhcp.DiscoverPacket() discoveryPacket := c.dhcp.DiscoverPacket()
c.addHostname(&discoveryPacket) c.addHostname(&discoveryPacket)
c.addClientId(&discoveryPacket) c.addClientId(&discoveryPacket)
if c.ack != nil {
discoveryPacket.SetYIAddr(c.ack.YIAddr())
discoveryPacket.AddOption(dhcp4.OptionRequestedIPAddress, (c.ack.YIAddr()).To4())
}
discoveryPacket.PadToMinSize() discoveryPacket.PadToMinSize()
if err := c.dhcp.SendPacket(discoveryPacket); err != nil { if err := c.dhcp.SendPacket(discoveryPacket); err != nil {