Changeset 57 for trunk/src/renetcol.c

Timestamp:

09/26/07 14:13:56 (15 years ago)

Author:

andreu

Message:

delete all CRIHAN code and some outputs; add param in check.sh

Files:

• trunk/src/renetcol.c (modified) (9 diffs)

trunk/src/renetcol.c

@@ -29 +29 @@
 
 struct SHMForAgg *shmForAgg;
-
-struct IPFLowCache tabIP[MAX_IP_FLOW];
-struct MPLSFlowCache tabMPLS[MAX_MPLS_FLOW];
-unsigned long ipNb = 0;                     /* counter of IP flows number */
-unsigned long mplsNb = 0;                   /* counter of MPLS flow number */
 
 unsigned short currentIPOutputFile = 0;    /* index on the current IP file */
@@ -78 +73 @@
 int reInitConf = 0;
 
-static time_t lastRock;
 static struct tm *tmPtr;
 
@@ -115 +109 @@
   }
 
-#ifdef CRIHAN
-  fprintf(stderr, "renetcol compilation with CRIHAN feature enable\n");
-#endif
 #ifdef IPV4AGG
   fprintf(stderr, "renetcol compilation and execution with IPv4 Aggregation feature enable\n");
@@ -203 +194 @@
   myPtrs.pcktPtr = (DatagramPtr) malloc(sizeof(struct Datagram));
   myPtrs.currentFlowsetNumberPtr = &currentFlowsetNumber;
-  myPtrs.ipNbPtr =  &ipNb;
-  myPtrs.mplsNbPtr =  &mplsNb;
   myPtrs.routersID = &indexedRouterList;
   myPtrs.currentV4Tab = shmForAgg->prefixV4Tab[shmForAgg->currentTable];
   myPtrs.secondV4Tab = shmForAgg->prefixV4Tab[shmForAgg->secondTable];
   myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
