Changeset 19 for trunk/src

Timestamp:

09/25/06 18:21:02 (17 years ago)

Author:

andreu

Message:

last changes for Crihan -> 0.0.5

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (10 diffs)
• dataFlowSet.h (modified) (2 diffs)
• renetcol.c (modified) (6 diffs)
• renetcol.h (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -89 +89 @@
   mplsFirstCache.v4AdS = 0;
   mplsFirstCache.v4AdD = 0;
+  mplsFirstCache.outSnmp = 0;
+  mplsFirstCache.inSnmp = 0;
   mplsFirstCache.routerAd = 0;
   mplsFirstCache.mplsLabel1 = 0;
+
   /* CRI */
 
@@ -196 +199 @@
                 ipFirstCache.tProt = *((unsigned char*)&buffer1); 
               }
+/*            if (pftmp->fieldType==46){  */
+/*              mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
+/*            } */
               /* end CRI */
               break;
@@ -212 +218 @@
               if (pftmp->fieldType==10){
                 ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
+                mplsFirstCache.inSnmp = *((unsigned short*)&buffer2);
               }
               if (pftmp->fieldType==14){
                 ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
+                mplsFirstCache.outSnmp = *((unsigned short*)&buffer2);
               }
               if (pftmp->fieldType==7){
@@ -270 +278 @@
               if (pftmp->fieldType==8){
                 ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
+                mplsFirstCache.v4AdS = *((unsigned long*)&buffer4);
               }
               if (pftmp->fieldType==12){
                 ipFirstCache.v4AdD = *((unsigned long*)&buffer4);
+                mplsFirstCache.v4AdD = *((unsigned long*)&buffer4);
               }
               if (pftmp->fieldType==1){
@@ -472 +482 @@
             ipFirstCache.tProt = *((unsigned char*)&buffer1); 
           }
+/*        if (pftmp->fieldType==46){  */
+/*          mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
+/*        } */
           break;
         case 2:
@@ -484 +497 @@
           if (pftmp->fieldType==10){
             ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
+            mplsFirstCache.inSnmp = *((unsigned short*)&buffer2);
           }
           if (pftmp->fieldType==14){
             ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
+            mplsFirstCache.outSnmp = *((unsigned short*)&buffer2);
           }
           if (pftmp->fieldType==7){
@@ -529 +544 @@
           if (pftmp->fieldType==8){
             ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
+            mplsFirstCache.v4AdS = *((unsigned long*)&buffer4);
           }
           if (pftmp->fieldType==12){
             ipFirstCache.v4AdD = *((unsigned long*)&buffer4);
+            mplsFirstCache.v4AdD = *((unsigned long*)&buffer4);
           }
           if (pftmp->fieldType==1){
@@ -569 +586 @@
          */
         /* CRI */
-        printf("!");
         if ( mplsFirstCache.mplsLabel1 == 0 ) {
           (ipCache+(*ipCounter))->ipProt = ipFirstCache.ipProt;
@@ -600 +616 @@
           (*ipCounter)++;
         } else {
-          printf("im\n");
           (mplsCache+(*mplsCounter))->ipProt = mplsFirstCache.ipProt;
           mplsFirstCache.ipProt = 0;
+/*        (mplsCache+(*mplsCounter))->topLabelType = mplsFirstCache.topLabelType; */
+/*        mplsFirstCache.topLabelType = 0; */
           (mplsCache+(*mplsCounter))->v4AdS =  mplsFirstCache.v4AdS;
           mplsFirstCache.v4AdS = 0;
           (mplsCache+(*mplsCounter))->v4AdD =  mplsFirstCache.v4AdD; 
           mplsFirstCache.v4AdD = 0;
+          (mplsCache+(*mplsCounter))->inSnmp =  mplsFirstCache.inSnmp;
+          mplsFirstCache.inSnmp = 0;
+          (mplsCache+(*mplsCounter))->outSnmp =  mplsFirstCache.outSnmp; 
+          mplsFirstCache.outSnmp = 0;
           (mplsCache+(*mplsCounter))->routerAd =  mplsFirstCache.routerAd;
           (mplsCache+(*mplsCounter))->mplsLabel1 =  mplsFirstCache.mplsLabel1;
@@ -612 +633 @@
           (*mplsCounter)++;
         }
-        /* CRI */
+        /* end CRI */
         /* put aggregation cache information to tables */
         if (bool == 1){

trunk/src/dataFlowSet.h

@@ -37 +37 @@
 #include "prefix_mgmt.h"
 
-#define MAX_IP_FLOW 1000
-#define MAX_MPLS_FLOW 1000
-
 struct IPFLowCache {
   unsigned char ipProt; /* not write in file, just to know IP version */
@@ -65 +62 @@
   unsigned long v4AdS;
   unsigned long v4AdD;
+  unsigned short inSnmp;
+  unsigned short outSnmp;
   uint32_t tabAdd6S[4];
   uint32_t tabAdd6D[4];  

trunk/src/renetcol.c

@@ -33 +33 @@
 unsigned long *ipNbPtr = &ipNb;
 unsigned long *mplsNbPtr = &mplsNb;
+unsigned short currentIPOutputFile = 0;
+unsigned short currentMPLSOutputFile = 0;
+char outputName[256];
+char cof_str[20];
 FILE *fIP;
 FILE *fMPLS;
-/* end */ 
+/* end */
 
 char *rulesFileName;
@@ -332 +336 @@
   int regRouter = 0;
   /* CRI */
+  time_t now = time((time_t *)NULL);
   int iIP, iMPLS;
-  /* end CRI */
-  
+  time_t lastIPOutput, lastMPLSOutput;
+  time_t receptionTime;
+  /* end */
+
+  now = time((time_t *)NULL);
+  lastMPLSOutput = now;
+  lastIPOutput = now;
   do {
     if (sigusr1Up == 1){
@@ -401 +411 @@
 
     /* CRI */
-    if ( ipNb > (MAX_IP_FLOW - 50)) {
-      if ((fIP = fopen(OUTPUT_IP, "w")) == NULL) {
+    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++){
-          printf("ipv4\n");
           if ( tabIP[iIP].ipProt == 0 ) {
-            printf(".\n");
-            fprintf(fIP, "%lu;%lu;%hu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu;%d;%hu;%hu;%d;%d;%lu.%lu.%lu.%lu;%lu\n",
+            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,
@@ -420 +444 @@
                     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
+                    tabIP[iIP].routerAd<<24>>24, tabIP[iIP].liveTime,
+                    receptionTime
                     );
           }
@@ -427 +452 @@
       }
       ipNb = 0;
-    }
-    if ( mplsNb > (MAX_MPLS_FLOW - 50)) {
-      if ((fMPLS = fopen(OUTPUT_MPLS, "w")) == NULL) {
+      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 == 4 ) {
-            fprintf(fMPLS, "%lu.%lu.%lu.%lu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu\n",
+          if ( tabMPLS[iMPLS].ipProt == 0 ) {
+            fprintf(fMPLS, "%lu.%lu.%lu.%lu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu;%hu;%hu;%d\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].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 
+                    tabMPLS[iMPLS].v4AdD<<24>>24,
+                    tabMPLS[iMPLS].inSnmp,tabMPLS[iMPLS].outSnmp,
+                    receptionTime
                     );
           }
@@ -449 +493 @@
       }
       mplsNb = 0;
+      lastMPLSOutput = now;
     }
     /* end CRI */

trunk/src/renetcol.h

@@ -74 +74 @@
 #define MAX_RULES_PER_FIELD 10
 
-#define OUTPUT_IP "/tmp/ipflow.txt" /* CRI */
-#define OUTPUT_MPLS "/tmp/mplsflow.txt" /* CRI */
+ /* CRI */
+#define OUTPUT_IP "/tmp/ipflow"
+#define EXTENSION ".txt" 
+#define OUTPUT_MPLS "/tmp/mplsflow"
+#define MAX_IP_OUTPUT_FILES 3
+#define MAX_MPLS_OUTPUT_FILES 3
+#define MAX_IP_FLOW 1000
+#define MAX_MPLS_FLOW 200
+#define IP_TIME_THRESHOLD 60 /* in sec */
+#define MPLS_TIME_THRESHOLD 60 /* in sec */
+/* end CRI */
 
 void setCache(RulesPtr);