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

Merge pull request #4875 from vishaldhingra/blackhole_type

Browse Source 
Zebra: Rectifying the log messages.
This commit is contained in:
Donatas Abraitis 2019-09-19 20:41:00 +03:00 committed by GitHub
commit e09295c426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/connected.c
View File

@ -385,7 +385,7 @@ void connected_down(struct interface *ifp, struct connected *ifc)
return; return;
break; break;
default: default:
zlog_info("Unknown AFI: %s", afi2str(afi)); zlog_warn("Unknown AFI: %s", afi2str(afi));
break; break;
} }

3
zebra/if_netlink.c
View File

@ -1032,7 +1032,8 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
/* addr is primary key, SOL if we don't have one */ /* addr is primary key, SOL if we don't have one */
if (addr == NULL) { if (addr == NULL) {
zlog_debug("%s: NULL address", __func__); zlog_debug("%s: Local Interface Address is NULL for %s",
__func__, ifp->name);
return -1; return -1;
} }

9
zebra/interface.c
View File

@ -2034,13 +2034,13 @@ DEFUN (link_params_enable,
/* This command could be issue at startup, when activate MPLS TE */ /* This command could be issue at startup, when activate MPLS TE */
/* on a new interface or after a ON / OFF / ON toggle */ /* on a new interface or after a ON / OFF / ON toggle */
/* In all case, TE parameters are reset to their default factory */ /* In all case, TE parameters are reset to their default factory */
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT || IS_ZEBRA_DEBUG_MPLS)
zlog_debug( zlog_debug(
"Link-params: enable TE link parameters on interface %s", "Link-params: enable TE link parameters on interface %s",
ifp->name); ifp->name);
if (!if_link_params_get(ifp)) { if (!if_link_params_get(ifp)) {
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT || IS_ZEBRA_DEBUG_MPLS)
zlog_debug( zlog_debug(
"Link-params: failed to init TE link parameters %s", "Link-params: failed to init TE link parameters %s",
ifp->name); ifp->name);
@ -2063,8 +2063,9 @@ DEFUN (no_link_params_enable,
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
zlog_debug("MPLS-TE: disable TE link parameters on interface %s", if (IS_ZEBRA_DEBUG_EVENT || IS_ZEBRA_DEBUG_MPLS)
ifp->name); zlog_debug("MPLS-TE: disable TE link parameters on interface %s",
ifp->name);
if_link_params_free(ifp); if_link_params_free(ifp);

4
zebra/redistribute.c
View File

@ -119,7 +119,7 @@ static void zebra_redistribute(struct zserv *client, int type,
srcdest_rnode_prefixes(rn, &dst_p, &src_p); srcdest_rnode_prefixes(rn, &dst_p, &src_p);
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_RIB)
zlog_debug( zlog_debug(
"%s: client %s %s(%u) checking: selected=%d, type=%d, distance=%d, metric=%d zebra_check_addr=%d", "%s: client %s %s(%u) checking: selected=%d, type=%d, distance=%d, metric=%d zebra_check_addr=%d",
__func__, __func__,
@ -201,7 +201,7 @@ void redistribute_update(const struct prefix *p, const struct prefix *src_p,
send_redistribute = 1; send_redistribute = 1;
if (send_redistribute) { if (send_redistribute) {
if (IS_ZEBRA_DEBUG_EVENT) { if (IS_ZEBRA_DEBUG_RIB) {
zlog_debug( zlog_debug(
"%s: client %s %s(%u), type=%d, distance=%d, metric=%d", "%s: client %s %s(%u), type=%d, distance=%d, metric=%d",
__func__, __func__,

5
zebra/zebra_fpm.c
View File

@ -711,7 +711,6 @@ static void zfpm_connection_down(const char *detail)
* Start thread to clean up state after the connection goes down. * Start thread to clean up state after the connection goes down.
*/ */
assert(!zfpm_g->t_conn_down); assert(!zfpm_g->t_conn_down);
zfpm_debug("Starting conn_down thread");
zfpm_rnodes_iter_init(&zfpm_g->t_conn_down_state.iter); zfpm_rnodes_iter_init(&zfpm_g->t_conn_down_state.iter);
zfpm_g->t_conn_down = NULL; zfpm_g->t_conn_down = NULL;
thread_add_timer_msec(zfpm_g->master, zfpm_conn_down_thread_cb, NULL, 0, thread_add_timer_msec(zfpm_g->master, zfpm_conn_down_thread_cb, NULL, 0,
@ -806,8 +805,6 @@ static int zfpm_read_cb(struct thread *thread)
goto done; goto done;
} }
zfpm_debug("Read out a full fpm message");
/* /*
* Just throw it away for now. * Just throw it away for now.
*/ */
@ -1249,7 +1246,7 @@ static int zfpm_connect_cb(struct thread *t)
sock = socket(AF_INET, SOCK_STREAM, 0); sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) { if (sock < 0) {
zfpm_debug("Failed to create socket for connect(): %s", zlog_err("Failed to create socket for connect(): %s",
strerror(errno)); strerror(errno));
zfpm_g->stats.connect_no_sock++; zfpm_g->stats.connect_no_sock++;
return 0; return 0;

5
zebra/zebra_rnh.c
View File

@ -337,7 +337,7 @@ static void addr2hostprefix(int af, const union g_addr *addr,
break; break;
default: default:
memset(prefix, 0, sizeof(*prefix)); memset(prefix, 0, sizeof(*prefix));
zlog_debug("%s: unknown address family %d", __func__, af); zlog_warn("%s: unknown address family %d", __func__, af);
break; break;
} }
} }
@ -916,7 +916,8 @@ void zebra_print_rnh_table(vrf_id_t vrfid, afi_t afi, struct vty *vty,
table = get_rnh_table(vrfid, afi, type); table = get_rnh_table(vrfid, afi, type);
if (!table) { if (!table) {
zlog_debug("print_rnhs: rnh table not found"); if (IS_ZEBRA_DEBUG_NHT)
zlog_debug("print_rnhs: rnh table not found");
return; return;
} }

2
zebra/zebra_vrf.c
View File

@ -92,7 +92,7 @@ static int zebra_vrf_new(struct vrf *vrf)
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_info("VRF %s created, id %u", vrf->name, vrf->vrf_id); zlog_debug("VRF %s created, id %u", vrf->name, vrf->vrf_id);
zvrf = zebra_vrf_alloc(); zvrf = zebra_vrf_alloc();
vrf->info = zvrf; vrf->info = zvrf;