summaryrefslogtreecommitdiffhomepage
path: root/dhcpv4
diff options
context:
space:
mode:
Diffstat (limited to 'dhcpv4')
-rw-r--r--dhcpv4/nclient4/client.go3
-rw-r--r--dhcpv4/nclient4/lease.go26
-rw-r--r--dhcpv4/nclient4/lease_test.go34
3 files changed, 35 insertions, 28 deletions
diff --git a/dhcpv4/nclient4/client.go b/dhcpv4/nclient4/client.go
index 973a974..feeb4e6 100644
--- a/dhcpv4/nclient4/client.go
+++ b/dhcpv4/nclient4/client.go
@@ -439,8 +439,7 @@ func (c *Client) DiscoverOffer(ctx context.Context, modifiers ...dhcpv4.Modifier
//
// Note that modifiers will be applied *both* to Discover and Request packets.
func (c *Client) Request(ctx context.Context, modifiers ...dhcpv4.Modifier) (lease *Lease, err error) {
- var offer *dhcpv4.DHCPv4
- offer, err = c.DiscoverOffer(ctx, modifiers...)
+ offer, err := c.DiscoverOffer(ctx, modifiers...)
if err != nil {
err = fmt.Errorf("unable to receive an offer: %w", err)
return
diff --git a/dhcpv4/nclient4/lease.go b/dhcpv4/nclient4/lease.go
index de54506..1bd77e5 100644
--- a/dhcpv4/nclient4/lease.go
+++ b/dhcpv4/nclient4/lease.go
@@ -36,23 +36,27 @@ func (c *Client) Release(lease *Lease) error {
if lease == nil {
return fmt.Errorf("lease is nil")
}
- req, err := dhcpv4.New()
+ modList := []dhcpv4.Modifier{
+ dhcpv4.WithMessageType(dhcpv4.MessageTypeRelease),
+ dhcpv4.WithClientIP(lease.ACK.YourIPAddr),
+ dhcpv4.WithHwAddr(lease.ACK.ClientHWAddr),
+ dhcpv4.WithBroadcast(false),
+ dhcpv4.WithOption(dhcpv4.OptServerIdentifier(lease.ACK.ServerIdentifier())),
+ }
+
+ req, err := dhcpv4.New(modList...)
if err != nil {
return err
}
//This is to make sure use same client identification options used during
//DORA, so that DHCP server could identify the required lease
- req.Options = lease.IDOptions
-
- req.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeRelease))
- req.ClientHWAddr = lease.ACK.ClientHWAddr
- req.ClientIPAddr = lease.ACK.YourIPAddr
- req.UpdateOption(dhcpv4.OptGeneric(dhcpv4.OptionServerIdentifier, lease.ACK.Options.Get(dhcpv4.OptionServerIdentifier)))
- req.SetUnicast()
- if err != nil {
- return err
+ for t, _ := range lease.IDOptions {
+ req.UpdateOption(
+ dhcpv4.OptGeneric(dhcpv4.GenericOptionCode(t),
+ lease.IDOptions.Get(dhcpv4.GenericOptionCode(t))),
+ )
}
- _, err = c.conn.WriteTo(req.ToBytes(), &net.UDPAddr{IP: lease.ACK.Options.Get(dhcpv4.OptionServerIdentifier), Port: 67})
+ _, err = c.conn.WriteTo(req.ToBytes(), &net.UDPAddr{IP: lease.ACK.Options.Get(dhcpv4.OptionServerIdentifier), Port: ServerPort})
if err == nil {
c.logger.PrintMessage("sent message:", req)
}
diff --git a/dhcpv4/nclient4/lease_test.go b/dhcpv4/nclient4/lease_test.go
index 3d4244c..22d97e0 100644
--- a/dhcpv4/nclient4/lease_test.go
+++ b/dhcpv4/nclient4/lease_test.go
@@ -43,6 +43,7 @@ type testServerLease struct {
type testServerLeaseList struct {
list []*testServerLease
clientIDOptions dhcpv4.OptionCodeList
+ lastTestSvrErr error
}
func newtestServerLeaseList(l dhcpv4.OptionCodeList) *testServerLeaseList {
@@ -183,26 +184,27 @@ func (sll *testServerLeaseList) handle(conn net.PacketConn, peer net.Addr, m *dh
if m.OpCode != dhcpv4.OpcodeBootRequest {
log.Fatal("Not a BootRequest!")
}
- var err error
switch m.MessageType() {
case dhcpv4.MessageTypeDiscover, dhcpv4.MessageTypeRequest:
- err = sll.testLeaseDORAHandle(conn, peer, m)
- if err != nil {
- log.Printf("svr failed to handle DORA,%v", err)
+ sll.lastTestSvrErr = sll.testLeaseDORAHandle(conn, peer, m)
+ if sll.lastTestSvrErr != nil {
+ log.Printf("svr failed to handle DORA,%v", sll.lastTestSvrErr)
}
case dhcpv4.MessageTypeRelease:
- err = sll.testLeaseReleaseHandle(conn, peer, m)
- if err != nil {
- log.Printf("svr failed to handle release,%v", err)
+ sll.lastTestSvrErr = sll.testLeaseReleaseHandle(conn, peer, m)
+ if sll.lastTestSvrErr != nil {
+ log.Printf("svr failed to handle release,%v", sll.lastTestSvrErr)
}
default:
- log.Printf("svr got unexpeceted message type %v", m.MessageType())
+ sll.lastTestSvrErr = fmt.Errorf("svr got unexpeceted message type %v", m.MessageType())
+ log.Print(sll.lastTestSvrErr)
}
}
func (sll *testServerLeaseList) runTest(t *testing.T) {
for _, l := range sll.list {
+ sll.lastTestSvrErr = nil
t.Logf("running lease test case for mac %v", l.key.mac)
// Fake PacketConn connection.
//note can't reuse conn between different clients, because there is currently
@@ -228,12 +230,12 @@ func (sll *testServerLeaseList) runTest(t *testing.T) {
for op, val := range l.key.idOptions {
modList = append(modList, dhcpv4.WithOption(dhcpv4.OptGeneric(dhcpv4.GenericOptionCode(op), val)))
}
- chkerr := func(err error, shouldfail bool, t *testing.T) bool {
- if err != nil {
+ chkerr := func(err, lastsvrerr error, shouldfail bool, t *testing.T) bool {
+ if err != nil || lastsvrerr != nil {
if !shouldfail {
- t.Fatal(err)
+ t.Fatalf("case failed,%v,svr err:%v ", err, lastsvrerr)
} else {
- t.Logf("case failed as expected,%v", err)
+ t.Logf("case failed as expected,%v,svr err: %v", err, lastsvrerr)
return false
}
}
@@ -241,10 +243,12 @@ func (sll *testServerLeaseList) runTest(t *testing.T) {
}
lease, err := clnt.Request(context.Background(), modList...)
- keepgoing := chkerr(err, l.ShouldFail, t)
+ keepgoing := chkerr(err, sll.lastTestSvrErr, l.ShouldFail, t)
if keepgoing {
err = clnt.Release(lease)
- chkerr(err, l.ShouldFail, t)
+ //this sleep is to make sure release is handled by server
+ time.Sleep(time.Second)
+ chkerr(err, sll.lastTestSvrErr, l.ShouldFail, t)
}
}
@@ -324,7 +328,7 @@ func TestLease(t *testing.T) {
&testServerLease{
assignedAddr: net.ParseIP("192.168.2.2"),
key: &testLeaseKey{
- mac: net.HardwareAddr{0xaa, 0xbb, 0xcc, 0xdd, 1, 3},
+ mac: net.HardwareAddr{0xaa, 0xbb, 0xcc, 0xdd, 2, 3},
idOptions: dhcpv4.Options{
uint8(dhcpv4.OptionClientIdentifier): []byte("client-fake"),
},
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 11:04:39 +0000