proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-03 04:28:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5350 from sworleys/Fix-NS-Defualt-Info

Browse Source 
zebra: Fix default ns->info should point to default zebra_ns
This commit is contained in:
Philippe Guibert 2019-12-26 17:46:08 +01:00 committed by GitHub
commit d7cce42cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_errors.c
View File

@ -316,6 +316,12 @@ static struct log_ref ferr_zebra_err[] = {
.description = "Zebra attempted to look up a interface for a particular vrf_id and interface index, but didn't find anything.",
.suggestion = "If you entered a command to trigger this error, make sure you entered the arguments correctly. Check your config file for any potential errors. If these look correct, seek help.",
},
{
.code = EC_ZEBRA_NS_NO_DEFAULT,
.title = "Zebra NameSpace failed to find Default",
.description = "Zebra NameSpace subsystem failed to find a Default namespace during initialization.",
.suggestion = "Open an Issue with all relevant log files and restart FRR",
},
/* Warnings */
{
.code = EC_ZEBRAING_LM_PROTO_MISMATCH,

1
zebra/zebra_errors.h
View File

@ -76,6 +76,7 @@ enum zebra_log_refs {
EC_ZEBRA_NHG_SYNC,
EC_ZEBRA_NHG_FIB_UPDATE,
EC_ZEBRA_IF_LOOKUP_FAILED,
EC_ZEBRA_NS_NO_DEFAULT,
/* warnings */
EC_ZEBRA_NS_NOTIFY_READ,
EC_ZEBRAING_LM_PROTO_MISMATCH,

19
zebra/zebra_ns.c
View File

@ -37,6 +37,7 @@
#include "zebra_pbr.h"
#include "rib.h"
#include "table_manager.h"
#include "zebra_errors.h"
extern struct zebra_privs_t zserv_privs;
@ -64,6 +65,9 @@ static int zebra_ns_new(struct ns *ns)
{
struct zebra_ns *zns;
if (!ns)
return -1;
if (IS_ZEBRA_DEBUG_EVENT)
zlog_info("ZNS %s with id %u (created)", ns->name, ns->ns_id);
@ -86,7 +90,7 @@ static int zebra_ns_delete(struct ns *ns)
zlog_info("ZNS %s with id %u (deleted)", ns->name, ns->ns_id);
if (!zns)
return 0;
XFREE(MTYPE_ZEBRA_NS, zns);
XFREE(MTYPE_ZEBRA_NS, ns->info);
return 0;
}
@ -175,19 +179,26 @@ int zebra_ns_final_shutdown(struct ns *ns)
int zebra_ns_init(const char *optional_default_name)
{
struct ns *default_ns;
ns_id_t ns_id;
ns_id_t ns_id_external;
dzns = zebra_ns_alloc();
frr_with_privs(&zserv_privs) {
ns_id = zebra_ns_id_get_default();
}
ns_id_external = ns_map_nsid_with_external(ns_id, true);
ns_init_management(ns_id_external, ns_id);
default_ns = ns_lookup(ns_get_default_id());
if (!default_ns) {
flog_err(EC_ZEBRA_NS_NO_DEFAULT,
"%s: failed to find default ns", __func__);
exit(EXIT_FAILURE); /* This is non-recoverable */
}
/* Do any needed per-NS data structure allocation. */
dzns->if_table = route_table_init();
zebra_ns_new(default_ns);
dzns = default_ns->info;
/* Register zebra VRF callbacks, create and activate default VRF. */
zebra_vrf_init();