Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / babeld / resend.c

diff --git a/babeld/resend.c b/babeld/resend.c
index 5a786fcd51ba66d8fcf6bd4a16f897052b243454..f08897fbd1cbe3b8083cf0cd559636e48b24b9d6 100644 (file)
--- a/babeld/resend.c
+++ b/babeld/resend.c
@@ -1,20 +1,4 @@
-/*  
- *  This file is free software: you may copy, redistribute and/or modify it  
- *  under the terms of the GNU General Public License as published by the  
- *  Free Software Foundation, either version 2 of the License, or (at your  
- *  option) any later version.  
- *  
- *  This file is distributed in the hope that it will be useful, but  
- *  WITHOUT ANY WARRANTY; without even the implied warranty of  
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
- *  General Public License for more details.  
- *  
- *  You should have received a copy of the GNU General Public License  
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.  
- *  
- * This file incorporates work covered by the following copyright and  
- * permission notice:  
- *  
+/*
 Copyright (c) 2007, 2008 by Juliusz Chroboczek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/time.h>
 #include <time.h>
 #include <string.h>
@@ -123,7 +111,7 @@ record_resend(int kind, const unsigned char *prefix, unsigned char plen,
         else if(delay)
             resend->delay = delay;
         resend->time = babel_now;
-        resend->max = kind == RESEND_REQUEST ? 128 : UPDATE_MAX;
+        resend->max = RESEND_MAX;
         if(id && memcmp(resend->id, id, 8) == 0 &&
            seqno_compare(resend->seqno, seqno) > 0) {
             return 0;
@@ -140,7 +128,7 @@ record_resend(int kind, const unsigned char *prefix, unsigned char plen,
         if(resend == NULL)
             return -1;
         resend->kind = kind;
-        resend->max = kind == RESEND_REQUEST ? 128 : UPDATE_MAX;
+        resend->max = RESEND_MAX;
         resend->delay = delay;
         memcpy(resend->prefix, prefix, 16);
         resend->plen = plen;
@@ -250,7 +238,7 @@ satisfy_request(const unsigned char *prefix, unsigned char plen,
 }
 
 void
-expire_resend()
+expire_resend(void)
 {
     struct resend *current, *previous;
     int recompute = 0;
@@ -279,7 +267,7 @@ expire_resend()
 }
 
 void
-recompute_resend_time()
+recompute_resend_time(void)
 {
     struct resend *request;
     struct timeval resend = {0, 0};
@@ -298,7 +286,7 @@ recompute_resend_time()
 }
 
 void
-do_resend()
+do_resend(void)
 {
     struct resend *resend;