LSA checksum works. But it's very uneficient on little endian systems.

diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c
index f74cb762cb4cb63b24d47874e1d073b881066ef3..d7ae1c6e5590c98235c750a98a3e8c6e004a8029 100644 (file)
--- a/proto/ospf/lsalib.c
+++ b/proto/ospf/lsalib.c
@@ -44,16 +44,18 @@ htonlsab(void *h, void *n, u8 type, u16 len)
     {
       struct ospf_lsa_rt *hrt, *nrt;
       struct ospf_lsa_rt_link *hrtl,*nrtl;
+      u16 links;
 
       nrt=n;
       hrt=h;
+      links=hrt->links;
 
       nrt->VEB=hrt->VEB;
       nrt->padding=0;
       nrt->links=htons(hrt->links);
       nrtl=(struct ospf_lsa_rt_link *)(nrt+1);
       hrtl=(struct ospf_lsa_rt_link *)(hrt+1);
-      for(i=0;i<hrt->links;i++)
+      for(i=0;i<links;i++)
       {
         (nrtl+i)->id=htonl((hrtl+i)->id);
         (nrtl+i)->data=htonl((hrtl+i)->data);
@@ -137,16 +139,17 @@ ntohlsab(void *n, void *h, u8 type, u16 len)
     {
       struct ospf_lsa_rt *hrt, *nrt;
       struct ospf_lsa_rt_link *hrtl,*nrtl;
+      u16 links;
 
       nrt=n;
       hrt=h;
 
       hrt->VEB=nrt->VEB;
       hrt->padding=0;
-      hrt->links=ntohs(nrt->links);
+      links=hrt->links=ntohs(nrt->links);
       nrtl=(struct ospf_lsa_rt_link *)(nrt+1);
       hrtl=(struct ospf_lsa_rt_link *)(hrt+1);
-      for(i=0;i<hrt->links;i++)
+      for(i=0;i<links;i++)
       {
         (hrtl+i)->id=ntohl((nrtl+i)->id);
         (hrtl+i)->data=ntohl((nrtl+i)->data);
@@ -220,3 +223,63 @@ ntohlsab(void *n, void *h, u8 type, u16 len)
   }
 };
 
+#define MODX 4102              /* larges signed value without overflow */
+
+/* Fletcher Checksum -- Refer to RFC1008. */
+#define MODX                 4102
+#define LSA_CHECKSUM_OFFSET    15
+
+/* FIXME This is VERY uneficient, I have huge endianity problems */
+
+void
+lsasum_calculate(struct ospf_lsa_header *h,void *body,struct proto_ospf *po)
+{
+  u8 *sp, *ep, *p, *q, *b;
+  int c0 = 0, c1 = 0;
+  int x, y;
+  u16 length;
+
+  h->checksum = 0;
+  b=body;
+  length = h->length-2;
+  sp = (char *) &h->options;
+
+  htonlsah(h,h);
+  htonlsab(b,b,h->type,length+2);
+
+  for (ep = sp + length; sp < ep; sp = q)
+    {
+      q = sp + MODX;
+      if (q > ep)
+        q = ep;
+      for (p = sp; p < q; p++)
+        {
+          if(p<(u8 *)(h+1))
+         {
+            c0 += *p;
+           /*DBG("XXXXXX: %u\t%u\n", p-sp, *p);*/
+         }
+         else
+          {
+            c0 += *(b+(p-sp)-sizeof(struct ospf_lsa_header)+2);
+           /*DBG("YYYYYY: %u\t%u\n", p-sp,*(b+(p-sp)-sizeof(struct ospf_lsa_header)+2));*/
+          }
+          c1 += c0;
+        }
+      c0 %= 255;
+      c1 %= 255;
+    }
+
+  x = ((length - LSA_CHECKSUM_OFFSET) * c0 - c1) % 255;
+  if (x <= 0)
+    x += 255;
+  y = 510 - c0 - x;
+  if (y > 255)
+    y -= 255;
+
+  h->checksum = x + (y << 8);
+  
+  ntohlsah(h,h);
+  ntohlsab(b,b,h->type,length+2);
+}
+

diff --git a/proto/ospf/lsalib.h b/proto/ospf/lsalib.h
index e759aa07865a1fa71dfec0eb463a747bdf080180..0eb6dceea0da7eb344fb79f67189a0cf310cc333 100644 (file)
--- a/proto/ospf/lsalib.h
+++ b/proto/ospf/lsalib.h
@@ -14,5 +14,6 @@ void htonlsah(struct ospf_lsa_header *h, struct ospf_lsa_header *n);
 void ntohlsah(struct ospf_lsa_header *n, struct ospf_lsa_header *h);
 void htonlsab(void *h, void *n, u8 type, u16 len);
 void ntohlsab(void *n, void *h, u8 type, u16 len);
+void lsasum_calculate(struct ospf_lsa_header *header, void *body, struct proto_ospf *p);
 
 #endif /* _BIRD_OSPF_LSALIB_H_ */

diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index f32476df481d61beaaa6f1861171fd8d4a5b6905..66a155362c1b7bfe375132ae987a9a3a0d6e0f84 100644 (file)
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -195,7 +195,8 @@ addifa_rtlsa(struct ospf_iface *ifa)
   }
   oa->rt->lsa.length=make_rt_lsa(oa, po)+sizeof(struct ospf_lsa_header);
   oa->rt->lsa.checksum=0;
-  oa->rt->lsa.checksum=ipsum_calculate(&(oa->rt->lsa.options),sizeof(struct ospf_lsa_header)-2,oa->rt->lsa_body,oa->rt->lsa.length-sizeof(struct ospf_lsa_header),NULL);
+  /*oa->rt->lsa.checksum=ipsum_calculate(&(oa->rt->lsa.options),sizeof(struct ospf_lsa_header)-2,oa->rt->lsa_body,oa->rt->lsa.length-sizeof(struct ospf_lsa_header),NULL);*/
+  lsasum_calculate(&(oa->rt->lsa),oa->rt->lsa_body,po);
   /*FIXME lsa_flood(oa->rt) */
 }