From patchwork Wed Dec 9 01:08:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 554167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 7ABF81402B4 for ; Wed, 9 Dec 2015 12:08:40 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 15133106E4; Tue, 8 Dec 2015 17:08:30 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id B198010673 for ; Tue, 8 Dec 2015 17:08:28 -0800 (PST) Received: from bar3.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 4829816119D for ; Tue, 8 Dec 2015 18:08:28 -0700 (MST) X-ASG-Debug-ID: 1449623307-03dd7b0fbdc81320001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar3.cudamail.com with ESMTP id pLEd4Ajm1JKovhiY (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 08 Dec 2015 18:08:28 -0700 (MST) X-Barracuda-Envelope-From: blp@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO relay4-d.mail.gandi.net) (217.70.183.196) by mx3-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 9 Dec 2015 01:08:27 -0000 Received-SPF: pass (mx3-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.196 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.196 X-Barracuda-RBL-IP: 217.70.183.196 Received: from mfilter14-d.gandi.net (mfilter14-d.gandi.net [217.70.178.142]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 08EB41720A5; Wed, 9 Dec 2015 02:08:26 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter14-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter14-d.gandi.net (mfilter14-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id NV_NlagBgA5q; Wed, 9 Dec 2015 02:08:24 +0100 (CET) X-Originating-IP: 208.91.2.3 Received: from sigabrt.benpfaff.org (unknown [208.91.2.3]) (Authenticated sender: blp@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 17A24172098; Wed, 9 Dec 2015 02:08:23 +0100 (CET) X-CudaMail-Envelope-Sender: blp@ovn.org From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V1-1207068952 X-CudaMail-DTE: 120815 X-CudaMail-Originating-IP: 217.70.183.196 Date: Tue, 8 Dec 2015 17:08:05 -0800 X-ASG-Orig-Subj: [##CM-V1-1207068952##][PATCH 02/14] packets: New macro ETH_ADDR_STRLEN. Message-Id: <1449623297-31060-3-git-send-email-blp@ovn.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1449623297-31060-1-git-send-email-blp@ovn.org> References: <1449623297-31060-1-git-send-email-blp@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1449623308 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 02/14] packets: New macro ETH_ADDR_STRLEN. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" An upcoming commit will introduce another user. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- lib/packets.h | 1 + vswitchd/bridge.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/packets.h b/lib/packets.h index edf140b..1e0417a 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -330,6 +330,7 @@ ovs_be32 set_mpls_lse_values(uint8_t ttl, uint8_t tc, uint8_t bos, #define ETH_ADDR_ARGS(EA) ETH_ADDR_BYTES_ARGS((EA).ea) #define ETH_ADDR_BYTES_ARGS(EAB) \ (EAB)[0], (EAB)[1], (EAB)[2], (EAB)[3], (EAB)[4], (EAB)[5] +#define ETH_ADDR_STRLEN 17 /* Example: * diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index b966d92..af10352 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2220,9 +2220,10 @@ iface_refresh_netdev_status(struct iface *iface) error = netdev_get_etheraddr(iface->netdev, &mac); if (!error) { - char mac_string[32]; + char mac_string[ETH_ADDR_STRLEN + 1]; - sprintf(mac_string, ETH_ADDR_FMT, ETH_ADDR_ARGS(mac)); + snprintf(mac_string, sizeof mac_string, + ETH_ADDR_FMT, ETH_ADDR_ARGS(mac)); ovsrec_interface_set_mac_in_use(iface->cfg, mac_string); } else { ovsrec_interface_set_mac_in_use(iface->cfg, NULL);