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
65
vendor/github.com/insomniacslk/dhcp/dhcpv4/option_vivc.go
generated
vendored
Normal file
65
vendor/github.com/insomniacslk/dhcp/dhcpv4/option_vivc.go
generated
vendored
Normal file
@ -0,0 +1,65 @@
|
||||
package dhcpv4
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
|
||||
"github.com/insomniacslk/dhcp/iana"
|
||||
"github.com/u-root/uio/uio"
|
||||
)
|
||||
|
||||
// VIVCIdentifier implements the vendor-identifying vendor class option
|
||||
// described by RFC 3925.
|
||||
type VIVCIdentifier struct {
|
||||
// EntID is the enterprise ID.
|
||||
EntID iana.EnterpriseID
|
||||
Data []byte
|
||||
}
|
||||
|
||||
// OptVIVC returns a new vendor-identifying vendor class option.
|
||||
//
|
||||
// The option is described by RFC 3925.
|
||||
func OptVIVC(identifiers ...VIVCIdentifier) Option {
|
||||
return Option{
|
||||
Code: OptionVendorIdentifyingVendorClass,
|
||||
Value: VIVCIdentifiers(identifiers),
|
||||
}
|
||||
}
|
||||
|
||||
// VIVCIdentifiers implements encoding and decoding methods for a DHCP option
|
||||
// described in RFC 3925.
|
||||
type VIVCIdentifiers []VIVCIdentifier
|
||||
|
||||
// FromBytes parses data into ids per RFC 3925.
|
||||
func (ids *VIVCIdentifiers) FromBytes(data []byte) error {
|
||||
buf := uio.NewBigEndianBuffer(data)
|
||||
for buf.Has(5) {
|
||||
entID := iana.EnterpriseID(buf.Read32())
|
||||
idLen := int(buf.Read8())
|
||||
*ids = append(*ids, VIVCIdentifier{EntID: entID, Data: buf.CopyN(idLen)})
|
||||
}
|
||||
return buf.FinError()
|
||||
}
|
||||
|
||||
// ToBytes returns a serialized stream of bytes for this option.
|
||||
func (ids VIVCIdentifiers) ToBytes() []byte {
|
||||
buf := uio.NewBigEndianBuffer(nil)
|
||||
for _, id := range ids {
|
||||
buf.Write32(uint32(id.EntID))
|
||||
buf.Write8(uint8(len(id.Data)))
|
||||
buf.WriteBytes(id.Data)
|
||||
}
|
||||
return buf.Data()
|
||||
}
|
||||
|
||||
// String returns a human-readable string for this option.
|
||||
func (ids VIVCIdentifiers) String() string {
|
||||
if len(ids) == 0 {
|
||||
return ""
|
||||
}
|
||||
buf := bytes.Buffer{}
|
||||
for _, id := range ids {
|
||||
fmt.Fprintf(&buf, " %d:'%s',", id.EntID, id.Data)
|
||||
}
|
||||
return buf.String()[1 : buf.Len()-1]
|
||||
}
|
Reference in New Issue
Block a user