ipng/lcpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn lip_namespace into a vector

Browse Source
This commit is contained in:
Pim van Pelt
2021-08-30 20:31:53 +00:00
parent aa9158e1a2
commit 98a84d0fa7
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lcpng.c
View File

@ -26,8 +26,8 @@ lcp_main_t lcp_main;
u8 *lcp_get_default_ns(void) {
lcp_main_t *lcpm = &lcp_main;
if (lcpm->default_namespace[0] == 0)
return 0;
if (!lcpm->default_namespace || lcpm->default_namespace[0] == 0)
return NULL;
return lcpm->default_namespace;
}
@ -53,20 +53,20 @@ int lcp_set_default_ns(u8 *ns) {
if (!p || *p == 0)
{
clib_memset(lcpm->default_namespace, 0, sizeof(lcpm->default_namespace));
if (lcpm->default_ns_fd > 0)
close(lcpm->default_ns_fd);
lcpm->default_ns_fd = 0;
return 0;
lcpm->default_namespace = NULL;
if (lcpm->default_ns_fd > 0)
close (lcpm->default_ns_fd);
lcpm->default_ns_fd = 0;
return 0;
}
clib_strncpy((char *)lcpm->default_namespace, p, LCP_NS_LEN - 1);
vec_validate_init_c_string (lcpm->default_namespace, p,
clib_strnlen (p, LCP_NS_LEN));
s = format (0, "/var/run/netns/%s%c", (char *) lcpm->default_namespace, 0);
lcpm->default_ns_fd = open ((char *) s, O_RDONLY);
vec_free (s);
s = format(0, "/var/run/netns/%s%c", (char *)lcpm->default_namespace, 0);
lcpm->default_ns_fd = open((char *)s, O_RDONLY);
vec_free(s);
return 0;
return 0;
}
void