diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-11-04 14:03:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 14:03:50 +0200 |
| commit | 94fdbad234a5eb6acf290c2dfaedcc0f46b20723 (patch) | |
| tree | ab56434d6151a3925f2812574d636b87171d75cf | |
| parent | efda3db030c6dbbf16ee09c027b5ade435f989d0 (diff) | |
| parent | f531fae8290c71ab7922f352940c912c94e7f9ca (diff) | |
Merge pull request #12251 from donaldsharp/various_and_sundry
Various and sundry
| -rw-r--r-- | bgpd/rfapi/rfapi.c | 9 | ||||
| -rw-r--r-- | lib/agentx.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh_config.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index ed0714ce2d..a5d57748b7 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -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_STR DEBUG_RFAPI_STR - "rfapi_register\n" + "rfapi_unregister\n" "indicate vn addr follows\n" "virtual network interface address\n" + "virtual network interface address\n" "indicate xt addr follows\n" "underlay network interface address\n" + "underlay network interface address\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 un; @@ -3195,7 +3199,6 @@ DEFUN (debug_rfapi_unregister_vn_un, if ((rc = rfapiCliGetRfapiIpAddr(vty, argv[4]->arg, &vn))) return rc; - /* * Get UN addr */ diff --git a/lib/agentx.c b/lib/agentx.c index 4c087219cb..6c2923fcf8 100644 --- a/lib/agentx.c +++ b/lib/agentx.c @@ -48,8 +48,6 @@ static void agentx_events_update(void); static void agentx_timeout(struct thread *t) { - timeout_thr = NULL; - snmp_timeout(); run_alarms(); netsnmp_check_outstanding_agent_requests(); diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c index 0f28b49f72..1ebc84b356 100644 --- a/vtysh/vtysh_config.c +++ b/vtysh/vtysh_config.c @@ -492,8 +492,8 @@ void vtysh_config_parse_line(void *arg, const char *line) strlen("no ip prefix-list")) == 0 || strncmp(line, "no ipv6 prefix-list", strlen("no ipv6 prefix-list")) == 0 || - strncmp(line, "service cputime-stats", - strlen("service cputime-stats")) == 0 || + strncmp(line, "service ", strlen("service ")) == + 0 || strncmp(line, "no service cputime-stats", strlen("no service cputime-stats")) == 0 || strncmp(line, "service cputime-warning", |