Changeset 86 for trunk/src

Timestamp:

11/21/08 11:27:21 (14 years ago)

Author:

andreu

Message:

ticket #23

Location:

trunk/src

Files:

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

trunk/src/dataFlowSet.c

@@ -299 +299 @@
                   }
               }
+              if ((pftmp->fieldType==16)||(pftmp->fieldType==17)){
+                if ((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) 
+                    == ((unsigned short)*((unsigned long*)&buffer4)))
+                  {
+                    ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
+                  }
+              }
               if (pftmp->fieldType==1){
                 agCache.bytes = *((unsigned long*)&buffer4);
@@ -331 +338 @@
               if (pftmp->fieldType==2){
                 agCache.pkts = *((unsigned long*)&buffer4);
+              }
+#endif
+#ifdef ASACC
+              if (pftmp->fieldType==16){
+                agCache.asS = (unsigned short)*((unsigned long*)&buffer4);
+              }   
+              if (pftmp->fieldType==17){
+                agCache.asD = (unsigned short)*((unsigned long*)&buffer4);
               }
 #endif
@@ -573 +588 @@
           }
 #endif
+#ifdef ASACC
+          if (pftmp->fieldType==16){
+            agCache.asS = (unsigned short)*((unsigned long*)&buffer4);
+          }       
+          if (pftmp->fieldType==17){
+            agCache.asD = (unsigned short)*((unsigned long*)&buffer4);
+          }
+#endif
           break;
         case 16:
@@ -611 +634 @@
           asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
           if (asres != NULL) {
-            if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {         
+            if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
+#if defined(MULTISAMPLING)
+              if (myPtrs->currentRouterPtr->sampled != asres->sampling ){
+                /* OUT ("traffic from the AS")  */
+                asres->bytesNbOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/asres->sampling;
+                asres->pktsNbOUT += agCache.pkts*myPtrs->currentRouterPtr->sampled/asres->sampling;
+              }else{
+                asres->bytesNbOUT += agCache.bytes;
+                asres->pktsNbOUT += agCache.pkts;
+                (asres->flowNbOUT)++;
+              }
+#else
               if (myPtrs->currentRouterPtr->sampled != 0 ){
                 /* OUT ("traffic from the AS")  */
@@ -622 +656 @@
                 asres->sampling = myPtrs->currentRouterPtr->sampled;
               }
+#endif
               asres = NULL;
               asKey.as = agCache.asD;
               asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
               if (asres!=NULL){
+#if defined(MULTISAMPLING)
+                if (myPtrs->currentRouterPtr->sampled != asres->sampling ){
+                  /* IN ("traffic to the AS")  */
+                  asres->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/asres->sampling;
+                  asres->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/asres->sampling;
+                }else{
+                  asres->bytesNbIN += agCache.bytes;
+                  asres->pktsNbIN += agCache.pkts;
+                  (asres->flowNbIN)++;
+                }
+#else
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the AS")  */
@@ -636 +682 @@
                   asres->sampling = myPtrs->currentRouterPtr->sampled;
                 }
+#endif
                 asres = NULL;
               }
@@ -645 +692 @@
             if (asres!=NULL){
               if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
+#if defined(MULTISAMPLING)
+                if (myPtrs->currentRouterPtr->sampled != asres->sampling ){
+                  /* IN ("traffic to the AS")  */
+                  asres->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/asres->sampling;
+                  asres->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/asres->sampling;
+                }else{
+                  asres->bytesNbIN += agCache.bytes;
+                  asres->pktsNbIN += agCache.pkts;
+                  (asres->flowNbIN)++;
+                }
+#else
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the AS")  */
@@ -655 +713 @@
                   asres->sampling = myPtrs->currentRouterPtr->sampled;
                 }
+#endif
               }
             }

trunk/src/get_conf.c

@@ -434 +434 @@
   unsigned short counter = 0;
   unsigned short n0;
+#if defined(MULTISAMPLING)
+  unsigned short n1;
+#endif
   unsigned short buffer;
   int i = 0;
-  char ASStrTab[MAX_AS][7];
+  char ASStrTab[MAX_AS][256];
 
   if (!(asFile = fopen(filename, "r"))) {
@@ -446 +449 @@
     ASTabPtr[i].sampling = 0;
   }
-  while (fgets(line, 7, asFile) != 0)
+  while (fgets(line, 256, asFile) != 0)
     {
       strcpy(ASStrTab[counter], line);
@@ -457 +460 @@
       }
     }
-  qsort(ASStrTab, counter, 7, compASStr);
+  qsort(ASStrTab, counter, 256, compASStr);
   for(i=0;i<counter;i++)
     {
+#if defined(MULTISAMPLING)
+      sscanf(ASStrTab[i],"%hu %hu\n",
+             &n0,
+             &n1);
+      buffer = (unsigned short)n0;
+      ASTabPtr[i].as = *((unsigned short*)&buffer);
+      buffer = (unsigned short)n1;
+      ASTabPtr[i].sampling = *((unsigned short*)&buffer);
+#else
       sscanf(ASStrTab[i],"%hu\n",
              &n0);
@@ -465 +477 @@
       ASTabPtr[i].as = *((unsigned short*)&buffer);
       ASTabPtr[i].sampling = 0;
+#endif
     }
   if( fclose(asFile) == 0) {