diff options
author | Pablo Mazzini <pmazzini@gmail.com> | 2022-10-01 13:27:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-01 13:27:45 +0100 |
commit | 0fe08a6d435ac81833ebee256fe0607a0b1ec9a7 (patch) | |
tree | 7312e2eca94907a60ecd250493c4f36573b57db5 /dhcpv4 | |
parent | c54f469494bb5c429c50fa371dce81d965cf56a2 (diff) | |
parent | 962b81a3c7c72027180d70695556b03a90a566b5 (diff) |
Merge branch 'master' into fix-not-nil-checks
Diffstat (limited to 'dhcpv4')
-rw-r--r-- | dhcpv4/nclient4/lease.go | 20 | ||||
-rw-r--r-- | dhcpv4/nclient4/lease_test.go | 2 | ||||
-rw-r--r-- | dhcpv4/server4/server_test.go | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/dhcpv4/nclient4/lease.go b/dhcpv4/nclient4/lease.go index 1895dd0..9ee3109 100644 --- a/dhcpv4/nclient4/lease.go +++ b/dhcpv4/nclient4/lease.go @@ -42,15 +42,15 @@ func (c *Client) Release(lease *Lease, modifiers ...dhcpv4.Modifier) error { // sourced from the initial offer in the lease, and the ACK of the lease is updated to the ACK of // the latest renewal. This avoids issues with DHCP servers that omit information needed to build a // completely new lease from their renewal ACK (such as the Windows DHCP Server). -func (c *Client) Renew(ctx context.Context, lease *Lease, modifiers ...dhcpv4.Modifier) error { +func (c *Client) Renew(ctx context.Context, lease *Lease, modifiers ...dhcpv4.Modifier) (*Lease, error) { if lease == nil { - return fmt.Errorf("lease is nil") + return nil, fmt.Errorf("lease is nil") } request, err := dhcpv4.NewRenewFromOffer(lease.Offer, dhcpv4.PrependModifiers(modifiers, dhcpv4.WithOption(dhcpv4.OptMaxMessageSize(MaxMessageSize)))...) if err != nil { - return fmt.Errorf("unable to create a request: %w", err) + return nil, fmt.Errorf("unable to create a request: %w", err) } // Servers are supposed to only respond to Requests containing their server identifier, @@ -61,17 +61,19 @@ func (c *Client) Renew(ctx context.Context, lease *Lease, modifiers ...dhcpv4.Mo IsCorrectServer(lease.Offer.ServerIdentifier()), IsMessageType(dhcpv4.MessageTypeAck, dhcpv4.MessageTypeNak))) if err != nil { - return fmt.Errorf("got an error while processing the request: %w", err) + return nil, fmt.Errorf("got an error while processing the request: %w", err) } if response.MessageType() == dhcpv4.MessageTypeNak { - return &ErrNak{ + return nil, &ErrNak{ Offer: lease.Offer, Nak: response, } } - // Update the ACK of the lease with the ACK of the latest renewal - lease.ACK = response - - return nil + // Return a new lease with the latest ACK and updated creation time + return &Lease{ + Offer: lease.Offer, + ACK: response, + CreationTime: time.Now(), + }, nil } diff --git a/dhcpv4/nclient4/lease_test.go b/dhcpv4/nclient4/lease_test.go index d27eeca..d9377e7 100644 --- a/dhcpv4/nclient4/lease_test.go +++ b/dhcpv4/nclient4/lease_test.go @@ -238,7 +238,7 @@ func (sll *testServerLeaseList) runTest(t *testing.T) { sll.lastTestSvrErrLock.RUnlock() if keepgoing { - err = clnt.Renew(context.Background(), lease) + lease, err = clnt.Renew(context.Background(), lease) sll.lastTestSvrErrLock.RLock() keepgoing = chkerr(err, sll.lastTestSvrErr, l.ShouldFail, t) sll.lastTestSvrErrLock.RUnlock() diff --git a/dhcpv4/server4/server_test.go b/dhcpv4/server4/server_test.go index 972a881..9fc44a3 100644 --- a/dhcpv4/server4/server_test.go +++ b/dhcpv4/server4/server_test.go @@ -117,7 +117,7 @@ func TestServer(t *testing.T) { require.Equal(t, ifaces[0].HardwareAddr, p.ClientHWAddr) } - err = c.Renew(context.Background(), lease, modifiers...) + lease, err = c.Renew(context.Background(), lease, modifiers...) require.NoError(t, err) require.NotNil(t, lease.Offer) require.NotNil(t, lease.ACK) |