Changeset 34 for trunk/src/dataFlowSet.c

Timestamp:

04/25/07 17:05:21 (16 years ago)

Author:

andreu

Message:

bug on bad reading of routers configuration file fixed
bug on wrong sampled value fixed
in tool, we add a supervisor script shell

Files:

• trunk/src/dataFlowSet.c (modified) (2 diffs)

trunk/src/dataFlowSet.c

@@ -109 +109 @@
 #ifdef DEBUG
     fprintf(stderr,"{d id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
-    if ( (*myPtrs->currentFlowsetIdPtr) > 270 ) {
+    if ( (*myPtrs->currentFlowsetIdPtr) > TRESHOLD_TEMPLATE_ID ) {
 /*      fprintf(stderr,"Bad TID from router: %lu.%lu.%lu.%lu\n", */
 /*              (*myPtrs->currentFlowsetIdPtr), */
@@ -893 +893 @@
           buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
           if (pftmp->fieldType==34){
-            if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
+            if ((*((unsigned long*)&buffer4)==1) 
+                || (*((unsigned long*)&buffer4)==10) 
+                || (*((unsigned long*)&buffer4)==1000)) {
+              if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
 #ifdef DEBUGAGG
-              fprintf(stderr,"SV (p) %lu != %lu (r)\n", *((unsigned long*)&buffer4),
-                      myPtrs->currentRouterPtr->sampled);
+                fprintf(stderr,"\n SV (p) %lu != %lu (r)", *((unsigned long*)&buffer4),
+                        myPtrs->currentRouterPtr->sampled);
 #endif                     
-              myPtrs->currentRouterPtr->sampled = *((unsigned long*)&buffer4);
-              for (i=0; i<nbPV4; i++) {
-                /* we update the PrefixV4 structure with the sampled information */
-                if ( myPtrs->currentRouterPtr->IpAddress == myPtrs->routersID[V4PTab[i].routerNb]) {
-                  V4PTab[i].sampling = *((unsigned long*)&buffer4);
-                  myPtrs->secondV4Tab[i].sampling = *((unsigned long*)&buffer4); 
+                myPtrs->currentRouterPtr->sampled = *((unsigned long*)&buffer4);
+                for (i=0; i<nbPV4; i++) {
+                  /* we update the PrefixV4 structure with the sampled information */
+                  if ( myPtrs->currentRouterPtr->IpAddress == myPtrs->routersID[V4PTab[i].routerNb]) {
+                    V4PTab[i].sampling = *((unsigned long*)&buffer4);
+                    myPtrs->secondV4Tab[i].sampling = *((unsigned long*)&buffer4);
+                  }
                 }
               }