diff options
author | Dave Barach <dave@barachs.net> | 2018-10-17 10:38:51 -0400 |
---|---|---|
committer | Damjan Marion <dmarion@me.com> | 2018-10-23 13:06:46 +0000 |
commit | b7b929931a07fbb27b43d5cd105f366c3e29807e (patch) | |
tree | 438681c89738802dbb5d339715b96ea2c31bafb4 /src/vnet/srmpls | |
parent | b9a4c445c1d4e9cdab476a8e1fb8a46ff0fc6080 (diff) |
c11 safe string handling support
Change-Id: Ied34720ca5a6e6e717eea4e86003e854031b6eab
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vnet/srmpls')
-rw-r--r-- | src/vnet/srmpls/sr_mpls_api.c | 4 | ||||
-rwxr-xr-x | src/vnet/srmpls/sr_mpls_policy.c | 6 | ||||
-rwxr-xr-x | src/vnet/srmpls/sr_mpls_steering.c | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/vnet/srmpls/sr_mpls_api.c b/src/vnet/srmpls/sr_mpls_api.c index 2c36c0dd9f2..4cbc6a5cf63 100644 --- a/src/vnet/srmpls/sr_mpls_api.c +++ b/src/vnet/srmpls/sr_mpls_api.c @@ -112,7 +112,7 @@ static void vl_api_sr_mpls_steering_add_del_t_handler { vl_api_sr_mpls_steering_add_del_reply_t *rmp; ip46_address_t prefix; - memset (&prefix, 0, sizeof (ip46_address_t)); + clib_memset (&prefix, 0, sizeof (ip46_address_t)); if (mp->traffic_type == SR_STEER_IPV4) memcpy (&prefix.ip4, mp->prefix_addr, sizeof (prefix.ip4)); else @@ -146,7 +146,7 @@ static void vl_api_sr_mpls_policy_assign_endpoint_color_t_handler int rv = 0; ip46_address_t endpoint; - memset (&endpoint, 0, sizeof (ip46_address_t)); + clib_memset (&endpoint, 0, sizeof (ip46_address_t)); if (mp->endpoint_type == SR_STEER_IPV4) memcpy (&endpoint.ip4, mp->endpoint, sizeof (endpoint.ip4)); else diff --git a/src/vnet/srmpls/sr_mpls_policy.c b/src/vnet/srmpls/sr_mpls_policy.c index f94a8e945ec..4fb80e12225 100755 --- a/src/vnet/srmpls/sr_mpls_policy.c +++ b/src/vnet/srmpls/sr_mpls_policy.c @@ -64,7 +64,7 @@ create_sl (mpls_sr_policy_t * sr_policy, mpls_label_t * sl, u32 weight) u32 ii; pool_get (sm->sid_lists, segment_list); - memset (segment_list, 0, sizeof (*segment_list)); + clib_memset (segment_list, 0, sizeof (*segment_list)); vec_add1 (sr_policy->segments_lists, segment_list - sm->sid_lists); @@ -172,7 +172,7 @@ sr_mpls_policy_add (mpls_label_t bsid, mpls_label_t * segments, } /* Add an SR policy object */ pool_get (sm->sr_policies, sr_policy); - memset (sr_policy, 0, sizeof (*sr_policy)); + clib_memset (sr_policy, 0, sizeof (*sr_policy)); /* the first policy needs to lock the MPLS table so it doesn't * disappear with policies in it */ @@ -840,7 +840,7 @@ cli_sr_mpls_policy_ec_command_fn (vlib_main_t * vm, unformat_input_t * input, u8 endpoint_type = 0; char clear = 0, color_set = 0, bsid_set = 0; - memset (&endpoint, 0, sizeof (ip46_address_t)); + clib_memset (&endpoint, 0, sizeof (ip46_address_t)); int rv; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) diff --git a/src/vnet/srmpls/sr_mpls_steering.c b/src/vnet/srmpls/sr_mpls_steering.c index c5ddab73ce4..669644913a3 100755 --- a/src/vnet/srmpls/sr_mpls_steering.c +++ b/src/vnet/srmpls/sr_mpls_steering.c @@ -70,7 +70,7 @@ find_or_create_internal_label (ip46_address_t endpoint, u32 color) if (!color_table) { mhash_t color_t; - memset (&color_t, 0, sizeof (mhash_t)); + clib_memset (&color_t, 0, sizeof (mhash_t)); mhash_init (&color_t, sizeof (u32), sizeof (ip46_address_t)); mhash_set_mem (&sm->sr_policies_c2e2eclabel_hash, &color, (uword *) & color_t, NULL); @@ -391,7 +391,7 @@ sr_mpls_steering_policy_add (mpls_label_t bsid, u32 table_id, mpls_sr_policy_t *sr_policy = 0; uword *p = 0; - memset (&key, 0, sizeof (sr_mpls_steering_key_t)); + clib_memset (&key, 0, sizeof (sr_mpls_steering_key_t)); if (traffic_type != SR_STEER_IPV4 && traffic_type != SR_STEER_IPV6) return -1; @@ -438,7 +438,7 @@ sr_mpls_steering_policy_add (mpls_label_t bsid, u32 table_id, /* Create a new steering policy */ pool_get (sm->steer_policies, steer_pl); - memset (steer_pl, 0, sizeof (*steer_pl)); + clib_memset (steer_pl, 0, sizeof (*steer_pl)); clib_memcpy (&steer_pl->classify.prefix, prefix, sizeof (ip46_address_t)); clib_memcpy (&steer_pl->next_hop, next_hop, sizeof (ip46_address_t)); steer_pl->nh_type = nh_type; @@ -553,7 +553,7 @@ sr_mpls_steering_policy_del (ip46_address_t * prefix, u32 mask_width, fib_prefix_t pfx = { 0 }; uword *p = 0; - memset (&key, 0, sizeof (sr_mpls_steering_key_t)); + clib_memset (&key, 0, sizeof (sr_mpls_steering_key_t)); /* Compute the steer policy key */ if (traffic_type != SR_STEER_IPV4 && traffic_type != SR_STEER_IPV6) @@ -673,8 +673,8 @@ sr_mpls_steer_policy_command_fn (vlib_main_t * vm, unformat_input_t * input, u8 sr_policy_set = 0; - memset (&prefix, 0, sizeof (ip46_address_t)); - memset (&nh, 0, sizeof (ip46_address_t)); + clib_memset (&prefix, 0, sizeof (ip46_address_t)); + clib_memset (&nh, 0, sizeof (ip46_address_t)); int rv; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) |