From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 20 Jun 2021 16:42:58 +0000 (+0900)
Subject: sd-ipv4acd: include announced address in log message
X-Git-Tag: v249-rc3~17^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=265b6d4e0c3af72c73f02e4196d4dd652d6dda50;p=thirdparty%2Fsystemd.git

sd-ipv4acd: include announced address in log message
---

diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index c8e3378386a..549c18225ff 100644
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -286,8 +286,9 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata)
                 if (r < 0) {
                         log_ipv4acd_errno(acd, r, "Failed to send ARP announcement: %m");
                         goto fail;
-                } else
-                        log_ipv4acd(acd, "ANNOUNCE");
+                }
+
+                log_ipv4acd(acd, "Announcing "IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(acd->address));
 
                 ipv4acd_set_state(acd, IPV4ACD_STATE_ANNOUNCING, false);
 
@@ -369,8 +370,9 @@ static int ipv4acd_on_packet(
                                 if (r < 0) {
                                         log_ipv4acd_errno(acd, r, "Failed to send ARP announcement: %m");
                                         goto fail;
-                                } else
-                                        log_ipv4acd(acd, "DEFEND");
+                                }
+
+                                log_ipv4acd(acd, "Defending "IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(acd->address));
 
                         } else
                                 ipv4acd_on_conflict(acd);