From: Tom Henderson <tomh@tomh.org>
Date: Fri, 28 Aug 2009 14:10:00 +0000 (+0100)
Subject: ospf6d: bug #529, fix endianness problem in earlier commit
X-Git-Tag: frr-2.0-rc1~2204
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=aabbb1ae358a3fd9af011cddc1a67dfa0b3df2d2;p=mirror%2Ffrr.git

ospf6d: bug #529, fix endianness problem in earlier commit

* ospf6_lsa.c: (ospf6_lsa_age_current) arithmetical compares make no sense
  in non-host order..
---

diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index 34040b84b4..07d9f91eb6 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -207,9 +207,11 @@ ospf6_lsa_age_current (struct ospf6_lsa *lsa)
     zlog_warn ("LSA: quagga_gettime failed, may fail LSA AGEs: %s",
                safe_strerror (errno));
 
-  if (lsa->header->age >= htons (MAXAGE))
+  if (ntohs (lsa->header->age) >= MAXAGE)
     {
-      /* LSA may have been prematurely aged */
+      /* ospf6_lsa_premature_aging () sets age to MAXAGE; when using
+         relative time, we cannot compare against lsa birth time, so
+         we catch this special case here. */
       lsa->header->age = htons (MAXAGE);
       return MAXAGE;
     }
@@ -245,11 +247,6 @@ ospf6_lsa_premature_aging (struct ospf6_lsa *lsa)
   THREAD_OFF (lsa->expire);
   THREAD_OFF (lsa->refresh);
 
-  /* 
-   * The below technique to age out LSA does not work when using relative time 
-   *
-  memset (&lsa->birth, 0, sizeof (struct timeval));
-   */
   lsa->header->age = htons (MAXAGE);
   thread_execute (master, ospf6_lsa_expire, lsa, 0);
 }