@@ -239,6 +239,10 @@ func (s *NetworkInterfaceState) update() (DhcpTargetState, error) {
239
239
ipv4Addresses = append (ipv4Addresses , addr .IP )
240
240
ipv4AddressesString = append (ipv4AddressesString , addr .IPNet .String ())
241
241
} else if addr .IP .To16 () != nil {
242
+ if s .config .IPv6Mode .String == "disabled" {
243
+ continue
244
+ }
245
+
242
246
scopedLogger := s .l .With ().Str ("ipv6" , addr .IP .String ()).Logger ()
243
247
// check if it's a link local address
244
248
if addr .IP .IsLinkLocalUnicast () {
@@ -287,35 +291,37 @@ func (s *NetworkInterfaceState) update() (DhcpTargetState, error) {
287
291
}
288
292
s .ipv4Addresses = ipv4AddressesString
289
293
290
- if ipv6LinkLocal != nil {
291
- if s .ipv6LinkLocal == nil || s .ipv6LinkLocal .String () != ipv6LinkLocal .String () {
292
- scopedLogger := s .l .With ().Str ("ipv6" , ipv6LinkLocal .String ()).Logger ()
293
- if s .ipv6LinkLocal != nil {
294
- scopedLogger .Info ().
295
- Str ("old_ipv6" , s .ipv6LinkLocal .String ()).
296
- Msg ("IPv6 link local address changed" )
297
- } else {
298
- scopedLogger .Info ().Msg ("IPv6 link local address found" )
294
+ if s .config .IPv6Mode .String != "disabled" {
295
+ if ipv6LinkLocal != nil {
296
+ if s .ipv6LinkLocal == nil || s .ipv6LinkLocal .String () != ipv6LinkLocal .String () {
297
+ scopedLogger := s .l .With ().Str ("ipv6" , ipv6LinkLocal .String ()).Logger ()
298
+ if s .ipv6LinkLocal != nil {
299
+ scopedLogger .Info ().
300
+ Str ("old_ipv6" , s .ipv6LinkLocal .String ()).
301
+ Msg ("IPv6 link local address changed" )
302
+ } else {
303
+ scopedLogger .Info ().Msg ("IPv6 link local address found" )
304
+ }
305
+ s .ipv6LinkLocal = ipv6LinkLocal
306
+ changed = true
299
307
}
300
- s .ipv6LinkLocal = ipv6LinkLocal
301
- changed = true
302
308
}
303
- }
304
- s .ipv6Addresses = ipv6Addresses
305
-
306
- if len (ipv6Addresses ) > 0 {
307
- // compare the addresses to see if there's a change
308
- if s .ipv6Addr == nil || s .ipv6Addr .String () != ipv6Addresses [0 ].Address .String () {
309
- scopedLogger := s .l .With ().Str ("ipv6" , ipv6Addresses [0 ].Address .String ()).Logger ()
310
- if s .ipv6Addr != nil {
311
- scopedLogger .Info ().
312
- Str ("old_ipv6" , s .ipv6Addr .String ()).
313
- Msg ("IPv6 address changed" )
314
- } else {
315
- scopedLogger .Info ().Msg ("IPv6 address found" )
309
+ s .ipv6Addresses = ipv6Addresses
310
+
311
+ if len (ipv6Addresses ) > 0 {
312
+ // compare the addresses to see if there's a change
313
+ if s .ipv6Addr == nil || s .ipv6Addr .String () != ipv6Addresses [0 ].Address .String () {
314
+ scopedLogger := s .l .With ().Str ("ipv6" , ipv6Addresses [0 ].Address .String ()).Logger ()
315
+ if s .ipv6Addr != nil {
316
+ scopedLogger .Info ().
317
+ Str ("old_ipv6" , s .ipv6Addr .String ()).
318
+ Msg ("IPv6 address changed" )
319
+ } else {
320
+ scopedLogger .Info ().Msg ("IPv6 address found" )
321
+ }
322
+ s .ipv6Addr = & ipv6Addresses [0 ].Address
323
+ changed = true
316
324
}
317
- s .ipv6Addr = & ipv6Addresses [0 ].Address
318
- changed = true
319
325
}
320
326
}
321
327
0 commit comments