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

Request nameserver, router and netmask as it might not be automatically returned by dhcp server. (#7)

Browse Source
This commit is contained in:
Philipp Hug 2018-09-05 18:06:31 +02:00 committed by Michael Stapelberg
parent 447f1779e2
commit aa404c3c54
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/dhcp4/dhcp4.go
View File

@ -182,6 +182,14 @@ func (c *Client) addClientId(p *dhcp4.Packet) {
p.AddOption(dhcp4.OptionClientIdentifier, id) p.AddOption(dhcp4.OptionClientIdentifier, id)
} }
func (c *Client) addOptionParameterRequest(p *dhcp4.Packet, opts []dhcp4.OptionCode) {
op := make([]byte, len(opts))
for i, o := range opts {
op[i] = byte(o)
}
p.AddOption(dhcp4.OptionParameterRequestList, op)
}
// dhcpRequest is a copy of (dhcp4client/Client).Request which // dhcpRequest is a copy of (dhcp4client/Client).Request which
// includes the hostname. // includes the hostname.
func (c *Client) dhcpRequest() (bool, dhcp4.Packet, error) { func (c *Client) dhcpRequest() (bool, dhcp4.Packet, error) {
@ -190,6 +198,7 @@ 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)
c.addOptionParameterRequest(&discoveryPacket, []dhcp4.OptionCode{dhcp4.OptionDomainNameServer, dhcp4.OptionRouter, dhcp4.OptionSubnetMask})
discoveryPacket.PadToMinSize() discoveryPacket.PadToMinSize()
if err := c.dhcp.SendPacket(discoveryPacket); err != nil { if err := c.dhcp.SendPacket(discoveryPacket); err != nil {
@ -208,6 +217,7 @@ func (c *Client) dhcpRequest() (bool, dhcp4.Packet, error) {
requestPacket := c.dhcp.RequestPacket(&last) requestPacket := c.dhcp.RequestPacket(&last)
c.addHostname(&requestPacket) c.addHostname(&requestPacket)
c.addClientId(&requestPacket) c.addClientId(&requestPacket)
c.addOptionParameterRequest(&requestPacket, []dhcp4.OptionCode{dhcp4.OptionDomainNameServer, dhcp4.OptionRouter, dhcp4.OptionSubnetMask})
requestPacket.PadToMinSize() requestPacket.PadToMinSize()
if err := c.dhcp.SendPacket(requestPacket); err != nil { if err := c.dhcp.SendPacket(requestPacket); err != nil {