From b7b929931a07fbb27b43d5cd105f366c3e29807e Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 17 Oct 2018 10:38:51 -0400 Subject: c11 safe string handling support Change-Id: Ied34720ca5a6e6e717eea4e86003e854031b6eab Signed-off-by: Dave Barach --- src/plugins/cdp/cdp_input.c | 2 +- src/plugins/cdp/cdp_periodic.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/cdp') diff --git a/src/plugins/cdp/cdp_input.c b/src/plugins/cdp/cdp_input.c index 66ae97142c5..dd3619cb8ac 100644 --- a/src/plugins/cdp/cdp_input.c +++ b/src/plugins/cdp/cdp_input.c @@ -328,7 +328,7 @@ cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0) if (p == 0) { pool_get (cm->neighbors, n); - memset (n, 0, sizeof (*n)); + clib_memset (n, 0, sizeof (*n)); n->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; n->packet_template_index = (u8) ~ 0; hash_set (cm->neighbor_by_sw_if_index, n->sw_if_index, diff --git a/src/plugins/cdp/cdp_periodic.c b/src/plugins/cdp/cdp_periodic.c index a4c4bb91765..da08523176f 100644 --- a/src/plugins/cdp/cdp_periodic.c +++ b/src/plugins/cdp/cdp_periodic.c @@ -408,11 +408,11 @@ cdp_periodic_init (vlib_main_t * vm) { ethernet_llc_snap_and_cdp_header_t h; - memset (&h, 0, sizeof (h)); + clib_memset (&h, 0, sizeof (h)); /* Send to 01:00:0c:cc:cc */ h.ethernet.dst_address[0] = 0x01; - /* h.ethernet.dst_address[1] = 0x00; (memset) */ + /* h.ethernet.dst_address[1] = 0x00; (clib_memset) */ h.ethernet.dst_address[2] = 0x0C; h.ethernet.dst_address[3] = 0xCC; h.ethernet.dst_address[4] = 0xCC; @@ -427,8 +427,8 @@ cdp_periodic_init (vlib_main_t * vm) h.llc.control = 0x03; /* UI (no extended control bytes) */ /* SNAP */ - /* h.snap.oui[0] = 0x00; (memset) */ - /* h.snap.oui[1] = 0x00; (memset) */ + /* h.snap.oui[0] = 0x00; (clib_memset) */ + /* h.snap.oui[1] = 0x00; (clib_memset) */ h.snap.oui[2] = 0x0C; /* Cisco = 0x00000C */ h.snap.protocol = htons (0x2000); /* CDP = 0x2000 */ @@ -450,10 +450,10 @@ cdp_periodic_init (vlib_main_t * vm) { hdlc_and_cdp_header_t h; - memset (&h, 0, sizeof (h)); + clib_memset (&h, 0, sizeof (h)); h.hdlc.address = 0x0f; - /* h.hdlc.control = 0; (memset) */ + /* h.hdlc.control = 0; (clib_memset) */ h.hdlc.protocol = htons (0x2000); /* CDP = 0x2000 */ /* CDP */ @@ -472,11 +472,11 @@ cdp_periodic_init (vlib_main_t * vm) { srp_and_cdp_header_t h; - memset (&h, 0, sizeof (h)); + clib_memset (&h, 0, sizeof (h)); /* Send to 01:00:0c:cc:cc */ h.ethernet.dst_address[0] = 0x01; - /* h.ethernet.dst_address[1] = 0x00; (memset) */ + /* h.ethernet.dst_address[1] = 0x00; (clib_memset) */ h.ethernet.dst_address[2] = 0x0C; h.ethernet.dst_address[3] = 0xCC; h.ethernet.dst_address[4] = 0xCC; -- cgit 1.2.3-korg