Changeset 61 for trunk/src

Timestamp:

10/26/07 10:25:49 (15 years ago)

Author:

andreu

Message:

tickets 12,19 & 20 closed

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (6 diffs)
• dataFlowSet.h (modified) (1 diff)
• get_conf.c (modified) (5 diffs)
• get_conf.h (modified) (1 diff)
• renetcol.c (modified) (3 diffs)
• renetcol.h (modified) (1 diff)
• renetcolAgg.c (modified) (3 diffs)
• renetcolAgg.h (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -35 +35 @@
                  int myQueue, 
                  struct PrefixV4 *V4PTab, 
-                 size_t nbPV4
+                 size_t nbPV4,
+                 struct PrefixV4 *V4STab,
+                 size_t nbSV4
                  )
 {
@@ -65 +67 @@
 
   unsigned short tplMsgType = 11;
-  struct PrefixV4 prefixKey, *res, *res2; /* for bsearch */
+  struct PrefixV4 prefixKey, *res, *res2, *resSub; /* for bsearch */
 #if defined(IPV4AGGIDSNMP)
   struct PrefixV4 *res3;
@@ -636 +638 @@
                         sizeof(struct PrefixV4), prefGlobalCmp);
           if (res!=NULL){
+            /* res is supernet or subnet ? */
+            if (res->hasSubnet == 1) {
+              resSub = NULL;
+              resSub = bsearch(&prefixKey, V4STab, nbSV4, 
+                               sizeof(struct PrefixV4), prefGlobalCmp);
+              if (resSub != NULL) {
+                res = resSub;
+                resSub = NULL;
+              }
+            }
 #if defined(IPV4AGGIDR)
-            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { 
+            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { 
 #elif defined(IPV4AGGIDSNMP)
             if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {         
@@ -656 +668 @@
                              sizeof(struct PrefixV4), prefGlobalCmp);
               if (res3!=NULL){
+                /* res is supernet or subnet ? */
+                if (res3->hasSubnet == 1) {
+                  resSub = NULL;
+                  resSub = bsearch(&prefixKey, V4STab, nbSV4, 
+                                   sizeof(struct PrefixV4), prefGlobalCmp);
+                  if (resSub != NULL) {
+                    res3 = resSub;
+                    resSub = NULL;
+                  }
+                }
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the prefix/subnet")  */
@@ -672 +694 @@
               prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
               res2 = bsearch(&prefixKey, V4PTab, nbPV4, 
-                            sizeof(struct PrefixV4), prefGlobalCmp);
+                             sizeof(struct PrefixV4), prefGlobalCmp);
               if (res2!=NULL){          
                 ((struct POP *)((myPtrs->matrixPOP)
@@ -686 +708 @@
                 (
                  ((struct POP *)(myPtrs->matrixPOP)
-                 +((res->routerNb)*ROUTER_INDEX_MAX)
-                 +((ROUTER_INDEX_MAX-1))))->pktsNb += agCache.pkts; 
+                  +((res->routerNb)*ROUTER_INDEX_MAX)
+                  +((ROUTER_INDEX_MAX-1))))->pktsNb += agCache.pkts; 
                 (
                  ((struct POP *)(myPtrs->matrixPOP)
-                 +((res->routerNb)*ROUTER_INDEX_MAX)
-                 +((ROUTER_INDEX_MAX-1))))->bytesNb += agCache.bytes; 
+                  +((res->routerNb)*ROUTER_INDEX_MAX)
+                  +((ROUTER_INDEX_MAX-1))))->bytesNb += agCache.bytes; 
                 (
                  ((struct POP *)(myPtrs->matrixPOP)
-                 +((res->routerNb)*ROUTER_INDEX_MAX)
-                 +((ROUTER_INDEX_MAX-1))))->flowNb++; 
+                  +((res->routerNb)*ROUTER_INDEX_MAX)
+                  +((ROUTER_INDEX_MAX-1))))->flowNb++; 
               }
               /* end interpop matrix accounting */
 #endif /* matrix */
             } else {
-              /* doublon or bad reference in prefix list */
+                /* doublon or bad reference in prefix list */
             }
