Changeset 96 for trunk/src/dataFlowSet.c

Timestamp:

02/12/09 17:54:45 (14 years ago)

Author:

andreu

Message:

IPV6 links aggregation UP

Files:

• trunk/src/dataFlowSet.c (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -1087 +1087 @@
 #ifdef IPV6LINKAGG
         if ( ( isIPv6 == 1 ) && (isMplsFlow == 0) ){
-          for (i=0; i<MAX_INDEX_BY_ROUTER; i++){ /* FIXME : to optimized */
-            if (agCache.inputSnmp == myPtrs->currentRouterPtr->snmpIndexID[i] ) {
-              break;
-            }
-          }
-          /* FIXME : here we need to make two case switch sampling values !!! */
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
                               +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
-                              +(agCache.inputSnmp)))->bytesNbIN = agCache.bytes;
-          for (i=0; i<MAX_INDEX_BY_ROUTER; i++){ /* FIXME : to optimized */
-            if (agCache.outputSnmp == myPtrs->currentRouterPtr->snmpIndexID[i] ) {
-              break;
-            }
-          }
+                              +(agCache.inputSnmp)))->routerIPAddress = myPtrs->currentRouterPtr->IpAddress;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
                               +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
-                              +(agCache.outputSnmp)))->bytesNbOUT = agCache.bytes;
+                              +(agCache.inputSnmp)))->indexSNMP = agCache.inputSnmp;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.outputSnmp)))->indexSNMP = agCache.outputSnmp; 
+          /* FIXME, error or warning if (indexSNMP != agCache.outputSnmp) */
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.inputSnmp)))->hasStats = 1;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.outputSnmp)))->hasStats = 1;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.inputSnmp)))->bytesNbIN += agCache.bytes;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.outputSnmp)))->bytesNbOUT += agCache.bytes;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.inputSnmp)))->pktsNbIN += agCache.pkts;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.outputSnmp)))->pktsNbOUT += agCache.pkts;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.inputSnmp)))->flowNbIN++;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.outputSnmp)))->flowNbOUT++;
           isIPv6 = 0;
-          fprintf(stderr,"IPV6LINKAGG .%hu -> .%hu , router : %lu\n",
-                 agCache.inputSnmp,
-                 agCache.outputSnmp,
-                 myPtrs->currentRouterPtr->IpAddress
-                 );
+/*        fprintf(stderr,"IPV6LINKAGG;IN;%hu;OUT;%hu;router;%lu;bytes;%lu\n", */
+/*                agCache.inputSnmp, */
+/*                agCache.outputSnmp, */
+/*                myPtrs->currentRouterPtr->IpAddress, */
+/*                agCache.bytes */
+/*               ); */
         }
 #endif /* IPV6LINKAGG */