Changeset 83 for trunk/src

Timestamp:

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

Author:

andreu

Message:

release tag 0.0.13beta ; beginning of multisampling implementation

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (4 diffs)
• get_conf.c (modified) (5 diffs)

trunk/src/dataFlowSet.c

@@ -672 +672 @@
               if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
 #endif
+
+                /* OUT ("traffic from the prefix/subnet")  */
+#if defined(MULTISAMPLING)
+                if (myPtrs->currentRouterPtr->sampled != res->sampling ){
+                  res->bytesNbOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  res->pktsNbOUT += agCache.pkts*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  /* (res->flowNbOUT)++; FIXME : FIND SOMETHING*/
+                }else{
+                  res->bytesNbOUT += agCache.bytes;
+                  res->pktsNbOUT += agCache.pkts;
+                  (res->flowNbOUT)++;             
+                }
+#else
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
-                  /* OUT ("traffic from the prefix/subnet")  */
                   res->bytesNbOUT += agCache.bytes;
                   res->pktsNbOUT += agCache.pkts;
@@ -682 +694 @@
                   res->sampling = myPtrs->currentRouterPtr->sampled;
                 }
+#endif
 #if defined(IPV4AGGIDSNMP)
                 prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
@@ -697 +710 @@
                     }
                   }
+#if defined(MULTISAMPLING)
+                  if (myPtrs->currentRouterPtr->sampled != res3->sampling ){
+                    res3->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    res3->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    /* (res3->flowNbIN)++;  FIXME : FIND SOMETHING */
+                  }else{
+                    res3->bytesNbIN += agCache.bytes;
+                    res3->pktsNbIN += agCache.pkts;
+                    (res3->flowNbIN)++;
+                  }
+#else
                   if (myPtrs->currentRouterPtr->sampled != 0 ){
                     /* IN ("traffic to the prefix/subnet")  */
@@ -707 +731 @@
                     res3->sampling = myPtrs->currentRouterPtr->sampled;
                   }
+#endif
                 }
 #endif

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;