From patchwork Tue Apr 9 03:04:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1921182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=WHLPzgVm; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Gq5ohk1h; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VD9s42c4Bz1yY8 for ; Tue, 9 Apr 2024 13:08:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4YyUjhbAPavIV9X9kRMEDbWGTeOuEgH/SXGgK36p8uU=; b=WHLPzgVmeGZ+uj IEDtKkkt9OFzloMlHYUPsihvJRnIUC5YzAnvzEQR/KTuGPSDLYTXPaerlZFW6HwchJQb8ADd9YH+G ibEZsvfe0PEW3gVltZTVu+rIUr12c0keQtn9GavfHLiXM1dbiZsahMyczjQZXxPMKTpRPMNdb93oi q3t2roGr0mh5SmyIi/V2G8v3xFIujBj0+dZjXR661p4ROOR8C/mJoKMCNHvS4xe+yV/ixRQW/AxBW B5OdrWrWg1SSlqkYWX2YxbbFxlp8yGz9PuhXseMo0ASkTidM4bB7meIWvIt7tEIfZnzGEDe7Afeso APuiJQH1Eqj8xiA2yoLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru1pU-000000003cF-0apG; Tue, 09 Apr 2024 03:07:24 +0000 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru1nx-000000002ad-46p5 for openwrt-devel@lists.openwrt.org; Tue, 09 Apr 2024 03:05:55 +0000 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-516d3776334so5072523e87.1 for ; Mon, 08 Apr 2024 20:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712631945; x=1713236745; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=GSnC5Okm+mcTvHW1co4+xlaqUMkUi1qNuRdsALkGN2k=; b=Gq5ohk1hsz8Yw2aSRLhyWKr+R2CG3yxjKPuC8eGp0PxVPptxgEZnJr/iuysdafXJa0 cnI6ZM1m7HT6jxOyi1PStPCwimYPy/ICOOsacSqJrFn+3qOa5vAK+cGmS0DKxmdKhlJy XR36X90Jmrn6r6s3QCFeOqXTEErXmhm0U10pAvkHkfisDNQLhN7YW03sl/CzYRC49dOd C5jxgwNUUXdg86T3RoAKkHMO6dk3UNYtcOEqbdKDMXOWAcHH6TOHnmmmRgIh/G3fE/8P 125c6ka+f9Yf7NkQNberwtBoBmdfENV1Uoy8A0FZ4icdIxqwk/H+Zl2sc7XWWzUFcfRu eUtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712631945; x=1713236745; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=GSnC5Okm+mcTvHW1co4+xlaqUMkUi1qNuRdsALkGN2k=; b=nyviAOvudyxzG1XZe5y2w+GBHZPmsHXdwKtxt5uHacKAzh8AW72eNCcpwbMbDmiTiQ C0FI70w9urUKk9FZc7piJkY0NPTlMDedV5MbRJZErftn6IRalKbYcq/aL3Jj/Kh+6dr4 jiehnZV2EK+ypRupjSavVjwajbfASs1qssxn4pvIB7i5sj1fWxqNDtpLkZozBmr0vMg7 v7Jt5LGJSvGJ28tpq4IOJklJZZVcS+IvVkgLmNGwrd6TcTd8xHSmEhnpnn89gtPtXnFx mo3YobP334uk/NqiyTf62WdqqfgtqcUN5YuInnhH6LhKS/A2JqWc0NzhjTTaNJuRxEP1 A3dw== X-Gm-Message-State: AOJu0YzS3BHB2yYvyC1k36zH7pFXhGo9KefcMJaSdGFoRjMcLlEgmmlq W29i5dM/vRtc98O+i8/ijEl42GfjMI2xK1qVjyqPES+XZ4wnPYImiZAc1WJJ X-Google-Smtp-Source: AGHT+IFI5Epeh8zNdRwat0syFzYzvtDX6xIyiiJHQYf4bp8kjXD8QlJuiQxWExhH5H8XfY22IhZWBA== X-Received: by 2002:ac2:592c:0:b0:515:c8da:c96d with SMTP id v12-20020ac2592c000000b00515c8dac96dmr7076047lfi.19.1712631944667; Mon, 08 Apr 2024 20:05:44 -0700 (PDT) Received: from blackhol3 ([2001:9b0:40::cae3:cb03]) by smtp.gmail.com with ESMTPSA id d9-20020ac25ec9000000b00516b0051e6esm1399491lfq.231.2024.04.08.20.05.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 20:05:44 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [PATCH v3 6/9] various: (formatting) convert spaces -> tabs Date: Tue, 9 Apr 2024 05:04:07 +0200 Message-ID: <20240409030540.77576-7-newtwen+github@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240409030540.77576-1-newtwen+github@gmail.com> References: <20240405005510.19778-1-newtwen+github@gmail.com> <20240409030540.77576-1-newtwen+github@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240408_200550_192522_D131EDFC X-CRM114-Status: GOOD ( 15.94 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Paul Donald Signed-off-by: Paul Donald --- src/config.c | 52 ++++++++++++++++++++++++++ src/router.c | 32 ++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletio [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:136 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [newtwen+github(at)gmail.com] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Paul Donald Signed-off-by: Paul Donald --- src/config.c | 52 ++++++++++++++++++++++++++-------------------------- src/router.c | 32 ++++++++++++++++---------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/config.c b/src/config.c index 0368e74..7fe31a1 100644 --- a/src/config.c +++ b/src/config.c @@ -295,8 +295,8 @@ static int parse_ra_flags(uint8_t *flags, struct blob_attr *attr) if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) continue; - if (!blobmsg_check_attr(cur, false)) - continue; + if (!blobmsg_check_attr(cur, false)) + continue; for (i = 0; ra_flags[i].name; i++) { if (!strcmp(ra_flags[i].name, blobmsg_get_string(cur))) { @@ -599,7 +599,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr goto err; if (!iface->ifindex && - (iface->ifindex = if_nametoindex(iface->ifname)) <= 0) + (iface->ifindex = if_nametoindex(iface->ifname)) <= 0) goto err; if ((iface->ifflags = odhcpd_get_flags(iface)) < 0) @@ -643,7 +643,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->dhcp_leasetime = time; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_LEASETIME].name, iface->name); + iface_attrs[IFACE_ATTR_LEASETIME].name, iface->name); } @@ -654,7 +654,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->preferred_lifetime = time; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_PREFERRED_LIFETIME].name, iface->name); + iface_attrs[IFACE_ATTR_PREFERRED_LIFETIME].name, iface->name); } @@ -700,7 +700,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ignore = false; } else syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA].name, iface->name); + iface_attrs[IFACE_ATTR_RA].name, iface->name); } if ((c = tb[IFACE_ATTR_DHCPV4])) { @@ -713,7 +713,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } } else syslog(LOG_ERR, "Invalid %s mode configured for interface %s", - iface_attrs[IFACE_ATTR_DHCPV4].name, iface->name); + iface_attrs[IFACE_ATTR_DHCPV4].name, iface->name); } if ((c = tb[IFACE_ATTR_DHCPV6])) { @@ -724,7 +724,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ignore = false; } else syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", - iface_attrs[IFACE_ATTR_DHCPV6].name, iface->name); + iface_attrs[IFACE_ATTR_DHCPV6].name, iface->name); } if ((c = tb[IFACE_ATTR_NDP])) { @@ -735,7 +735,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ignore = false; } else syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", - iface_attrs[IFACE_ATTR_NDP].name, iface->name); + iface_attrs[IFACE_ATTR_NDP].name, iface->name); } if ((c = tb[IFACE_ATTR_ROUTER])) { @@ -757,7 +757,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4; } else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_ROUTER].name, iface->name); + iface_attrs[IFACE_ATTR_ROUTER].name, iface->name); } } @@ -776,7 +776,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) { if (addr4.s_addr == INADDR_ANY) { syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DNS].name, iface->name); + iface_attrs[IFACE_ATTR_DNS].name, iface->name); continue; } @@ -790,7 +790,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } else if (inet_pton(AF_INET6, blobmsg_get_string(cur), &addr6) == 1) { if (IN6_IS_ADDR_UNSPECIFIED(&addr6)) { syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DNS].name, iface->name); + iface_attrs[IFACE_ATTR_DNS].name, iface->name); continue; } @@ -803,7 +803,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->dns[iface->dns_cnt - 1] = addr6; } else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DNS].name, iface->name); + iface_attrs[IFACE_ATTR_DNS].name, iface->name); } } @@ -832,7 +832,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr len = dn_comp(domain, buf, sizeof(buf), NULL, NULL); if (len <= 0) { syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DOMAIN].name, iface->name); + iface_attrs[IFACE_ATTR_DOMAIN].name, iface->name); continue; } @@ -872,7 +872,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->dhcpv6_pd_min_len = pd_min_len; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DHCPV6_PD_MIN_LEN].name, iface->name); + iface_attrs[IFACE_ATTR_DHCPV6_PD_MIN_LEN].name, iface->name); } if ((c = tb[IFACE_ATTR_DHCPV6_NA])) @@ -894,7 +894,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr /* IFACE_ATTR_RA_MANAGEMENT aka ra_management is deprecated since 2019 */ if (!tb[IFACE_ATTR_RA_FLAGS] && !tb[IFACE_ATTR_RA_SLAAC] && - (c = tb[IFACE_ATTR_RA_MANAGEMENT])) { + (c = tb[IFACE_ATTR_RA_MANAGEMENT])) { switch (blobmsg_get_u32(c)) { case 0: iface->ra_flags = ND_RA_FLAG_OTHER; @@ -918,7 +918,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if (parse_ra_flags(&iface->ra_flags, c) < 0) syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_FLAGS].name, iface->name); + iface_attrs[IFACE_ATTR_RA_FLAGS].name, iface->name); } if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) { @@ -928,7 +928,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ra_reachabletime = ra_reachabletime; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_REACHABLETIME].name, iface->name); + iface_attrs[IFACE_ATTR_RA_REACHABLETIME].name, iface->name); } if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) { @@ -938,7 +938,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ra_retranstime = ra_retranstime; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name); + iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name); } if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) { @@ -948,7 +948,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ra_hoplimit = ra_hoplimit; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_HOPLIMIT].name, iface->name); + iface_attrs[IFACE_ATTR_RA_HOPLIMIT].name, iface->name); } if ((c = tb[IFACE_ATTR_RA_MTU])) { @@ -958,7 +958,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->ra_mtu = ra_mtu; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_MTU].name, iface->name); + iface_attrs[IFACE_ATTR_RA_MTU].name, iface->name); } if ((c = tb[IFACE_ATTR_RA_SLAAC])) @@ -1014,7 +1014,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->route_preference = 0; else syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_PREFERENCE].name, iface->name); + iface_attrs[IFACE_ATTR_RA_PREFERENCE].name, iface->name); } if ((c = tb[IFACE_ATTR_PD_MANAGER])) @@ -1024,7 +1024,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_PD_CER]) && inet_pton(AF_INET6, blobmsg_get_string(c), &iface->dhcpv6_pd_cer) < 1) syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_PD_CER].name, iface->name); + iface_attrs[IFACE_ATTR_PD_CER].name, iface->name); if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING])) iface->learn_routes = blobmsg_get_bool(c); @@ -1149,7 +1149,7 @@ static int lease_cmp(const void *k1, const void *k2, _unused void *ptr) return cmp; return memcmp(l1->mac.ether_addr_octet, l2->mac.ether_addr_octet, - sizeof(l1->mac.ether_addr_octet)); + sizeof(l1->mac.ether_addr_octet)); } static void lease_change_config(struct lease *l_old, struct lease *l_new) @@ -1157,7 +1157,7 @@ static void lease_change_config(struct lease *l_old, struct lease *l_new) bool update = false; if ((!!l_new->hostname != !!l_old->hostname) || - (l_new->hostname && strcmp(l_new->hostname, l_old->hostname))) { + (l_new->hostname && strcmp(l_new->hostname, l_old->hostname))) { free(l_old->hostname); l_old->hostname = NULL; @@ -1228,7 +1228,7 @@ struct lease *config_find_lease_by_mac(const uint8_t *mac) vlist_for_each_element(&leases, l, node) { if (!memcmp(l->mac.ether_addr_octet, mac, - sizeof(l->mac.ether_addr_octet))) + sizeof(l->mac.ether_addr_octet))) return l; } diff --git a/src/router.c b/src/router.c index 05522dc..c02b408 100644 --- a/src/router.c +++ b/src/router.c @@ -101,7 +101,7 @@ int router_setup_interface(struct interface *iface, bool enable) if (iface->router_event.uloop.fd < 0) { /* Open ICMPv6 socket */ iface->router_event.uloop.fd = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, - IPPROTO_ICMPV6); + IPPROTO_ICMPV6); if (iface->router_event.uloop.fd < 0) { syslog(LOG_ERR, "socket(AF_INET6): %m"); ret = -1; @@ -109,7 +109,7 @@ int router_setup_interface(struct interface *iface, bool enable) } if (setsockopt(iface->router_event.uloop.fd, SOL_SOCKET, SO_BINDTODEVICE, - iface->ifname, strlen(iface->ifname)) < 0) { + iface->ifname, strlen(iface->ifname)) < 0) { syslog(LOG_ERR, "setsockopt(SO_BINDTODEVICE): %m"); ret = -1; goto out; @@ -117,7 +117,7 @@ int router_setup_interface(struct interface *iface, bool enable) /* Let the kernel compute our checksums */ if (setsockopt(iface->router_event.uloop.fd, IPPROTO_RAW, IPV6_CHECKSUM, - &val, sizeof(val)) < 0) { + &val, sizeof(val)) < 0) { syslog(LOG_ERR, "setsockopt(IPV6_CHECKSUM): %m"); ret = -1; goto out; @@ -126,14 +126,14 @@ int router_setup_interface(struct interface *iface, bool enable) /* This is required by RFC 4861 */ val = 255; if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, - &val, sizeof(val)) < 0) { + &val, sizeof(val)) < 0) { syslog(LOG_ERR, "setsockopt(IPV6_MULTICAST_HOPS): %m"); ret = -1; goto out; } if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, - &val, sizeof(val)) < 0) { + &val, sizeof(val)) < 0) { syslog(LOG_ERR, "setsockopt(IPV6_UNICAST_HOPS): %m"); ret = -1; goto out; @@ -142,14 +142,14 @@ int router_setup_interface(struct interface *iface, bool enable) /* We need to know the source interface */ val = 1; if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, - &val, sizeof(val)) < 0) { + &val, sizeof(val)) < 0) { syslog(LOG_ERR, "setsockopt(IPV6_RECVPKTINFO): %m"); ret = -1; goto out; } if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, - &val, sizeof(val)) < 0) { + &val, sizeof(val)) < 0) { syslog(LOG_ERR, "setsockopt(IPV6_RECVHOPLIMIT): %m"); ret = -1; goto out; @@ -158,7 +158,7 @@ int router_setup_interface(struct interface *iface, bool enable) /* Don't loop back */ val = 0; if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, - &val, sizeof(val)) < 0) { + &val, sizeof(val)) < 0) { syslog(LOG_ERR, "setsockopt(IPV6_MULTICAST_LOOP): %m"); ret = -1; goto out; @@ -169,7 +169,7 @@ int router_setup_interface(struct interface *iface, bool enable) ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filt); ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filt); if (setsockopt(iface->router_event.uloop.fd, IPPROTO_ICMPV6, ICMP6_FILTER, - &filt, sizeof(filt)) < 0) { + &filt, sizeof(filt)) < 0) { syslog(LOG_ERR, "setsockopt(ICMP6_FILTER): %m"); ret = -1; goto out; @@ -206,7 +206,7 @@ int router_setup_interface(struct interface *iface, bool enable) } if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, - IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { + IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) { ret = -1; syslog(LOG_ERR, "setsockopt(IPV6_ADD_MEMBERSHIP): %m"); goto out; @@ -335,7 +335,7 @@ static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len) } static int calc_adv_interval(struct interface *iface, uint32_t minvalid, - uint32_t *maxival) + uint32_t *maxival) { uint32_t minival = iface->ra_mininterval; int msecs; @@ -561,8 +561,8 @@ static int send_router_advert(struct interface *iface, const struct in6_addr *fr if (ADDR_MATCH_PIO_FILTER(addr, iface)) { syslog(LOG_INFO, "Address %s filtered out as RA prefix on %s", - inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)), - iface->name); + inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)), + iface->name); continue; /* PIO filtered out of this RA */ } @@ -651,7 +651,7 @@ static int send_router_advert(struct interface *iface, const struct in6_addr *fr if (default_route) { syslog(LOG_WARNING, "A default route is present but there is no public prefix " - "on %s thus we don't announce a default route by overriding ra_lifetime!", iface->name); + "on %s thus we don't announce a default route by overriding ra_lifetime!", iface->name); } else { syslog(LOG_WARNING, "No default route present, overriding ra_lifetime!"); } @@ -800,8 +800,8 @@ pref64_out: if (ADDR_MATCH_PIO_FILTER(addr, iface)) { syslog(LOG_INFO, "Address %s filtered out as RA route on %s", - inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)), - iface->name); + inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)), + iface->name); continue; /* PIO filtered out of this RA */ }