treewide: align syslog loglevels
authorHans Dedecker <dedeckeh@gmail.com>
Tue, 16 Apr 2019 13:27:42 +0000 (15:27 +0200)
committerHans Dedecker <dedeckeh@gmail.com>
Tue, 16 Apr 2019 13:28:09 +0000 (15:28 +0200)
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
src/dhcpv4.c
src/dhcpv6-ia.c
src/ndp.c
src/odhcpd.c
src/router.c

index 88719e0..7058b83 100644 (file)
@@ -219,7 +219,7 @@ static int setup_dhcpv4_addresses(struct interface *iface)
        }
 
        if (!iface->addr4_len) {
-               syslog(LOG_WARNING, "No network(s) available on %s", iface->name);
+               syslog(LOG_ERR, "No network(s) available on %s", iface->name);
                return -1;
        }
 
@@ -249,7 +249,7 @@ static int setup_dhcpv4_addresses(struct interface *iface)
 
        /* Don't allocate IP range for subnets bigger than 28 */
        if (iface->addr4[0].prefix > 28) {
-               syslog(LOG_WARNING, "Auto allocation of DHCP range fails on %s", iface->name);
+               syslog(LOG_ERR, "Auto allocation of DHCP range fails on %s", iface->name);
                return -1;
        }
 
@@ -523,7 +523,7 @@ static void dhcpv4_fr_send(struct dhcp_assignment *a)
                syslog(LOG_ERR, "Failed to send %s to %s - %s: %m", dhcpv4_msg_to_string(msg),
                        odhcpd_print_mac(a->hwaddr, sizeof(a->hwaddr)), inet_ntoa(dest.sin_addr));
        else
-               syslog(LOG_WARNING, "Sent %s to %s - %s", dhcpv4_msg_to_string(msg),
+               syslog(LOG_NOTICE, "Sent %s to %s - %s", dhcpv4_msg_to_string(msg),
                        odhcpd_print_mac(a->hwaddr, sizeof(a->hwaddr)), inet_ntoa(dest.sin_addr));
 }
 
@@ -594,7 +594,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
        syslog(LOG_NOTICE, "Got DHCPv4 request on %s", iface->name);
 
        if (!iface->dhcpv4_start_ip.s_addr && !iface->dhcpv4_end_ip.s_addr) {
-               syslog(LOG_WARNING, "No DHCP range available on %s", iface->name);
+               syslog(LOG_ERR, "No DHCP range available on %s", iface->name);
                return;
        }
 
@@ -717,7 +717,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                        req->ciaddr.s_addr = INADDR_ANY;
        }
 
-       syslog(LOG_WARNING, "Received %s from %s on %s", dhcpv4_msg_to_string(reqmsg),
+       syslog(LOG_NOTICE, "Received %s from %s on %s", dhcpv4_msg_to_string(reqmsg),
                        odhcpd_print_mac(req->chaddr, req->hlen), iface->name);
 
 #ifdef WITH_UBUS
@@ -869,7 +869,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                        "ff:ff:ff:ff:ff:ff": odhcpd_print_mac(req->chaddr, req->hlen),
                        inet_ntoa(dest.sin_addr));
        else
-               syslog(LOG_ERR, "Sent %s to %s - %s",
+               syslog(LOG_NOTICE, "Sent %s to %s - %s",
                        dhcpv4_msg_to_string(msg),
                        dest.sin_addr.s_addr == INADDR_BROADCAST ?
                        "ff:ff:ff:ff:ff:ff": odhcpd_print_mac(req->chaddr, req->hlen),
@@ -970,7 +970,7 @@ raddr_out:
                                              ntohl(c->addr) > try ? &c->head : &iface->dhcpv4_assignments);
                                a->addr = htonl(try);
 
-                               syslog(LOG_DEBUG, "Assigning mapped IP: %u.%u.%u.%u (try %u of %u)",
+                               syslog(LOG_INFO, "Assigning mapped IP: %u.%u.%u.%u (try %u of %u)",
                                        ((uint8_t *)&a->addr)[0], ((uint8_t *)&a->addr)[1],
                                        ((uint8_t *)&a->addr)[2], ((uint8_t *)&a->addr)[3],
                                        i, count);
index 007b904..6426a74 100644 (file)
@@ -1072,7 +1072,7 @@ static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
                dhcpv6_ia_enum_addrs(iface, a, now, dhcpv6_log_ia_addr, &ctxt);
        }
 
-       syslog(LOG_WARNING, "DHCPV6 %s %s from %s on %s: %s %s", type, (is_pd) ? "IA_PD" : "IA_NA",
+       syslog(LOG_NOTICE, "DHCPV6 %s %s from %s on %s: %s %s", type, (is_pd) ? "IA_PD" : "IA_NA",
                        duidbuf, iface->name, status, leasebuf);
 }
 
index 58fe14f..41b0064 100644 (file)
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -362,7 +362,7 @@ static void setup_addr_for_relaying(struct in6_addr *addr, struct interface *ifa
                        continue;
 
                if (netlink_setup_proxy_neigh(addr, c->ifindex, add))
-                       syslog(LOG_DEBUG, "Failed to %s proxy neighbour entry %s on %s",
+                       syslog(LOG_ERR, "Failed to %s proxy neighbour entry %s on %s",
                                add ? "add" : "delete", ipbuf, c->name);
                else
                        syslog(LOG_DEBUG, "%s proxy neighbour entry %s on %s",
index 8906384..91b5db4 100644 (file)
@@ -209,7 +209,7 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 
        ssize_t sent = sendmsg(socket, &msg, MSG_DONTWAIT);
        if (sent < 0)
-               syslog(LOG_NOTICE, "Failed to send to %s%%%s@%s (%m)",
+               syslog(LOG_ERR, "Failed to send to %s%%%s@%s (%m)",
                                ipbuf, iface->name, iface->ifname);
        else
                syslog(LOG_DEBUG, "Sent %zd bytes to %s%%%s@%s",
index 053b9e8..3606bf1 100644 (file)
@@ -696,7 +696,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        else
                inet_pton(AF_INET6, ALL_IPV6_NODES, &dest.sin6_addr);
 
-       syslog(LOG_INFO, "Sending a RA on %s", iface->name);
+       syslog(LOG_NOTICE, "Sending a RA on %s", iface->name);
 
        odhcpd_send(iface->router_event.uloop.fd, &dest, iov, ARRAY_SIZE(iov), iface);