proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 01:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: avoid default vrf name memory allocation at startup

Browse Source 
If default VRF is used, with standard naming convention,
memory allocation can be avoided.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2018-07-04 17:30:14 +02:00
parent dd1147028a
commit eb6934d5c5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/vrf.c
View File

@ -473,10 +473,7 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
int ((*update)(struct vrf *))) int ((*update)(struct vrf *)))
{ {
struct vrf *default_vrf; struct vrf *default_vrf;
char *local_ptr = (char *)VRF_DEFAULT_NAME;
if (local_ptr)
vrf_default_name = XSTRDUP(MTYPE_VRF, local_ptr);
/* initialise NS, in case VRF backend if NETNS */ /* initialise NS, in case VRF backend if NETNS */
ns_init(); ns_init();
if (debug_vrf) if (debug_vrf)
@ -490,7 +487,7 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
vrf_master.vrf_update_name_hook = update; vrf_master.vrf_update_name_hook = update;
/* The default VRF always exists. */ /* The default VRF always exists. */
default_vrf = vrf_get(VRF_DEFAULT, vrf_default_name); default_vrf = vrf_get(VRF_DEFAULT, VRF_DEFAULT_NAME);
if (!default_vrf) { if (!default_vrf) {
flog_err(LIB_ERR_VRF_START, flog_err(LIB_ERR_VRF_START,
"vrf_init: failed to create the default VRF!"); "vrf_init: failed to create the default VRF!");
@ -498,7 +495,7 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
} }
if (vrf_is_backend_netns()) if (vrf_is_backend_netns())
strlcpy(default_vrf->data.l.netns_name, strlcpy(default_vrf->data.l.netns_name,
vrf_default_name, NS_NAMSIZ); VRF_DEFAULT_NAME, NS_NAMSIZ);
/* Enable the default VRF. */ /* Enable the default VRF. */
if (!vrf_enable(default_vrf)) { if (!vrf_enable(default_vrf)) {