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

Merge pull request #6820 from donaldsharp/random_stuff

Browse Source 
Some ad-hoc work that is independent of actual bug fixes/feature work I am doing
This commit is contained in:
Mark Stapp 2020-08-11 16:07:58 -04:00 committed by GitHub
commit 240e9a57fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/user/sharp.rst
View File

@ -78,7 +78,8 @@ keyword. At present, no sharp commands will be preserved in the config.
The nexthop or import choice chooses the type of nexthop we are asking
zebra to watch for us. This choice affects zebra's decision on what
matches. Connected tells zebra whether or not that we want the route
matched against to be a static or connected route. The no form of
matched against to be a static or connected route for the nexthop keyword,
for the import keyword connected means exact match. The no form of
the command obviously turns this watching off.
.. index:: sharp data nexthop

4
sharpd/sharp_vty.c
View File

@ -131,8 +131,8 @@ DEFPY(sharp_nht_data_dump,
sharp_nht_data_dump_cmd,
"sharp data nexthop",
"Sharp routing Protocol\n"
"Nexthop information\n"
"Data Dump\n")
"Data about what is going on\n"
"Nexthop information\n")
{
sharp_nh_tracker_dump(vty);

3
zebra/zapi_msg.c
View File

@ -1078,7 +1078,8 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
s = msg;
client->nh_reg_time = monotime(NULL);
if (!client->nh_reg_time)
client->nh_reg_time = monotime(NULL);
while (l < hdr->length) {
STREAM_GETC(s, flags);