From patchwork Wed Nov 8 18:57:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 835955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sSmgovZZ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qCXQAryo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yXFtj12wQz9sMN for ; Thu, 9 Nov 2017 05:58:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cgcYRuqQAQVOmExTdOYgHpB8GrU1Q+Wl9dysWbHZVeE=; b=sSmgovZZ64Ja4Y KSV5p568Cb2Px77WX72c4SyCQXnCAPGn0ozqrh6ndXJxbTpeF/2xGwebEK4BfCuT1uCSNjlLnzCu+ /MhdZJm/YI4ZCxezFBk3F32SAetfh1GuuRg3yhKAsoqC+rQ8V+CW0mBB5Fyv+OUuRiwYpUj54KMq5 rojEOoGaJz0+C4Y5mMeY3MfODanE6Usgt8FTPtUqhXNwrcrG+vMHTpRkQuIT9GApOH7jyW98hgSQF 6SBlAGJZkUAh8KyJyThIPrDjJH5tjxx9BUseCS8SoIKMEiBtE1XUfAwjzNSMbRTSI2IYAp/kMf5PD ifCuOUdc0HDNMA8lQolQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eCVYJ-0003jQ-B3; Wed, 08 Nov 2017 18:58:19 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCVYG-0003ii-HH for lede-dev@lists.infradead.org; Wed, 08 Nov 2017 18:58:18 +0000 Received: by mail-pf0-x241.google.com with SMTP id 17so2363045pfn.12 for ; Wed, 08 Nov 2017 10:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EvPJJBg2rRogXqBFWu4Ul+mC/DLNW0MmChpp1J7olVc=; b=qCXQAryoUXRQVMpRHqbYscsk+YFJq7gYmYhGadzEWJ0qBpYLcUnvhiCgYxh3wWn7z8 C1X6wyASqjwCcg64MXex780/E20eHjxXVrtVLLrS3UOqxHD4fg4N5zb52M+GQ1pM5ARw 6A7S39MzToe7TGzm+VMYczrOdhCMKx4aHfAT1bsGpWIk0dqzpLhiOHoTLLIdM+zcQwGN M2HKGP4ZwIOS0FeeJR2pFTlDq47hS0hU+w9SuFciLFP3b+/wFi+pJg9YPK6VDAlzo23y I8/yPbrbW51nz60Vj436ZS2DjNU0DGMiE/duW1ANqjxcG7Obb5XKizV2aPjmjVYtXXhb TW1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EvPJJBg2rRogXqBFWu4Ul+mC/DLNW0MmChpp1J7olVc=; b=fKJHqX/hKbmIgV15oVmqR/Tlnt6gu/me3MlDH1GjM4R/gKzBggUCOaQS4DszXy0SaF T8zgxwRsLADDUOw5RhgFYwUO54JzUm0ueoiYMzf+dTf1jHzaSu3oy6/Tl9MHicDOdWdQ AFSSABDEjxIMzFsPSMVkkmHR0p/B7B5sS23AalKtw8ZQXv9wtu2RQumKT83j/s/JB6dT B/oXffrWvnDCRV9ULXv5oQB3shjcJFB57rtqLheasQlpeU3UmPQMDdZg4bnyitC+tUAd CqVjN/+EkCai/V2u1rugnrDwWaXiSA5VWjD1LeT+EQ9S7R7hDBCRBKOX2aXIoobItOM+ s64g== X-Gm-Message-State: AJaThX5ChFs8J1QdfF6w5TXAeMhgRt5ErR3Naed1LfVuuYSCFBKFe4YT qI+fBhrUgiXASaWq3KZgmqXyPLVp X-Google-Smtp-Source: ABhQp+QteTIOkSqAh5vt0PNJoDA/N7Pm3G3/0hbZa2z9Jp8ONHWi+toeYYGHNycZo9vKp9e6uJhlNw== X-Received: by 10.98.86.81 with SMTP id k78mr1500425pfb.58.1510167474072; Wed, 08 Nov 2017 10:57:54 -0800 (PST) Received: from mangix.lan ([2001:470:1f05:c3e::8ce]) by smtp.gmail.com with ESMTPSA id s199sm8070971pgs.77.2017.11.08.10.57.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Nov 2017 10:57:53 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Wed, 8 Nov 2017 10:57:43 -0800 Message-Id: <20171108185743.3803-1-rosenp@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171107202430.5892-1-rosenp@gmail.com> References: <20171107202430.5892-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171108_105816_607633_704248FA X-CRM114-Status: UNSURE ( 7.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c00:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] umdns: Replace unnecessary memset calls with {}. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Less verbose. Signed-off-by: Rosen Penev v2: some of those memset calls are needed. Also replace { 0 } with {}. --- interface.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/interface.c b/interface.c index 7f814d2..deabcbb 100644 --- a/interface.c +++ b/interface.c @@ -186,7 +186,7 @@ read_socket4(struct uloop_fd *u, unsigned int events) struct iovec iov[1]; char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo)) + CMSG_SPACE(sizeof(int)) + 1]; struct cmsghdr *cmsgptr; - struct msghdr msg; + struct msghdr msg = {}; socklen_t len; struct sockaddr_in from; int flags = 0, ifindex = -1; @@ -202,7 +202,6 @@ read_socket4(struct uloop_fd *u, unsigned int events) iov[0].iov_base = buffer; iov[0].iov_len = sizeof(buffer); - memset(&msg, 0, sizeof(msg)); msg.msg_name = (struct sockaddr *) &from; msg.msg_namelen = sizeof(struct sockaddr_in); msg.msg_iov = iov; @@ -260,7 +259,7 @@ read_socket6(struct uloop_fd *u, unsigned int events) struct iovec iov[1]; char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(sizeof(int)) + 1]; struct cmsghdr *cmsgptr; - struct msghdr msg; + struct msghdr msg = {}; socklen_t len; struct sockaddr_in6 from; int flags = 0, ifindex = -1; @@ -276,7 +275,6 @@ read_socket6(struct uloop_fd *u, unsigned int events) iov[0].iov_base = buffer; iov[0].iov_len = sizeof(buffer); - memset(&msg, 0, sizeof(msg)); msg.msg_name = (struct sockaddr *) &from; msg.msg_namelen = sizeof(struct sockaddr_in6); msg.msg_iov = iov; @@ -327,17 +325,16 @@ read_socket6(struct uloop_fd *u, unsigned int events) static int interface_mcast_setup4(struct interface *iface) { - struct ip_mreqn mreq; + struct ip_mreqn mreq = {}; uint8_t ttl = 255; int no = 0; - struct sockaddr_in sa = { 0 }; + struct sockaddr_in sa = {}; int fd = iface->fd.fd; sa.sin_family = AF_INET; sa.sin_port = htons(MCAST_PORT); inet_pton(AF_INET, MCAST_ADDR, &sa.sin_addr); - memset(&mreq, 0, sizeof(mreq)); mreq.imr_address.s_addr = iface->v4_addr.s_addr; mreq.imr_multiaddr = sa.sin_addr; mreq.imr_ifindex = iface->ifindex; @@ -368,17 +365,16 @@ interface_mcast_setup4(struct interface *iface) static int interface_socket_setup6(struct interface *iface) { - struct ipv6_mreq mreq; + struct ipv6_mreq mreq = {}; int ttl = 255; int no = 0; - struct sockaddr_in6 sa = { 0 }; + struct sockaddr_in6 sa = {}; int fd = iface->fd.fd; sa.sin6_family = AF_INET6; sa.sin6_port = htons(MCAST_PORT); inet_pton(AF_INET6, MCAST_ADDR6, &sa.sin6_addr); - memset(&mreq, 0, sizeof(mreq)); mreq.ipv6mr_multiaddr = sa.sin6_addr; mreq.ipv6mr_interface = iface->ifindex;