Changeset 58 for trunk/src/dataFlowSet.c

Timestamp:

10/09/07 12:01:26 (15 years ago)

Author:

andreu

Message:

new aggregation method, new configuration files, corrections on the php script for graph generation.

Files:

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

trunk/src/dataFlowSet.c

@@ -153 +153 @@
       field_size = (int) pftmp->fieldLength;
       
-      /* special case: check yes on all flows from one router (phantom field nb 0) */
+      /* special case: check yes on all flows from one router */
+      /* (phantom field nb 0) */
       /* FIXME : this code is repeated, perhaps past before */
       while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {
@@ -222 +223 @@
 #ifdef IPV4AGG
               if (pftmp->fieldType==10){
-                agCache.idSnmp = *((unsigned short*)&buffer2);
+                agCache.inputSnmp = *((unsigned short*)&buffer2);
+              }
+              if (pftmp->fieldType==14){
+                agCache.outputSnmp = *((unsigned short*)&buffer2);
               }
 #endif
@@ -472 +476 @@
 #ifdef IPV4AGG
           if (pftmp->fieldType==10){
-            agCache.idSnmp = *((unsigned short*)&buffer2);
+            agCache.inputSnmp = *((unsigned short*)&buffer2);
+          }       
+          if (pftmp->fieldType==14){
+            agCache.outputSnmp = *((unsigned short*)&buffer2);
           }       
 #endif
@@ -547 +554 @@
                         sizeof(struct PrefixV4), prefGlobalCmp);
           if (res!=NULL){
-            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+/*          if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { */
+            if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {         
               /* OUT ("traffic from the prefix/subnet")  */
               res->bytesNbOUT += agCache.bytes;
               res->pktsNbOUT += agCache.pkts;
               (res->flowNbOUT)++;
+              if (res->sampling == 0) {
+                res->sampling = myPtrs->currentRouterPtr->sampled;
+              } else if (res->sampling != myPtrs->currentRouterPtr->sampled) {
+                syslog(LOG_INFO,
+                       "2 sampling values for 1 subnet: %lu.%lu.%lu.%lu % from router %lu.%lu.%lu.%lu",
+                       agCache.v4AdS>>24,
+                       agCache.v4AdS<<8>>24,
+                       agCache.v4AdS<<16>>24,
+                       agCache.v4AdS<<24>>24,
+                       (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+              }
               /* inter-pop matrix Accounting */
               prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
               res2 = bsearch(&prefixKey, V4PTab, nbPV4, 
                             sizeof(struct PrefixV4), prefGlobalCmp);
-              if (res2!=NULL){
+              if (res2!=NULL){          
                 ((struct POP *)((myPtrs->matrixPOP)
                                 +((res->routerNb)*ROUTER_INDEX_MAX)
@@ -588 +610 @@
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
                           sizeof(struct PrefixV4), prefGlobalCmp);
-            if (res!=NULL){ 
-              if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
-                /* IN ("traffic to the prefix")  */
+            if (res!=NULL){
+              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
+                /* IN ("traffic to the prefix/subnet")  */
                 res->bytesNbIN += agCache.bytes;
                 res->pktsNbIN += agCache.pkts;
-                (res->flowNbIN)++;
-              } else {
+                (res->flowNbIN)++;      
+/*            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { */
+/*               IN ("traffic to the prefix")  */ 
+/*              res->bytesNbIN += agCache.bytes; */
+/*              res->pktsNbIN += agCache.pkts; */
+/*              (res->flowNbIN)++; */
+/*              if (res->sampling == 0) { */
+/*                res->sampling = myPtrs->currentRouterPtr->sampled; */
+/*              } else if (res->sampling !=  myPtrs->currentRouterPtr->sampled) { */
+/*                syslog(LOG_INFO, */
+/*                       "2 sampling values for 1 /: %lu.%lu.%lu.%lu % from router %lu.%lu.%lu.%lu", */
+/*                       agCache.v4AdS>>24, */
+/*                       agCache.v4AdS<<8>>24, */
+/*                       agCache.v4AdS<<16>>24, */
+/*                       agCache.v4AdS<<24>>24, */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd>>24), */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)); */
+/*              } */
+/*            } else { */
                 /* doublon or bad reference in prefix list */
-                
-/*              fprintf(stderr, "IN NC: %lu.%lu.%lu.%lu/%hu -> %lu.%lu.%lu.%lu/%hu R:%lu.%lu.%lu.%lu \n", */
-/*                      (agCache.v4AdS>>24), */
-/*                      (agCache.v4AdS<<8>>24),  */
-/*                      (agCache.v4AdS<<16>>24),  */
-/*                      (agCache.v4AdS<<24>>24),  */
-/*                      (agCache.maskS),  */
-/*                      (agCache.v4AdD>>24),  */
-/*                      (agCache.v4AdD<<8>>24),  */
-/*                      (agCache.v4AdD<<16>>24),  */
-/*                      (agCache.v4AdD<<24>>24),  */
-/*                      (agCache.maskD),  */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd>>24),  */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd<<24>>24) */
-/*                      ); */
               }
             } else {
@@ -788 +812 @@
           if (pftmp->fieldType==34){
             if ((*((unsigned long*)&buffer4)==1) 
-                || (*((unsigned long*)&buffer4)==10) 
+                || (*((unsigned long*)&buffer4)==10)
+                || (*((unsigned long*)&buffer4)==100)
                 || (*((unsigned long*)&buffer4)==1000)) {
               if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
@@ -795 +820 @@
                         myPtrs->currentRouterPtr->sampled);
 #endif                     
+                syslog(LOG_INFO,"Sampling value change for router : %lu.%lu.%lu.%lu, old: %lu, new: %lu",
+                       (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24),
+                       myPtrs->currentRouterPtr->sampled,
+                       *((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);
-                  }
-                }
-              }
+              }
+            }else{
+              syslog(LOG_INFO,"Sampling value not standard for router : %lu.%lu.%lu.%lu",
+                     (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                     (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                     (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                     (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)
+                     );
             }
           }