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

Merge pull request #1987 from donaldsharp/zserv_read_fix

Browse Source 
two zebra changes
This commit is contained in:
Russ White 2018-03-30 09:37:51 -04:00 committed by GitHub
commit fdbbf02a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zebra/rt_netlink.c
View File

@ -927,9 +927,9 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen,
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
" 5549: _netlink_route_build_singlepath() (%s): "
"nexthop via %s %s if %u",
"nexthop via %s %s if %u(%u)",
routedesc, ipv4_ll_buf, label_buf,
nexthop->ifindex);
nexthop->ifindex, nexthop->vrf_id);
return;
}
@ -953,9 +953,9 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen,
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"netlink_route_multipath() (%s): "
"nexthop via %s %s if %u",
"nexthop via %s %s if %u(%u)",
routedesc, inet_ntoa(nexthop->gate.ipv4),
label_buf, nexthop->ifindex);
label_buf, nexthop->ifindex, nexthop->vrf_id);
}
if (nexthop->type == NEXTHOP_TYPE_IPV6
@ -976,9 +976,9 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen,
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"netlink_route_multipath() (%s): "
"nexthop via %s %s if %u",
"nexthop via %s %s if %u(%u)",
routedesc, inet6_ntoa(nexthop->gate.ipv6),
label_buf, nexthop->ifindex);
label_buf, nexthop->ifindex, nexthop->vrf_id);
}
/*
@ -1003,8 +1003,8 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen,
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"netlink_route_multipath() (%s): "
"nexthop via if %u",
routedesc, nexthop->ifindex);
"nexthop via if %u(%u)",
routedesc, nexthop->ifindex, nexthop->vrf_id);
}
if (nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) {
@ -1020,8 +1020,8 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen,
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"netlink_route_multipath() (%s): "
"nexthop via if %u",
routedesc, nexthop->ifindex);
"nexthop via if %u(%u)",
routedesc, nexthop->ifindex, nexthop->vrf_id);
}
}
@ -1260,14 +1260,15 @@ _netlink_mpls_build_multipath(const char *routedesc, zebra_nhlfe_t *nhlfe,
*/
static void _netlink_route_debug(int cmd, struct prefix *p,
struct nexthop *nexthop, const char *routedesc,
int family, struct zebra_vrf *zvrf)
int family, struct zebra_vrf *zvrf,
uint32_t tableid)
{
if (IS_ZEBRA_DEBUG_KERNEL) {
char buf[PREFIX_STRLEN];
zlog_debug(
"netlink_route_multipath() (%s): %s %s vrf %u type %s",
"netlink_route_multipath() (%s): %s %s vrf %u(%u) type %s",
routedesc, nl_msg_type_to_str(cmd),
prefix2str(p, buf, sizeof(buf)), zvrf_id(zvrf),
prefix2str(p, buf, sizeof(buf)), zvrf_id(zvrf), tableid,
(nexthop) ? nexthop_type_to_str(nexthop->type) : "UNK");
}
}
@ -1486,7 +1487,7 @@ static int netlink_route_multipath(int cmd, struct prefix *p,
: "single-path";
_netlink_route_debug(cmd, p, nexthop, routedesc,
family, zvrf);
family, zvrf, re->table);
_netlink_route_build_singlepath(
routedesc, bytelen, nexthop, &req.n,
&req.r, sizeof req, cmd);
@ -1570,7 +1571,7 @@ static int netlink_route_multipath(int cmd, struct prefix *p,
nexthop_num++;
_netlink_route_debug(cmd, p, nexthop, routedesc,
family, zvrf);
family, zvrf, re->table);
_netlink_route_build_multipath(
routedesc, bytelen, nexthop, rta, rtnh,
&req.r, &src1);

2
zebra/zserv.c
View File

@ -3074,6 +3074,7 @@ static int zserv_process_messages(struct thread *thread)
if (!hdrvalid)
continue;
hdr.length -= ZEBRA_HEADER_SIZE;
/* lookup vrf */
zvrf = zebra_vrf_lookup_by_id(hdr.vrf_id);
if (!zvrf && IS_ZEBRA_DEBUG_PACKET && IS_ZEBRA_DEBUG_RECV) {
@ -3194,7 +3195,6 @@ static int zserv_read(struct thread *thread)
#if defined(HANDLE_ZAPI_FUZZING)
zserv_write_incoming(client->ibuf_work, command);
#endif
hdr.length -= ZEBRA_HEADER_SIZE;
/* Debug packet information. */
if (IS_ZEBRA_DEBUG_EVENT)