From 45b55fe89fd20c0f10738d7c05078cda9122c7e6 Mon Sep 17 00:00:00 2001
From: Siyuan <siyuan@buildjet.com>
Date: Tue, 7 Oct 2025 18:31:44 +0000
Subject: [PATCH] fix dhcp6 logger

---
 pkg/nmlite/jetdhcpc/dhcp6.go | 8 ++++----
 pkg/nmlite/jetdhcpc/utils.go | 8 +++++---
 pkg/nmlite/link/netlink.go   | 1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/nmlite/jetdhcpc/dhcp6.go b/pkg/nmlite/jetdhcpc/dhcp6.go
index f71f744c..9a501ce9 100644
--- a/pkg/nmlite/jetdhcpc/dhcp6.go
+++ b/pkg/nmlite/jetdhcpc/dhcp6.go
@@ -1,18 +1,18 @@
 package jetdhcpc
 
 import (
-	"log"
 	"net"
 	"time"
 
 	"github.com/insomniacslk/dhcp/dhcpv6"
 	"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
+	"github.com/rs/zerolog"
 	"github.com/vishvananda/netlink"
 )
 
 // isIPv6LinkReady returns true if the interface has a link-local address
 // which is not tentative.
-func isIPv6LinkReady(l netlink.Link) (bool, error) {
+func isIPv6LinkReady(l netlink.Link, logger *zerolog.Logger) (bool, error) {
 	addrs, err := netlink.AddrList(l, 10) // AF_INET6
 	if err != nil {
 		return false, err
@@ -20,7 +20,7 @@ func isIPv6LinkReady(l netlink.Link) (bool, error) {
 	for _, addr := range addrs {
 		if addr.IP.IsLinkLocalUnicast() && (addr.Flags&0x40 == 0) { // IFA_F_TENTATIVE
 			if addr.Flags&0x80 != 0 { // IFA_F_DADFAILED
-				log.Printf("DADFAILED for %v, continuing anyhow", addr.IP)
+				logger.Warn().Str("address", addr.IP.String()).Msg("DADFAILED for address, continuing anyhow")
 			}
 			return true, nil
 		}
@@ -30,7 +30,7 @@ func isIPv6LinkReady(l netlink.Link) (bool, error) {
 
 // isIPv6RouteReady returns true if serverAddr is reachable.
 func isIPv6RouteReady(serverAddr net.IP) waitForCondition {
-	return func(l netlink.Link) (bool, error) {
+	return func(l netlink.Link, logger *zerolog.Logger) (bool, error) {
 		if serverAddr.IsMulticast() {
 			return true, nil
 		}
diff --git a/pkg/nmlite/jetdhcpc/utils.go b/pkg/nmlite/jetdhcpc/utils.go
index 86b5d5d8..684a9302 100644
--- a/pkg/nmlite/jetdhcpc/utils.go
+++ b/pkg/nmlite/jetdhcpc/utils.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"time"
 
+	"github.com/rs/zerolog"
 	"github.com/vishvananda/netlink"
 )
 
-type waitForCondition func(l netlink.Link) (ready bool, err error)
+type waitForCondition func(l netlink.Link, logger *zerolog.Logger) (ready bool, err error)
 
 func (c *Client) waitFor(
 	link netlink.Link,
@@ -15,18 +16,19 @@ func (c *Client) waitFor(
 	condition waitForCondition,
 	timeoutError error,
 ) error {
-	return waitFor(c.ctx, link, timeout, condition, timeoutError)
+	return waitFor(c.ctx, link, c.l, timeout, condition, timeoutError)
 }
 
 func waitFor(
 	ctx context.Context,
 	link netlink.Link,
+	logger *zerolog.Logger,
 	timeout <-chan time.Time,
 	condition waitForCondition,
 	timeoutError error,
 ) error {
 	for {
-		if ready, err := condition(link); err != nil {
+		if ready, err := condition(link, logger); err != nil {
 			return err
 		} else if ready {
 			break
diff --git a/pkg/nmlite/link/netlink.go b/pkg/nmlite/link/netlink.go
index ef56a212..c8c4e53a 100644
--- a/pkg/nmlite/link/netlink.go
+++ b/pkg/nmlite/link/netlink.go
@@ -419,7 +419,6 @@ func (nm *NetlinkManager) ReconcileLinkAddrs(link *Link, expected []*types.IPAdd
 
 	for _, addr := range expected {
 		ipCidr := addr.Address.IP.String() + "/" + addr.Address.Mask.String()
-		nm.logger.Trace().Str("address", ipCidr).Msg("adding expected address")
 		expectedAddrs[ipCidr] = true
 	}