From: Roy Marples Date: Fri, 17 Aug 2018 16:38:28 +0000 (+0100) Subject: BSD: Silence debug when address no longer exists when getting flags X-Git-Tag: v7.0.8~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e203e7371294bf4b027f5a3d4c66c724a2dbd1af;p=thirdparty%2Fdhcpcd.git BSD: Silence debug when address no longer exists when getting flags --- diff --git a/src/if-bsd.c b/src/if-bsd.c index 477dfd6b..cdd959a6 100644 --- a/src/if-bsd.c +++ b/src/if-bsd.c @@ -1157,8 +1157,8 @@ if_ifa(struct dhcpcd_ctx *ctx, const struct ifa_msghdr *ifam) if (ifam->ifam_type == RTM_DELADDR) addrflags = 0 ; else if ((addrflags = if_addrflags(ifp, &addr, NULL)) == -1) { - logerr("%s: if_addrflags: %s", - ifp->name, inet_ntoa(addr)); + if (errno != EADDRNOTAVAIL) + logerr("%s: if_addrflags", __func__); break; } #endif @@ -1183,7 +1183,8 @@ if_ifa(struct dhcpcd_ctx *ctx, const struct ifa_msghdr *ifam) if (ifam->ifam_type == RTM_DELADDR) addrflags = 0; else if ((addrflags = if_addrflags6(ifp, &addr6, NULL)) == -1) { - logerr("%s: if_addrflags6", ifp->name); + if (errno != EADDRNOTAVAIL) + logerr("%s: if_addrflags6", __func__); break; } #endif diff --git a/src/if.c b/src/if.c index eaebefa5..18356206 100644 --- a/src/if.c +++ b/src/if.c @@ -240,10 +240,8 @@ if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs, addrflags = if_addrflags(ifp, &addr->sin_addr, ifa->ifa_name); if (addrflags == -1) { - if (errno != EEXIST) - logerr("%s: if_addrflags: %s", - __func__, - inet_ntoa(addr->sin_addr)); + if (errno != EEXIST && errno != EADDRNOTAVAIL) + logerr("%s: if_addrflags", __func__); continue; } #endif @@ -266,7 +264,7 @@ if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs, addrflags = if_addrflags6(ifp, &sin6->sin6_addr, ifa->ifa_name); if (addrflags == -1) { - if (errno != EEXIST) + if (errno != EEXIST && errno != EADDRNOTAVAIL) logerr("%s: if_addrflags6", __func__); continue; } diff --git a/src/ipv6.c b/src/ipv6.c index 2d516d99..8a2cb9f8 100644 --- a/src/ipv6.c +++ b/src/ipv6.c @@ -567,7 +567,8 @@ ipv6_checkaddrflags(void *arg) alias = NULL; #endif if ((flags = if_addrflags6(ia->iface, &ia->addr, alias)) == -1) { - logerr("%s: if_addrflags6", ia->iface->name); + if (errno != EEXIST && errno != EADDRNOTAVAIL) + logerr("%s: if_addrflags6", __func__); return; }