Changeset 97

Timestamp:

04/15/09 10:12:27 (14 years ago)

Author:

andreu

Message:

Rename old releases and update current

Files:

• tags/renetcol-0.0.10 (moved) (moved from tags/REL-0.0.10)
• tags/renetcol-0.0.11 (moved) (moved from tags/REL-0.0.11)
• tags/renetcol-0.0.11beta (moved) (moved from tags/REL-0.0.11beta)
• tags/renetcol-0.0.12 (moved) (moved from tags/REL-0.0.12)
• tags/renetcol-0.0.12a (moved) (moved from tags/REL-0.0.12a)
• tags/renetcol-0.0.13 (moved) (moved from tags/REL-0.0.13)
• tags/renetcol-0.0.2 (moved) (moved from tags/v0_0_2)
• tags/renetcol-0.0.9beta (moved) (moved from tags/REL-0.0.9beta)
• trunk/README (modified) (1 diff)
• trunk/src/dataFlowSet.c (modified) (1 diff)
• trunk/src/renetcol.c (modified) (2 diffs)

trunk/README

@@ -30 +30 @@
 
    - create your IPv4 prefix/subnet file (or keep the default for test: 
-IPv4_prefix.txt). If you don't need aggregation you can keed the default 
+conf/IPv4_prefix.txt). If you don't need aggregation you can keed the default 
 and select "--enable-ipv4agg=no" in configure procedure
    

trunk/src/dataFlowSet.c

@@ -1088 +1088 @@
         if ( ( isIPv6 == 1 ) && (isMplsFlow == 0) ){
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.inputSnmp)))->routerIPAddress = myPtrs->currentRouterPtr->IpAddress;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
+                              +(agCache.outputSnmp)))->routerIPAddress = myPtrs->currentRouterPtr->IpAddress;
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.inputSnmp)))->indexSNMP = agCache.inputSnmp;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.outputSnmp)))->indexSNMP = agCache.outputSnmp; 
           /* FIXME, error or warning if (indexSNMP != agCache.outputSnmp) */
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.inputSnmp)))->hasStats = 1;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.outputSnmp)))->hasStats = 1;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.inputSnmp)))->bytesNbIN += agCache.bytes;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.outputSnmp)))->bytesNbOUT += agCache.bytes;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.inputSnmp)))->pktsNbIN += agCache.pkts;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.outputSnmp)))->pktsNbOUT += agCache.pkts;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.inputSnmp)))->flowNbIN++;
           ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
-                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +((myPtrs->currentRouterPtr->ID)*MAX_INDEX_BY_ROUTER)
                               +(agCache.outputSnmp)))->flowNbOUT++;
           isIPv6 = 0;

trunk/src/renetcol.c

@@ -1 @@
-/*
+*/*
  * File: renetcol.c
  * 
@@ -556 +556 @@
                     tmp->snmpIndexType[dd],
                     ((struct IndexV6 *)((myPtrs.secondV6IndexTab)
-                                        +((tmp->ID)*ROUTER_INDEX_MAX)
+                                        +((tmp->ID)*MAX_INDEX_BY_ROUTER)
                                         +(tmp->snmpIndexID[dd])))->bytesNbIN,
                     ((struct IndexV6 *)((myPtrs.secondV6IndexTab)
-                                        +((tmp->ID)*ROUTER_INDEX_MAX)
+                                        +((tmp->ID)*MAX_INDEX_BY_ROUTER)
                                         +(tmp->snmpIndexID[dd])))->bytesNbOUT
                     );