View | Details | Raw Unified | Return to bug 137510
Collapse All | Expand All

(-)ospf6d/ospf6_lsa.c (-7 / +4 lines)
Lines 207-215 Link Here
207
    zlog_warn ("LSA: quagga_gettime failed, may fail LSA AGEs: %s",
207
    zlog_warn ("LSA: quagga_gettime failed, may fail LSA AGEs: %s",
208
               safe_strerror (errno));
208
               safe_strerror (errno));
209
209
210
  if (lsa->header->age >= htons (MAXAGE))
210
  if (ntohs (lsa->header->age) >= MAXAGE)
211
    {
211
    {
212
      /* LSA may have been prematurely aged */
212
      /* ospf6_lsa_premature_aging () sets age to MAXAGE; when using
213
         relative time, we cannot compare against lsa birth time, so
214
         we catch this special case here. */
213
      lsa->header->age = htons (MAXAGE);
215
      lsa->header->age = htons (MAXAGE);
214
      return MAXAGE;
216
      return MAXAGE;
215
    }
217
    }
Lines 245-255 Link Here
245
  THREAD_OFF (lsa->expire);
247
  THREAD_OFF (lsa->expire);
246
  THREAD_OFF (lsa->refresh);
248
  THREAD_OFF (lsa->refresh);
247
249
248
  /* 
249
   * The below technique to age out LSA does not work when using relative time 
250
   *
251
  memset (&lsa->birth, 0, sizeof (struct timeval));
252
   */
253
  lsa->header->age = htons (MAXAGE);
250
  lsa->header->age = htons (MAXAGE);
254
  thread_execute (master, ospf6_lsa_expire, lsa, 0);
251
  thread_execute (master, ospf6_lsa_expire, lsa, 0);
255
}
252
}

Return to bug 137510