Changeset 59 for trunk/src/dataFlowSet.c

Timestamp:

10/18/07 11:41:05 (15 years ago)

Author:

andreu

Message:

new aggregation method, based on SNMP index. New parameters in renetcolParam.h and new compilation options in configure.in.

Files:

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

trunk/src/dataFlowSet.c

@@ -132 +132 @@
       return (-1);
     }
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
     agCache.routerAd = myPtrs->pcktPtr->ipH->srcAdd; 
 #endif
@@ -192 +192 @@
               }
               /* end rule check */
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
               if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
                 agCache.maskS = *((unsigned char*)&buffer1);
@@ -221 +221 @@
                   == *((unsigned short*)&buffer2))
                 ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
               if (pftmp->fieldType==10){
                 agCache.inputSnmp = *((unsigned short*)&buffer2);
@@ -277 +277 @@
                   }
               }
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
               if ((pftmp->fieldType==8)){
                 bool = 1; /* very important, test if we have an IPv4 flow for Agg */
@@ -448 +448 @@
           buffer1 = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
           (*myPtrs->offsetV9Ptr)++;
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
           if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
             agCache.maskS = *((unsigned char*)&buffer1);
@@ -474 +474 @@
           buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
           (*myPtrs->offsetV9Ptr)++;
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
           if (pftmp->fieldType==10){
             agCache.inputSnmp = *((unsigned short*)&buffer2);
@@ -506 +506 @@
           buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
           (*myPtrs->offsetV9Ptr)++;
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
           if ((pftmp->fieldType==8)){
             bool = 1;
@@ -548 +548 @@
         /* Aggregation mode must be enable in ./configure options   */
         /* first we must know if the address belong to our prefix   */
-#ifdef IPV4AGG
+#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
         if ( (bool == 1) && (isMplsFlow == 0) ){
           prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS);
@@ -554 +554 @@
                         sizeof(struct PrefixV4), prefGlobalCmp);
           if (res!=NULL){
-/*          if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { */
+#if defined(IPV4AGGIDR)
+            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { 
+#elif defined(IPV4AGGIDSNMP)
             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) {
+#endif
+              if (myPtrs->currentRouterPtr->sampled != 0 ){
+                /* OUT ("traffic from the prefix/subnet")  */
+                res->bytesNbOUT += agCache.bytes;
+                res->pktsNbOUT += agCache.pkts;
+                (res->flowNbOUT)++;
+              }
+              if (res->sampling == 0 
+                  && myPtrs->currentRouterPtr->sampled != 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));
-              }
+              }
+#if defined(MATRIX) && defined(IPV4AGGIDR)
               /* inter-pop matrix Accounting */
               prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
@@ -603 +599 @@
               }
               /* end interpop matrix accounting */
+#endif /* matrix */
             } else {
               /* doublon or bad reference in prefix list */
@@ -612 +609 @@
             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)++;      
-/*            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)); */
-/*              } */
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the prefix/subnet")  */
+                  res->bytesNbIN += agCache.bytes;
+                  res->pktsNbIN += agCache.pkts;
+                  (res->flowNbIN)++;
+                }
+#if defined(IPV4AGGIDR) 
+              if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the prefix")  */
+                  res->bytesNbIN += agCache.bytes;
+                  res->pktsNbIN += agCache.pkts;
+                  (res->flowNbIN)++;
+                }
+#endif
+                if (res->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0 ){
+                  res->sampling = myPtrs->currentRouterPtr->sampled;
+                }
 /*            } else { */
                 /* doublon or bad reference in prefix list */
@@ -662 +655 @@
                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)
                       );
-#endif
+#endif /* PRINTUNKNOWNSUBNET */
             }
           }
@@ -668 +661 @@
         bool = 0;
         isMplsFlow = 0;
-#endif
+#endif /* (IPV4AGGIDR) || (IPV4AGGIDSNMP) */
         /* 
          * Redirection if needed 
@@ -831 +824 @@
               }
             }else{
-              syslog(LOG_INFO,"Sampling value not standard for router : %lu.%lu.%lu.%lu",
+              syslog(LOG_INFO,"Sampling value not standard for router : %lu.%lu.%lu.%lu, value : %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->pcktPtr->ipH->srcAdd<<24>>24),
+                     *((unsigned long*)&buffer4)
                      );
             }