[ovs-dev] [PATCH 02/14] packets: New macro ETH_ADDR_STRLEN.

Ben Pfaff blp at ovn.org
Wed Dec 9 01:08:05 UTC 2015


An upcoming commit will introduce another user.

Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 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);
-- 
2.1.3




More information about the dev mailing list