commit 342a31bfda21616209366679ac522471e5772a2f
author Lu Feng <lu.feng@6wind.com> Wed Jun 25 07:43:15 2014 +0000
committer David Lamparter <equinox@opensourcerouting.org> Wed Jul 02 19:30:20 2014 +0200
tree 359be93388f4efe5283b291f322c78c9e2389f0f
parent 052573ee2319b21657a79e1b76a5c801701fa38c

ripd: use only one constant for derivation

RIP_MAX_RTE is defined in ripd.h as 25 but is in fact the
result of a formula. More over it is not used in the code:
the code itself includes the fomula. This makes it un-clear
for maintenance.

Signed-off-by: Feng Lu <lu.feng@6wind.com>
Reviewed-by: Alain Ritoux <alain.ritoux@6wind.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

ripd/ripd.c

diff --git a/ripd/ripd.c b/ripd/ripd.c
index dfeb951..8a7fef8 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2169,7 +2169,7 @@
 
   /* Reset stream and RTE counter. */
   stream_reset (s);
-  rtemax = (RIP_PACKET_MAXSIZ - 4) / 20;
+  rtemax = RIP_MAX_RTE;
 
   /* Get RIP interface. */
   ri = ifc->ifp->info;

ripd/ripd.h

diff --git a/ripd/ripd.h b/ripd/ripd.h
index 45b07b9..0fc2fd3 100644
--- a/ripd/ripd.h
+++ b/ripd/ripd.h
@@ -49,7 +49,7 @@
 #define RIP_RTE_SIZE                    20
 
 /* Max count of routing table entry in one rip packet. */
-#define RIP_MAX_RTE                     25
+#define RIP_MAX_RTE   ((RIP_PACKET_MAXSIZ - RIP_HEADER_SIZE) / RIP_RTE_SIZE)
 
 /* RIP version 2 multicast address. */
 #ifndef INADDR_RIP_GROUP