From 3f245e687c6bd837dcf7c6734aeed788bdbb4220 Mon Sep 17 00:00:00 2001 From: Stanislav Zaikin Date: Mon, 18 Jul 2022 08:55:04 +0200 Subject: linux-cp: change namespace to netns namespace is a keyword for c++ compilers Type: fix Change-Id: Ia8fc9ef1cc15fe9d0e40b3f543f9e8f411203b89 Signed-off-by: Stanislav Zaikin --- src/plugins/linux-cp/lcp_api.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'src/plugins/linux-cp/lcp_api.c') diff --git a/src/plugins/linux-cp/lcp_api.c b/src/plugins/linux-cp/lcp_api.c index 150c302ea8e..f21cb708e2e 100644 --- a/src/plugins/linux-cp/lcp_api.c +++ b/src/plugins/linux-cp/lcp_api.c @@ -84,10 +84,9 @@ vl_api_lcp_itf_pair_add_del_t_handler (vl_api_lcp_itf_pair_add_del_t *mp) lip_host_type = api_decode_host_type (mp->host_if_type); if (mp->is_add) { - rv = - vl_api_lcp_itf_pair_add (phy_sw_if_index, lip_host_type, - mp->host_if_name, sizeof (mp->host_if_name), - mp->namespace, sizeof (mp->namespace), NULL); + rv = vl_api_lcp_itf_pair_add ( + phy_sw_if_index, lip_host_type, mp->host_if_name, + sizeof (mp->host_if_name), mp->netns, sizeof (mp->netns), NULL); } else { @@ -114,8 +113,8 @@ vl_api_lcp_itf_pair_add_del_v2_t_handler (vl_api_lcp_itf_pair_add_del_v2_t *mp) { rv = vl_api_lcp_itf_pair_add (phy_sw_if_index, lip_host_type, mp->host_if_name, - sizeof (mp->host_if_name), mp->namespace, - sizeof (mp->namespace), &host_sw_if_index); + sizeof (mp->host_if_name), mp->netns, + sizeof (mp->netns), &host_sw_if_index); } else { @@ -145,9 +144,9 @@ send_lcp_itf_pair_details (index_t lipi, vl_api_registration_t *rp, lcp_pair->lip_host_name, vec_len (lcp_pair->lip_host_name)); rmp->host_if_name[vec_len (lcp_pair->lip_host_name)] = 0; - memcpy_s (rmp->namespace, sizeof (rmp->namespace), - lcp_pair->lip_namespace, vec_len (lcp_pair->lip_namespace)); - rmp->namespace[vec_len (lcp_pair->lip_namespace)] = 0; + memcpy_s (rmp->netns, sizeof (rmp->netns), lcp_pair->lip_namespace, + vec_len (lcp_pair->lip_namespace)); + rmp->netns[vec_len (lcp_pair->lip_namespace)] = 0; })); } @@ -168,8 +167,8 @@ vl_api_lcp_default_ns_set_t_handler (vl_api_lcp_default_ns_set_t *mp) vl_api_lcp_default_ns_set_reply_t *rmp; int rv; - mp->namespace[LCP_NS_LEN - 1] = 0; - rv = lcp_set_default_ns (mp->namespace); + mp->netns[LCP_NS_LEN - 1] = 0; + rv = lcp_set_default_ns (mp->netns); REPLY_MACRO (VL_API_LCP_DEFAULT_NS_SET_REPLY); } @@ -185,16 +184,12 @@ vl_api_lcp_default_ns_get_t_handler (vl_api_lcp_default_ns_get_t *mp) if (!reg) return; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = (VL_API_LCP_DEFAULT_NS_GET_REPLY); - rmp->context = mp->context; - - ns = (char *) lcp_get_default_ns (); - if (ns) - clib_strncpy ((char *) rmp->namespace, ns, LCP_NS_LEN - 1); - - vl_api_send_msg (reg, (u8 *) rmp); + REPLY_MACRO_DETAILS2 (VL_API_LCP_DEFAULT_NS_GET_REPLY, ({ + ns = (char *) lcp_get_default_ns (); + if (ns) + clib_strncpy ((char *) rmp->netns, ns, + LCP_NS_LEN - 1); + })); } static void -- cgit 1.2.3-korg