Acked-by: Donald Sharp <[email protected]> On Tue, Nov 10, 2015 at 12:32 PM, Christian Franke < [email protected]> wrote:
> Signed-off-by: Christian Franke <[email protected]> > --- > isisd/isis_lsp.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c > index 0d5ca26..ddeadc8 100644 > --- a/isisd/isis_lsp.c > +++ b/isisd/isis_lsp.c > @@ -1087,6 +1087,8 @@ lsp_rem_lifetime (struct isis_area *area, int level) > MAX_AGE_JITTER); > > /* No jitter if the max refresh will be less than configure gen > interval */ > + /* N.B. this calucation is acceptable since rem_lifetime is in > [332,65535] at > + * this point */ > if (area->lsp_gen_interval[level - 1] > (rem_lifetime - 300)) > rem_lifetime = area->max_lsp_lifetime[level - 1]; > > @@ -1110,7 +1112,8 @@ lsp_refresh_time (struct isis_lsp *lsp, u_int16_t > rem_lifetime) > refresh_time > (rem_lifetime - 300)) > refresh_time = rem_lifetime - 300; > > - assert (area->lsp_gen_interval[level - 1] < refresh_time); > + /* In cornercases, refresh_time might be <= lsp_gen_interval, however > + * we accept this violation to satisfy refresh_time <= rem_lifetime - > 300 */ > > return refresh_time; > } > -- > 2.6.1 > > > _______________________________________________ > Quagga-dev mailing list > [email protected] > https://lists.quagga.net/mailman/listinfo/quagga-dev >
_______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