-
-  myPtrs.nbFluxSR4 =0;
-  myPtrs.nbFluxSE =0;
-  myPtrs.nbFluxIR4 =0;
-  myPtrs.nbFluxUK = 0;
-  myPtrs.nbFluxTT = 0;
 
   for (i=0; i<ROUTER_INDEX_MAX; i++){
@@ -412 +395 @@
   int regRouter = 0;
   time_t now = time((time_t *)NULL);
-  int iIP, iMPLS, i, z, x;
   int loopNb = 0;
   int gardeFou = 0;
   time_t lastIPOutput, lastMPLSOutput;
-  time_t receptionTime;
 
   now = time((time_t *)NULL);
@@ -438 +419 @@
       shmForAgg->readed = 1;
       myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
-      fprintf(stderr,"\n\nComptage FLUX:\n SR4: %llu\n SE: %llu\n IR4: %llu\n UK: %llu\n TT: %llu\n",
-              myPtrs.nbFluxSR4,
-              myPtrs.nbFluxSE,
-              myPtrs.nbFluxIR4,
-              myPtrs.nbFluxUK,
-              myPtrs.nbFluxTT
-              );
-      myPtrs.nbFluxSR4 =0;
-      myPtrs.nbFluxSE =0;
-      myPtrs.nbFluxIR4 =0;
-      myPtrs.nbFluxUK = 0;
-      myPtrs.nbFluxTT = 0;
     }
     if (sigusr1Up == 1){
@@ -487 +456 @@
                                       myPtrs.offsetV9Ptr, myPtrs.ptr_buffer);
         if ( currentFlowsetId == 0 ) {
-          if ( (shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
-                                             myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
+          if ( (shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, 
+                                             myPtrs.offsetV9Ptr, 
+                                             myPtrs.ptr_buffer, 
+                                             myPtrs.currentHeaderV9Ptr,
                                              curTplFlSetPtr,
                                              myPtrs.currentFlowsetNumberPtr,
@@ -499 +470 @@
           writeAllTplFlSet();
         } else if (currentFlowsetId == 1) {
-          if ( (shift = checkTemplateOption(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
-                                      myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
-                                      curTplOptionPtr,
+          if ( (shift = checkTemplateOption(myPtrs.currentRouterPtr, 
+                                            myPtrs.offsetV9Ptr, 
+                                            myPtrs.ptr_buffer, 
+                                            myPtrs.currentHeaderV9Ptr,
+                                            curTplOptionPtr,
                                             myPtrs.currentFlowsetNumberPtr) ) < 0 ) {
 #ifdef DEBUG
@@ -549 +522 @@
     loopNb++;
 
-#ifdef CRIHAN
-    now = time((time_t *)NULL);
-    receptionTime = now;
-    if ( (ipNb > (MAX_IP_FLOW - 50)) || 
-         ( (now-lastIPOutput) > IP_TIME_THRESHOLD) ) {
-      outputName[0] = '\0';
-      sprintf(cof_str, "%d", currentIPOutputFile);
-      strcat(outputName, OUTPUT_IP);
-      strcat(outputName, cof_str);
-      strcat(outputName, EXTENSION);
-      if (fopen(outputName, "x") == NULL) {
-        currentIPOutputFile = (currentIPOutputFile + 1)%MAX_IP_OUTPUT_FILES;
-        outputName[0] = '\0';
-        sprintf(cof_str, "%d", currentIPOutputFile);
-        strcat(outputName, OUTPUT_IP);
-        strcat(outputName, cof_str);
-        strcat(outputName, EXTENSION);
-      } 
-      if ((fIP = fopen(outputName, "w")) == NULL) {
-        syslog(LOG_ERR,"Error in OUTPUT_IP opening : %s", strerror(errno));
-      } else {
-        for ( iIP = 0; iIP < ipNb; iIP++){
-          if ( tabIP[iIP].ipProt == 0 ) {
-            fprintf(fIP, "%lu;%lu;%hu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu;%d;%hu;%hu;%d;%d;%lu.%lu.%lu.%lu;%lu;%d\n",
-                    tabIP[iIP].bytes, tabIP[iIP].pkts,
-                    tabIP[iIP].inSnmp,  tabIP[iIP].outSnmp,
-                    tabIP[iIP].v4AdS>>24, tabIP[iIP].v4AdS<<8>>24,
-                    tabIP[iIP].v4AdS<<16>>24, tabIP[iIP].v4AdS<<24>>24,
-                    tabIP[iIP].v4AdD>>24, tabIP[iIP].v4AdD<<8>>24,
-                    tabIP[iIP].v4AdD<<16>>24, tabIP[iIP].v4AdD<<24>>24,
-                    tabIP[iIP].tProt, tabIP[iIP].sPort,
-                    tabIP[iIP].dPort, tabIP[iIP].maskD,
-                    tabIP[iIP].maskS, tabIP[iIP].routerAd>>24,
-                    tabIP[iIP].routerAd<<8>>24, tabIP[iIP].routerAd<<16>>24,
-                    tabIP[iIP].routerAd<<24>>24, tabIP[iIP].liveTime,
-                    receptionTime
-                    );
-          }
-        }
-        fclose(fIP);
-      }
-      ipNb = 0;
-      lastIPOutput = now;
-    }
-    now = time((time_t *)NULL);
-    if ( mplsNb > (MAX_MPLS_FLOW - 50) || 
-         ( (now-lastMPLSOutput) > MPLS_TIME_THRESHOLD) ) {
-      outputName[0] = '\0';
-      sprintf(cof_str, "%d", currentMPLSOutputFile);
-      strcat(outputName, OUTPUT_MPLS);
-      strcat(outputName, cof_str);
-      strcat(outputName, EXTENSION);
-      if (fopen(outputName, "x") == NULL) {
-        currentMPLSOutputFile = (currentMPLSOutputFile + 1)%MAX_MPLS_OUTPUT_FILES;
-        outputName[0] = '\0';
-        sprintf(cof_str, "%d", currentMPLSOutputFile);
-        strcat(outputName, OUTPUT_MPLS);
-        strcat(outputName, cof_str);
-        strcat(outputName, EXTENSION);
-      }
-      if ((fMPLS = fopen(outputName, "w")) == NULL) {
-        syslog(LOG_ERR,"Error in OUTPUT_MPLS opening : %s", strerror(errno));
-      } else {
-        for ( iMPLS = 0; iMPLS < mplsNb; iMPLS++){
-          if ( tabMPLS[iMPLS].ipProt == 0 ) {
-            fprintf(fMPLS, "%lu.%lu.%lu.%lu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu\n",
-                    tabMPLS[iMPLS].routerAd>>24,tabMPLS[iMPLS].routerAd<<8>>24,
-                    tabMPLS[iMPLS].routerAd<<16>>24,
-                    tabMPLS[iMPLS].routerAd<<24>>24,
-                    tabMPLS[iMPLS].mplsLabel1,tabMPLS[iMPLS].v4AdS>>24,
-                    tabMPLS[iMPLS].v4AdS<<8>>24,tabMPLS[iMPLS].v4AdS<<16>>24,
-                    tabMPLS[iMPLS].v4AdS<<24>>24,tabMPLS[iMPLS].v4AdD>>24,
-                    tabMPLS[iMPLS].v4AdD<<8>>24,tabMPLS[iMPLS].v4AdD<<16>>24,
-                    tabMPLS[iMPLS].v4AdD<<24>>24 
-                    );
-          }
-        }
-        fclose(fMPLS);
-      }
-      mplsNb = 0;
-      lastMPLSOutput = now;
-    }
-#endif /* CRIHAN */
     now = time((time_t *)NULL);
     tmPtr = localtime(&now);