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

Merge pull request #12251 from donaldsharp/various_and_sundry

Browse Source 
Various and sundry
This commit is contained in:
Donatas Abraitis 2022-11-04 14:03:50 +02:00 committed by GitHub
commit 94fdbad234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bgpd/rfapi/rfapi.c
View File

@ -3174,13 +3174,17 @@ DEFUN (debug_rfapi_unregister_vn_un,
"debug rfapi-dev unregister vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> [kill]", "debug rfapi-dev unregister vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> [kill]",
DEBUG_STR DEBUG_STR
DEBUG_RFAPI_STR DEBUG_RFAPI_STR
"rfapi_register\n" "rfapi_unregister\n"
"indicate vn addr follows\n" "indicate vn addr follows\n"
"virtual network interface address\n" "virtual network interface address\n"
"virtual network interface address\n"
"indicate xt addr follows\n" "indicate xt addr follows\n"
"underlay network interface address\n" "underlay network interface address\n"
"underlay network interface address\n"
"prefix to remove\n" "prefix to remove\n"
"Remove without holddown") "prefix to remove\n"
"prefix to remove\n"
"Remove without holddown\n")
{ {
struct rfapi_ip_addr vn; struct rfapi_ip_addr vn;
struct rfapi_ip_addr un; struct rfapi_ip_addr un;
@ -3195,7 +3199,6 @@ DEFUN (debug_rfapi_unregister_vn_un,
if ((rc = rfapiCliGetRfapiIpAddr(vty, argv[4]->arg, &vn))) if ((rc = rfapiCliGetRfapiIpAddr(vty, argv[4]->arg, &vn)))
return rc; return rc;
/* /*
* Get UN addr * Get UN addr
*/ */

2
lib/agentx.c
View File

@ -48,8 +48,6 @@ static void agentx_events_update(void);
static void agentx_timeout(struct thread *t) static void agentx_timeout(struct thread *t)
{ {
timeout_thr = NULL;
snmp_timeout(); snmp_timeout();
run_alarms(); run_alarms();
netsnmp_check_outstanding_agent_requests(); netsnmp_check_outstanding_agent_requests();

4
vtysh/vtysh_config.c
View File

@ -492,8 +492,8 @@ void vtysh_config_parse_line(void *arg, const char *line)
strlen("no ip prefix-list")) == 0 || strlen("no ip prefix-list")) == 0 ||
strncmp(line, "no ipv6 prefix-list", strncmp(line, "no ipv6 prefix-list",
strlen("no ipv6 prefix-list")) == 0 || strlen("no ipv6 prefix-list")) == 0 ||
strncmp(line, "service cputime-stats", strncmp(line, "service ", strlen("service ")) ==
strlen("service cputime-stats")) == 0 || 0 ||
strncmp(line, "no service cputime-stats", strncmp(line, "no service cputime-stats",
strlen("no service cputime-stats")) == 0 || strlen("no service cputime-stats")) == 0 ||
strncmp(line, "service cputime-warning", strncmp(line, "service cputime-warning",