Changeset 61 for trunk/src/dataFlowSet.c

Timestamp:

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

Author:

andreu

Message:

tickets 12,19 & 20 closed

Files:

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

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 ){