diff options
| author | Lu Feng <lu.feng@6wind.com> | 2014-06-25 07:43:15 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-05-26 01:06:37 +0000 |
| commit | 6a7cff75c64651d940b5bfc4bcf83e64fbb8345f (patch) | |
| tree | 71936b3c874096836bf3745b28d38589aeedb081 | |
| parent | 374f12f955bd9710310888ce51a1fb640d326762 (diff) | |
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>
(cherry picked from commit 342a31bfda21616209366679ac522471e5772a2f)
| -rw-r--r-- | ripd/ripd.c | 2 | ||||
| -rw-r--r-- | ripd/ripd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ripd/ripd.c b/ripd/ripd.c index eed1956f88..0f88a6cb08 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -2167,7 +2167,7 @@ rip_output_process (struct connected *ifc, struct sockaddr_in *to, /* 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; diff --git a/ripd/ripd.h b/ripd/ripd.h index fe1345c6f5..390f832dbb 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 |