Changeset 80 for trunk/src/get_conf.c

Timestamp:

11/06/08 10:38:20 (14 years ago)

Author:

andreu

Message:

bug correction in prefix reading

Files:

• trunk/src/get_conf.c (modified) (4 diffs)

trunk/src/get_conf.c

@@ -239 +239 @@
     }
   qsort(prefixStrTab, counter, 50, compStr);
+#ifdef DEBUG
+  for(i=0;i<counter;i++) {
+    fprintf(stderr,"i : %hu - line : %s\n", i,prefixStrTab[i]);
+  }
+#endif
   for(i=0;i<counter;i++)
     {
@@ -257 +262 @@
         lastSuperNet.beginning = *((unsigned long*)&buffer4[0]);
         lastSuperNet.end = *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+#ifdef DEBUG
+        fprintf(stderr,"First SUPERNET : %lu.%lu.%lu.%lu",
+                (lastSuperNet.beginning>>24),
+                (lastSuperNet.beginning<<8>>24),
+                (lastSuperNet.beginning<<16>>24),
+                (lastSuperNet.beginning<<24>>24));
+#endif
         lastSuperNet.mask = n4;
         lastSuperNetIndex = i;
@@ -282 +294 @@
         pV4TabPtr[i].secondCoSOUT = 0;
         pV4TabPtr[i].thirdCoSOUT = 0;
-        pV4TabPtr[i].fourthCoSOUT = 0;
-        
+        pV4TabPtr[i].fourthCoSOUT = 0;  
       } else if ( (lastSuperNet.beginning <= *((unsigned long*)&buffer4[0]))
                   && (lastSuperNet.end>=*((unsigned long*)&buffer4[0]) +~(~0<<(32-n4))) ) {
         /* we are in the case of subnet */
         *subnetNb += 1;
-        fprintf(stderr,"SUBNET %lu SUPERNET %lu %lu, subnetnb : %hu\n",
-                *((unsigned long*)&buffer4[0]),
-                pV4TabPtr[lastSuperNetIndex].beginning,
-                pV4TabPtr[lastSuperNetIndex].end,
-                *subnetNb);
-        
+#ifdef DEBUG
+        fprintf(stderr,"SUBNET %lu.%lu.%lu.%lu FROM SUPERNET %lu.%lu.%lu.%lu %lu.%lu.%lu.%lu , subnetnb : %hu\n",
+                (*((unsigned long*)&buffer4[0])>>24),
+                (*((unsigned long*)&buffer4[0])<<8>>24),
+                (*((unsigned long*)&buffer4[0])<<16>>24),
+                (*((unsigned long*)&buffer4[0])<<24>>24),
+                (pV4TabPtr[lastSuperNetIndex].beginning)>>24,
+                (pV4TabPtr[lastSuperNetIndex].beginning)<<8>>24,
+                (pV4TabPtr[lastSuperNetIndex].beginning)<<16>>24,
+                (pV4TabPtr[lastSuperNetIndex].beginning)<<24>>24,
+                (pV4TabPtr[lastSuperNetIndex].end)>>24,
+                (pV4TabPtr[lastSuperNetIndex].end)<<8>>24,
+                (pV4TabPtr[lastSuperNetIndex].end)<<16>>24,
+                (pV4TabPtr[lastSuperNetIndex].end)<<24>>24, 
+                *subnetNb);
+#endif
         pV4TabPtr[lastSuperNetIndex].hasSubnet = 1;
         pV4SubTabPtr[subNetIndex].beginning = 
@@ -323 +344 @@
         lastSuperNet.beginning = *((unsigned long*)&buffer4[0]);
         lastSuperNet.end = *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+#ifdef DEBUG
+        fprintf(stderr,"SUPERNET %lu.%lu.%lu.%lu \n",
+                (*((unsigned long*)&buffer4[0])>>24),
+                (*((unsigned long*)&buffer4[0])<<8>>24),
+                (*((unsigned long*)&buffer4[0])<<16>>24),
+                (*((unsigned long*)&buffer4[0])<<24>>24));
+#endif
         lastSuperNet.mask = n4;
-        lastSuperNetIndex = i;
+        lastSuperNetIndex = superNetIndex;
         pV4TabPtr[superNetIndex].beginning = 
           *((unsigned long*)&buffer4[0]);