Changeset 83 for trunk/src/get_conf.c

Timestamp:

11/06/08 16:37:23 (14 years ago)

Author:

andreu

Message:

release tag 0.0.13beta ; beginning of multisampling implementation

Files:

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

trunk/src/get_conf.c

@@ -142 +142 @@
   unsigned short counter = 0;
   unsigned short n0, n1, n2, n3, n4;
+#if defined(MULTISAMPLING)
+  unsigned short n6;
+#endif
 #if defined(IPV4AGGIDR)
   unsigned short n5;
@@ -249 +252 @@
       sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu/%hu-%hu\n",
              &n0,&n1,&n2,&n3,&n4,&n5);
+#endif
+#if defined(IPV4AGGIDSNMP)
+#if defined(MULTISAMPLING)
+      sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu %hu %hu\n",
+             &n0,&n1,&n2,&n3,&n4,&n6);
 #else
       sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu %hu\n",
              &n0,&n1,&n2,&n3,&n4);
+#endif
 #endif
       buffer4[0] = (unsigned char)n3;
@@ -277 +286 @@
           *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
         pV4TabPtr[i].mask = n4;
+#if defined(MULTISAMPLING)
+        pV4TabPtr[i].sampling = n6;
+#else
         pV4TabPtr[i].sampling = 0;
+#endif
 #ifdef IPV4AGGIDR      
         pV4TabPtr[i].routerNb = n5;
@@ -321 +334 @@
           *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
         pV4SubTabPtr[subNetIndex].mask = n4;
-        pV4SubTabPtr[subNetIndex].sampling = 0;
+#if defined(MULTISAMPLING)
+        pV4TabPtr[subNetIndex].sampling = n6;
+#else
+        pV4TabPtr[subNetIndex].sampling = 0;
+#endif
 #ifdef IPV4AGGIDR      
         pV4SubTabPtr[subNetIndex].routerNb = n5;
@@ -358 +375 @@
           *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
         pV4TabPtr[superNetIndex].mask = n4;
+#if defined(MULTISAMPLING)
+        pV4TabPtr[superNetIndex].sampling = n6;
+#else
         pV4TabPtr[superNetIndex].sampling = 0;
+#endif
 #ifdef IPV4AGGIDR      
         pV4TabPtr[superNetIndex].routerNb = n5;