fix(dhcp): can not renew an ip address
The dhcp server is systemd-networkd, and the dhcp plugin can request an ip but can not renew it. The systemd-networkd just ignore the renew request. ``` 2024/09/14 21:46:00 no DHCP packet received within 10s 2024/09/14 21:46:00 retrying in 31.529038 seconds 2024/09/14 21:46:42 no DHCP packet received within 10s 2024/09/14 21:46:42 retrying in 63.150490 seconds 2024/09/14 21:47:45 98184616c91f15419f5cacd012697f85afaa2daeb5d3233e28b0ec21589fb45a/iot/eth1: no more tries 2024/09/14 21:47:45 98184616c91f15419f5cacd012697f85afaa2daeb5d3233e28b0ec21589fb45a/iot/eth1: renewal time expired, rebinding 2024/09/14 21:47:45 Link "eth1" down. Attempting to set up 2024/09/14 21:47:45 98184616c91f15419f5cacd012697f85afaa2daeb5d3233e28b0ec21589fb45a/iot/eth1: lease rebound, expiration is 2024-09-14 22:47:45.309270751 +0800 CST m=+11730.048516519 ``` Follow the https://datatracker.ietf.org/doc/html/rfc2131#section-4.3.6, following options must not be sent in renew - Requested IP Address - Server Identifier Since the upstream code has been inactive for 6 years, we should switch to another dhcpv4 library. The new selected one is https://github.com/insomniacslk/dhcp. Signed-off-by: Songmin Li <lisongmin@protonmail.com>
This commit is contained in:

committed by
Casey Callendrello

parent
e4950728ce
commit
d61e7e5e1f
19
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_bsd.go
generated
vendored
Normal file
19
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_bsd.go
generated
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
// +build aix freebsd openbsd netbsd dragonfly
|
||||
|
||||
package interfaces
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
// BindToInterface emulates linux's SO_BINDTODEVICE option for a socket by using
|
||||
// IP_RECVIF.
|
||||
func BindToInterface(fd int, ifname string) error {
|
||||
iface, err := net.InterfaceByName(ifname)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return unix.SetsockoptInt(fd, unix.IPPROTO_IP, unix.IP_RECVIF, iface.Index)
|
||||
}
|
19
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_darwin.go
generated
vendored
Normal file
19
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_darwin.go
generated
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
// +build darwin
|
||||
|
||||
package interfaces
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
// BindToInterface emulates linux's SO_BINDTODEVICE option for a socket by using
|
||||
// IP_BOUND_IF.
|
||||
func BindToInterface(fd int, ifname string) error {
|
||||
iface, err := net.InterfaceByName(ifname)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return unix.SetsockoptInt(fd, unix.IPPROTO_IP, unix.IP_BOUND_IF, iface.Index)
|
||||
}
|
9
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_linux.go
generated
vendored
Normal file
9
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_linux.go
generated
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
// +build linux
|
||||
|
||||
package interfaces
|
||||
|
||||
import "golang.org/x/sys/unix"
|
||||
|
||||
func BindToInterface(fd int, ifname string) error {
|
||||
return unix.BindToDevice(fd, ifname)
|
||||
}
|
8
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_windows.go
generated
vendored
Normal file
8
vendor/github.com/insomniacslk/dhcp/interfaces/bindtodevice_windows.go
generated
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
package interfaces
|
||||
|
||||
import "errors"
|
||||
|
||||
// BindToInterface fails on Windows.
|
||||
func BindToInterface(fd int, ifname string) error {
|
||||
return errors.New("not implemented on Windows")
|
||||
}
|
41
vendor/github.com/insomniacslk/dhcp/interfaces/interfaces.go
generated
vendored
Normal file
41
vendor/github.com/insomniacslk/dhcp/interfaces/interfaces.go
generated
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
package interfaces
|
||||
|
||||
import "net"
|
||||
|
||||
// InterfaceMatcher is a function type used to match the interfaces we want. See
|
||||
// GetInterfacesFunc below for usage.
|
||||
type InterfaceMatcher func(net.Interface) bool
|
||||
|
||||
// interfaceGetter is used for testing purposes
|
||||
var interfaceGetter = net.Interfaces
|
||||
|
||||
// GetInterfacesFunc loops through the available network interfaces, and returns
|
||||
// a list of interfaces for which the passed InterfaceMatcher function returns
|
||||
// true.
|
||||
func GetInterfacesFunc(matcher InterfaceMatcher) ([]net.Interface, error) {
|
||||
ifaces, err := interfaceGetter()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ret := make([]net.Interface, 0)
|
||||
for _, iface := range ifaces {
|
||||
if matcher(iface) {
|
||||
ret = append(ret, iface)
|
||||
}
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
// GetLoopbackInterfaces returns a list of loopback interfaces.
|
||||
func GetLoopbackInterfaces() ([]net.Interface, error) {
|
||||
return GetInterfacesFunc(func(iface net.Interface) bool {
|
||||
return iface.Flags&net.FlagLoopback != 0
|
||||
})
|
||||
}
|
||||
|
||||
// GetNonLoopbackInterfaces returns a list of non-loopback interfaces.
|
||||
func GetNonLoopbackInterfaces() ([]net.Interface, error) {
|
||||
return GetInterfacesFunc(func(iface net.Interface) bool {
|
||||
return iface.Flags&net.FlagLoopback == 0
|
||||
})
|
||||
}
|
Reference in New Issue
Block a user