zebra: fix FPM node reusing VTY_NODE

[mirror_frr.git] / lib / spf_backoff.c

diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c
index 92b7620edac5cd3ab3f76bb7f8dc379b93722557..4e747144892adcb666f1eea80fdf269118cf6775 100644 (file)
--- a/lib/spf_backoff.c
+++ b/lib/spf_backoff.c
@@ -7,7 +7,7 @@
  * Copyright (C) 2017 Orange Labs http://www.orange.com/
  * Copyright (C) 2017 by Christian Franke, Open Source Routing / NetDEF Inc.
  *
- * This file is part of FreeRangeRouting (FRR)
+ * This file is part of FRRouting (FRR)
  *
  * FRR is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -143,7 +143,7 @@ static int spf_backoff_holddown_elapsed(struct thread *thread)
 
 long spf_backoff_schedule(struct spf_backoff *backoff)
 {
-       long rv;
+       long rv = 0;
        struct timeval now;
 
        gettimeofday(&now, NULL);
@@ -176,9 +176,6 @@ long spf_backoff_schedule(struct spf_backoff *backoff)
                else
                        rv = backoff->long_delay;
                break;
-       default:
-               zlog_warn("SPF Back-off(%s) in unknown state", backoff->name);
-               rv = backoff->init_delay;
        }
 
        backoff_debug(
@@ -205,7 +202,7 @@ static const char *timeval_format(struct timeval *tv)
 
        size_t offset = strlen(timebuf);
        snprintf(timebuf + offset, sizeof(timebuf) - offset, ".%ld",
-                tv->tv_usec);
+                (long int)tv->tv_usec);
 
        return timebuf;
 }
@@ -227,7 +224,8 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty,
                struct timeval remain =
                        thread_timer_remain(backoff->t_holddown);
                vty_out(vty, "%s                   Still runs for %lld msec\n",
-                       prefix, (long long)remain.tv_sec * 1000
+                       prefix,
+                       (long long)remain.tv_sec * 1000
                                + remain.tv_usec / 1000);
        } else {
                vty_out(vty, "%s                   Inactive\n", prefix);
@@ -239,7 +237,8 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty,
                struct timeval remain =
                        thread_timer_remain(backoff->t_timetolearn);
                vty_out(vty, "%s                   Still runs for %lld msec\n",
-                       prefix, (long long)remain.tv_sec * 1000
+                       prefix,
+                       (long long)remain.tv_sec * 1000
                                + remain.tv_usec / 1000);
        } else {
                vty_out(vty, "%s                   Inactive\n", prefix);