-          } else { /* the prefix in source don't exist in your prefix list */
+          } else { /* res==NULL, the prefix in source don't exist in your prefix list */
             prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
                           sizeof(struct PrefixV4), prefGlobalCmp);
             if (res!=NULL){
+              /* res is supernet or subnet ? */
+              if (res->hasSubnet == 1) {
+                resSub = NULL;
+                resSub = bsearch(&prefixKey, V4STab, nbSV4, 
+                                 sizeof(struct PrefixV4), prefGlobalCmp);
+                if (resSub != NULL) {
+                  res = resSub;
+                  resSub = NULL;
+                }
+              }
               if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
                 if (myPtrs->currentRouterPtr->sampled != 0 ){

trunk/src/dataFlowSet.h

@@ -98 +98 @@
                  struct MyPtrs *,
                  int,
+                 struct PrefixV4 *, size_t,
                  struct PrefixV4 *, size_t
                  );

trunk/src/get_conf.c

@@ -133 +133 @@
  * read IPv4 prefix file and sort the list
  */
-unsigned short getPrefixV4(char *filename, struct PrefixV4 *pV4TabPtr)
+unsigned short getPrefixV4(char *filename, 
+                           struct PrefixV4 *pV4TabPtr,
+                           struct PrefixV4 *pV4SubTabPtr,
+                           unsigned short *subnetNb)
 {
   FILE *prefixFile;
@@ -144 +147 @@
   unsigned char buffer4[4];
   int i = 0;
-  char prefixStrTab[MAX_IPV4_PREFIX][50];
+  char prefixStrTab[MAX_IPV4_PREFIX+MAX_IPV4_SUBNET][50];
+  struct PrefixV4 lastSuperNet;
+  unsigned short lastSuperNetIndex = 0;
+  unsigned short superNetIndex = 0;
+  unsigned short subNetIndex = 0;
 
   if (!(prefixFile = fopen(filename, "r"))) {
@@ -150 +157 @@
     exit(1);
   }
+  
+  *subnetNb = 0;
+
+  lastSuperNet.beginning = 0;
+  lastSuperNet.end = 0;
+  lastSuperNet.mask = 0;
+  lastSuperNet.sampling = 0;
+#ifdef IPV4AGGIDR      
+  lastSuperNet.routerNb = 0;
+#endif
+  lastSuperNet.flowNbIN = 0;
+  lastSuperNet.bytesNbIN = 0;
+  lastSuperNet.pktsNbIN = 0;
+  lastSuperNet.flowNbOUT = 0;
+  lastSuperNet.bytesNbOUT = 0;
+  lastSuperNet.pktsNbOUT = 0;
+  lastSuperNet.firstCoSIN = 0;
+  lastSuperNet.secondCoSIN = 0;
+  lastSuperNet.thirdCoSIN = 0;
+  lastSuperNet.fourthCoSIN = 0;
+  lastSuperNet.firstCoSOUT = 0;
+  lastSuperNet.secondCoSOUT = 0;
+  lastSuperNet.thirdCoSOUT = 0;
+  lastSuperNet.fourthCoSOUT = 0;
+
   for(i=0;i<MAX_IPV4_PREFIX;i++){
     pV4TabPtr[i].beginning = 0;
@@ -173 +205 @@
     pV4TabPtr[i].fourthCoSOUT = 0;
   }
+  for(i=0;i<MAX_IPV4_SUBNET;i++){
+    pV4SubTabPtr[i].beginning = 0;
+    pV4SubTabPtr[i].end = 0;
+    pV4SubTabPtr[i].mask = 0;
+    pV4SubTabPtr[i].sampling = 0;
+#ifdef IPV4AGGIDR      
+    pV4SubTabPtr[i].routerNb = 0;
+#endif
+    pV4SubTabPtr[i].flowNbIN = 0;
+    pV4SubTabPtr[i].bytesNbIN = 0;
+    pV4SubTabPtr[i].pktsNbIN = 0;
+    pV4SubTabPtr[i].flowNbOUT = 0;
+    pV4SubTabPtr[i].bytesNbOUT = 0;
+    pV4SubTabPtr[i].pktsNbOUT = 0;
+    pV4SubTabPtr[i].firstCoSIN = 0;
+    pV4SubTabPtr[i].secondCoSIN = 0;
+    pV4SubTabPtr[i].thirdCoSIN = 0;
+    pV4SubTabPtr[i].fourthCoSIN = 0;
+    pV4SubTabPtr[i].firstCoSOUT = 0;
+    pV4SubTabPtr[i].secondCoSOUT = 0;
+    pV4SubTabPtr[i].thirdCoSOUT = 0;
+    pV4SubTabPtr[i].fourthCoSOUT = 0;
+  }
   while (fgets(line, 50, prefixFile) != 0)
     {
       strcpy(prefixStrTab[counter], line);
       counter++;
-      if (counter == MAX_IPV4_PREFIX) {
+      if (counter == MAX_IPV4_PREFIX+MAX_IPV4_SUBNET) {
         fprintf(stderr, "bufferoverflow in getPrefixV4 function (get_conf.c)\
 change the value of MAX_IPV4_PREFIX  declaration and recompile \n");
@@ -197 +252 @@
       buffer4[2] = (unsigned char)n1;
       buffer4[3] = (unsigned char)n0;
-      pV4TabPtr[i].beginning = 
-        *((unsigned long*)&buffer4[0]);
-      pV4TabPtr[i].end = 
-        *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
-      pV4TabPtr[i].mask = n4;
-      pV4TabPtr[i].sampling = 0;
-#ifdef IPV4AGGIDR      
-      pV4TabPtr[i].routerNb = n5;
-#endif
-      pV4TabPtr[i].flowNbIN = 0;
-      pV4TabPtr[i].bytesNbIN = 0;
-      pV4TabPtr[i].pktsNbIN = 0;
-      pV4TabPtr[i].flowNbOUT = 0;
-      pV4TabPtr[i].bytesNbOUT = 0;
-      pV4TabPtr[i].pktsNbOUT = 0;
-      pV4TabPtr[i].firstCoSIN = 0;
-      pV4TabPtr[i].secondCoSIN = 0;
-      pV4TabPtr[i].thirdCoSIN = 0;
-      pV4TabPtr[i].fourthCoSIN = 0;
-      pV4TabPtr[i].firstCoSOUT = 0;
-      pV4TabPtr[i].secondCoSOUT = 0;
-      pV4TabPtr[i].thirdCoSOUT = 0;
-      pV4TabPtr[i].fourthCoSOUT = 0;
+      /* we sort supernet and subnet */
+      if (lastSuperNet.beginning == 0) {
+        /* case of first supernet */
+        lastSuperNet.beginning = *((unsigned long*)&buffer4[0]);
+        lastSuperNet.end = *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+        lastSuperNet.mask = n4;
+        lastSuperNetIndex = i;
+        superNetIndex++;
+        pV4TabPtr[i].beginning = 
+          *((unsigned long*)&buffer4[0]);
+        pV4TabPtr[i].end = 
+          *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+        pV4TabPtr[i].mask = n4;
+        pV4TabPtr[i].sampling = 0;
+#ifdef IPV4AGGIDR      
+        pV4TabPtr[i].routerNb = n5;
+#endif
+        pV4TabPtr[i].flowNbIN = 0;
+        pV4TabPtr[i].bytesNbIN = 0;
+        pV4TabPtr[i].pktsNbIN = 0;
+        pV4TabPtr[i].flowNbOUT = 0;
+        pV4TabPtr[i].bytesNbOUT = 0;
+        pV4TabPtr[i].pktsNbOUT = 0;
+        pV4TabPtr[i].firstCoSIN = 0;
+        pV4TabPtr[i].secondCoSIN = 0;
+        pV4TabPtr[i].thirdCoSIN = 0;
+        pV4TabPtr[i].fourthCoSIN = 0;
+        pV4TabPtr[i].firstCoSOUT = 0;
+        pV4TabPtr[i].secondCoSOUT = 0;
+        pV4TabPtr[i].thirdCoSOUT = 0;
+        pV4TabPtr[i].fourthCoSOUT = 0;
+        
+      } else if ( (lastSuperNet.beginning <= *((unsigned long*)&buffer4[0]))
+                  && (lastSuperNet.end>=*((unsigned long*)&buffer4[0]) +~(~0<<(32-n4))) ) {
+        /* we are in the case of subnet */
+        *subnetNb += 1;
+        fprintf(stderr,"SUBNET %lu SUPERNET %lu %lu, subnetnb : %hu\n",
+                *((unsigned long*)&buffer4[0]),
+                pV4TabPtr[lastSuperNetIndex].beginning,
+                pV4TabPtr[lastSuperNetIndex].end,
+                *subnetNb);
+        
+        pV4TabPtr[lastSuperNetIndex].hasSubnet = 1;
+        pV4SubTabPtr[subNetIndex].beginning = 
+          *((unsigned long*)&buffer4[0]);
+        pV4SubTabPtr[subNetIndex].end = 
+          *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+        pV4SubTabPtr[subNetIndex].mask = n4;
+        pV4SubTabPtr[subNetIndex].sampling = 0;
+#ifdef IPV4AGGIDR      
+        pV4SubTabPtr[subNetIndex].routerNb = n5;
+#endif
+        pV4SubTabPtr[subNetIndex].flowNbIN = 0;
+        pV4SubTabPtr[subNetIndex].bytesNbIN = 0;
+        pV4SubTabPtr[subNetIndex].pktsNbIN = 0;
+        pV4SubTabPtr[subNetIndex].flowNbOUT = 0;
+        pV4SubTabPtr[subNetIndex].bytesNbOUT = 0;
+        pV4SubTabPtr[subNetIndex].pktsNbOUT = 0;
+        pV4SubTabPtr[subNetIndex].firstCoSIN = 0;
+        pV4SubTabPtr[subNetIndex].secondCoSIN = 0;
+        pV4SubTabPtr[subNetIndex].thirdCoSIN = 0;
+        pV4SubTabPtr[subNetIndex].fourthCoSIN = 0;
+        pV4SubTabPtr[subNetIndex].firstCoSOUT = 0;
+        pV4SubTabPtr[subNetIndex].secondCoSOUT = 0;
+        pV4SubTabPtr[subNetIndex].thirdCoSOUT = 0;
+        pV4SubTabPtr[subNetIndex].fourthCoSOUT = 0;
+        subNetIndex++;
+      } else {
+        /* we are in the supernet case */
+        lastSuperNet.beginning = *((unsigned long*)&buffer4[0]);
+        lastSuperNet.end = *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+        lastSuperNet.mask = n4;
+        lastSuperNetIndex = i;
+        pV4TabPtr[superNetIndex].beginning = 
+          *((unsigned long*)&buffer4[0]);
+        pV4TabPtr[superNetIndex].end = 
+          *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4));
+        pV4TabPtr[superNetIndex].mask = n4;
+        pV4TabPtr[superNetIndex].sampling = 0;
+#ifdef IPV4AGGIDR      
+        pV4TabPtr[superNetIndex].routerNb = n5;
+#endif
+        pV4TabPtr[superNetIndex].flowNbIN = 0;
+        pV4TabPtr[superNetIndex].bytesNbIN = 0;
+        pV4TabPtr[superNetIndex].pktsNbIN = 0;
+        pV4TabPtr[superNetIndex].flowNbOUT = 0;
+        pV4TabPtr[superNetIndex].bytesNbOUT = 0;
+        pV4TabPtr[superNetIndex].pktsNbOUT = 0;
+        pV4TabPtr[superNetIndex].firstCoSIN = 0;
+        pV4TabPtr[superNetIndex].secondCoSIN = 0;
+        pV4TabPtr[superNetIndex].thirdCoSIN = 0;
+        pV4TabPtr[superNetIndex].fourthCoSIN = 0;
+        pV4TabPtr[superNetIndex].firstCoSOUT = 0;
+        pV4TabPtr[superNetIndex].secondCoSOUT = 0;
+        pV4TabPtr[superNetIndex].thirdCoSOUT = 0;
+        pV4TabPtr[superNetIndex].fourthCoSOUT = 0;
+        superNetIndex++;
+      }
     }
   if( fclose(prefixFile) == 0) {
-    return (counter);
+    return (superNetIndex);
   } else {
     fprintf(stderr,"%s not closed, \n", filename);
     exit(1);
-    return(counter);
+    return(superNetIndex);
   }
 }

trunk/src/get_conf.h

@@ -57 +57 @@
 int longCmp(const void *, const void *);
 int getRegisteredRouters(char *, unsigned long *, unsigned long *);
-unsigned short getPrefixV4(char *, struct PrefixV4 *);
+unsigned short getPrefixV4(char *, struct PrefixV4 *, struct PrefixV4 *,
+                           unsigned short *);
 unsigned short getAS(char *, struct AS *);
 

trunk/src/renetcol.c

@@ -121 +121 @@
   /* Create the list of routers */
   for (i=0; i<routerNb; i++){
-    fprintf(stderr, "add router : %lu\n", sortedRouterList[i]);
     routersListPtr = addRouter(routersListPtr, sortedRouterList[i]);
   }
@@ -136 +135 @@
   }
 
