Changeset 60 for trunk/src/dataFlowSet.c

Timestamp:

10/25/07 07:23:46 (15 years ago)

Author:

andreu

Message:

new aggregation mode based on SNMP index and AS aggregation

Files:

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

trunk/src/dataFlowSet.c

@@ -66 +66 @@
   unsigned short tplMsgType = 11;
   struct PrefixV4 prefixKey, *res, *res2; /* for bsearch */
+#if defined(IPV4AGGIDSNMP)
+  struct PrefixV4 *res3;
+#endif
+#ifdef ASACC
+  struct AS asKey, *asres; /* for bsearch */
+#endif
   struct AggCache agCache;
   int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
@@ -229 +235 @@
               }
 #endif
+#ifdef ASACC
+              if (pftmp->fieldType==16){
+                agCache.asS = *((unsigned short*)&buffer2);
+              }   
+              if (pftmp->fieldType==17){
+                agCache.asD = *((unsigned short*)&buffer2);
+              }
+#endif
               break;
             case 3:
@@ -482 +496 @@
           }       
 #endif
+#ifdef ASACC
+          if (pftmp->fieldType==16){
+            agCache.asS = *((unsigned short*)&buffer2);
+          }       
+          if (pftmp->fieldType==17){
+            agCache.asD = *((unsigned short*)&buffer2);
+          }
+#endif
           break;
         case 3:
@@ -548 +570 @@
         /* Aggregation mode must be enable in ./configure options   */
         /* first we must know if the address belong to our prefix   */
+        /*
+         * AS ACCOUNTING
+         */
+#if defined(ASACC) && defined(IPV4AGGIDSNMP)
+        if ( (bool == 1) && (isMplsFlow == 0) ){
+          asKey.as = agCache.asS;
+          asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
+          if (asres != NULL) {
+            if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {         
+              if (myPtrs->currentRouterPtr->sampled != 0 ){
+                /* OUT ("traffic from the AS")  */
+                asres->bytesNbOUT += agCache.bytes;
+                asres->pktsNbOUT += agCache.pkts;
+                (asres->flowNbOUT)++;
+              }
+              if (asres->sampling == 0 
+                  && myPtrs->currentRouterPtr->sampled != 0){
+                asres->sampling = myPtrs->currentRouterPtr->sampled;
+              }
+              asres = NULL;
+              asKey.as = agCache.asD;
+              asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
+              if (asres!=NULL){
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the AS")  */
+                  asres->bytesNbIN += agCache.bytes;
+                  asres->pktsNbIN += agCache.pkts;
+                  (asres->flowNbIN)++;
+                }
+                if (asres->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0){
+                  asres->sampling = myPtrs->currentRouterPtr->sampled;
+                }
+                asres = NULL;
+              }
+            }
+          } else {
+            asres = NULL;
+            asKey.as = agCache.asD;
+            asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
+            if (asres!=NULL){
+              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the AS")  */
+                  asres->bytesNbIN += agCache.bytes;
+                  asres->pktsNbIN += agCache.pkts;
+                  (asres->flowNbIN)++;
+                }
+                if (asres->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0){
+                  asres->sampling = myPtrs->currentRouterPtr->sampled;
+                }
+              }
+            }
+          }
+        }
+#endif
+        /*
+         * PREFIX &/or MATRIX ACCOUNTING
+         */
 #if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
         if ( (bool == 1) && (isMplsFlow == 0) ){
@@ -569 +651 @@
                 res->sampling = myPtrs->currentRouterPtr->sampled;
               }
+#if defined(IPV4AGGIDSNMP)
+              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
+              res3 = bsearch(&prefixKey, V4PTab, nbPV4, 
+                             sizeof(struct PrefixV4), prefGlobalCmp);
+              if (res3!=NULL){
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the prefix/subnet")  */
+                  res3->bytesNbIN += agCache.bytes;
+                  res3->pktsNbIN += agCache.pkts;
+                  (res3->flowNbIN)++;
+                }
+                if (res3->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0){
+                  res3->sampling = myPtrs->currentRouterPtr->sampled;
+                }
+              }
+#endif
 #if defined(MATRIX) && defined(IPV4AGGIDR)
               /* inter-pop matrix Accounting */
@@ -603 +702 @@
               /* doublon or bad reference in prefix list */
             }
-          } else {
+          } else { /* 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){
-              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
+              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the prefix/subnet")  */
@@ -628 +727 @@
                   res->sampling = myPtrs->currentRouterPtr->sampled;
                 }
-/*            } else { */
+              } else {
                 /* doublon or bad reference in prefix list */
               }
             } else {
+              /* UNKNOW SUBNET CASE                                        */
+              /*                                                           */
               /* HERE : we are in the cases of the address/mask don't      */
               /*        belong to a prefix listed in the IPv4 prefix file  */
@@ -663 +764 @@
 #endif /* (IPV4AGGIDR) || (IPV4AGGIDSNMP) */
         /* 
-         * Redirection if needed 
+         *
+         * SOCKET OUTPUT TO A REMOTE CLIENT
+         *
          * switch the rules definition (check & fieldToRecord), 
          * we send the flow or a part of the flow to a remote host or a file.
@@ -772 +875 @@
      *
      *
-     *       Optional template
+     *  OPTIONAL TEMPLATE
      *
      *