-  if ( (shmForAgg->v4PrefixNb = getPrefixV4(SUBNETS_LIST, &(shmForAgg->prefixV4Tab[0][0]))) < 1){
+  if ( (shmForAgg->v4PrefixNb = 
+        getPrefixV4(SUBNETS_LIST, 
+                    &(shmForAgg->prefixV4Tab[0][0]),
+                    &(shmForAgg->prefixV4SubnetTab[0][0]),
+                    &(shmForAgg->v4SubnetNb)
+                    )) < 1){
     fprintf(stderr, "renetcol: Error in %s\n", SUBNETS_LIST);
-    exit(1);
   } else {
-    fprintf(stderr, "%hu prefix are readed from %s\n", 
+    fprintf(stderr, "We have found %hu supernets from %s\n", 
             shmForAgg->v4PrefixNb,
             SUBNETS_LIST);
-  }
-  if ( (shmForAgg->v4PrefixNb = getPrefixV4(SUBNETS_LIST, &(shmForAgg->prefixV4Tab[1][0]))) < 1){
+    fprintf(stderr, "and %hu subnets\n", 
+            shmForAgg->v4SubnetNb);    
+  }
+  if ( (shmForAgg->v4PrefixNb = 
+        getPrefixV4(SUBNETS_LIST, 
+                    &(shmForAgg->prefixV4Tab[1][0]),
+                    &(shmForAgg->prefixV4SubnetTab[1][0]),
+                    &(shmForAgg->v4SubnetNb)
+                    )) < 1){
     fprintf(stderr, "renetcol: Error in %s\n", SUBNETS_LIST);
     exit(1);
   }
+/*   for (i=0; i<shmForAgg->v4PrefixNb; i++){ */
+/*    fprintf(stderr, "SUPERNET : %lu, %hu\n",shmForAgg->prefixV4Tab[0][i].beginning, shmForAgg->prefixV4Tab[0][i].hasSubnet); */
+/*   } */
+/*   for (i=0; i<shmForAgg->v4SubnetNb; i++){ */
+/*    fprintf(stderr, "SUBNET : %lu, %hu\n",shmForAgg->prefixV4SubnetTab[0][i].beginning, shmForAgg->prefixV4SubnetTab[0][i].hasSubnet); */
+/*   } */
 
   shmForAgg->currentTable = 0;
@@ -520 +536 @@
                                          myQueue, 
                                          shmForAgg->prefixV4Tab[shmForAgg->currentTable],
-                                         (size_t) shmForAgg->v4PrefixNb
-                                         ) ) < 0 ) {
+                                         (size_t) shmForAgg->v4PrefixNb,
+                                         shmForAgg->prefixV4SubnetTab[shmForAgg->currentTable],
+                                         (size_t) shmForAgg->v4SubnetNb) ) < 0 ) {
 #ifdef DEBUG    
             fprintf (stderr, "wd>\n");

trunk/src/renetcol.h

@@ -68 +68 @@
   unsigned short readed;
   unsigned short v4PrefixNb;
+  unsigned short v4SubnetNb;
 #ifdef ASACC
   unsigned short ASNb;

trunk/src/renetcolAgg.c

@@ -53 +53 @@
   static char name[2048];
   static char ipStr[24];
+#if defined(MATRIX) && defined(IPV4AGGIDR)
   static char indexStr[24];
+#endif
   static char asStr[7];
   static char createstr[2048];
@@ -233 +235 @@
         }
         /* ACCOUNTING for prefixV4SubnetTab */
-        for (i=0; i<shmForAgg->v4PrefixNb; i++){
+        for (i=0; i<shmForAgg->v4SubnetNb; i++){
           /* HERE create or update RRD FILE */
           if (shmForAgg->prefixV4SubnetTab[index][i].sampling != 0) {
@@ -630 +632 @@
           shmForAgg->prefixV4Tab[index][i].thirdCoSOUT = 0;
           shmForAgg->prefixV4Tab[index][i].fourthCoSOUT = 0; 
-
+        }
+        for (i=0; i<shmForAgg->v4SubnetNb; i++){        
           shmForAgg->prefixV4SubnetTab[index][i].flowNbIN = 0;
           shmForAgg->prefixV4SubnetTab[index][i].bytesNbIN = 0;

trunk/src/renetcolAgg.h

@@ -49 +49 @@
   unsigned short readed;
   unsigned short v4PrefixNb;
+  unsigned short v4SubnetNb;
 #ifdef ASACC
   unsigned short ASNb;