Changeset 95 for trunk

Timestamp:

02/09/09 17:55:11 (14 years ago)

Author:

andreu

Message:

IPv6 link aggregation mode (first step : identify flows)

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• src/dataFlowSet.c (modified) (4 diffs)
• src/get_conf.c (modified) (1 diff)
• src/get_conf.h (modified) (1 diff)
• src/renetcol.c (modified) (9 diffs)
• src/renetcol.h (modified) (1 diff)
• src/renetcolAgg.h (modified) (1 diff)
• src/renetcolParam.h (modified) (1 diff)
• src/routers_mgmt.c (modified) (4 diffs)
• src/routers_mgmt.h (modified) (3 diffs)

trunk/configure.in

@@ -14 +14 @@
 CFLAGS_IPV4AGGIDSNMP="-DIPV4AGGIDSNMP"
 CFLAGS_IPV6AGGIDSNMP="-DIPV6AGGIDSNMP"
+CFLAGS_IPV6LINKAGG="-DIPV6LINKAGG"
 CFLAGS_IPV4AGGIDR="-DIPV4AGGIDR"
 CFLAGS_MATRIX="-DMATRIX"
@@ -64 +65 @@
 fi
 
-AC_ARG_ENABLE(ipv6aggidsnmp,[  --enable-ipv6aggidsnmp aggregation for IPv6 prefix, localisation based on SNMP ID=yes],
-ipv6aggidsnmp=$enableval,ipv6aggidsnmp=yes)
+AC_ARG_ENABLE(ipv6aggidsnmp,[  --enable-ipv6aggidsnmp aggregation for IPv6 prefix, localisation based on SNMP ID=no],
+ipv6aggidsnmp=$enableval,ipv6aggidsnmp=no)
 if test $ipv6aggidsnmp = yes ; then
 CFLAGS="$CFLAGS $CFLAGS_IPV6AGGIDSNMP"
+fi
+
+AC_ARG_ENABLE(ipv6linkagg,[  --enable-ipv6linkagg aggregation for IPv6 link agg (based on SNMP ID)=no],
+ipv6linkagg=$enableval,ipv6linkagg=no)
+if test $ipv6linkagg = yes ; then
+CFLAGS="$CFLAGS $CFLAGS_IPV6LINKAGG"
 fi
 

trunk/src/dataFlowSet.c

@@ -76 +76 @@
   struct AggCache agCache;
   int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
+  int isIPv6 = 0;
   /* flow, we test on the field and then put bool at 1 */
   int isMplsFlow = 0;
@@ -350 +351 @@
               break;
             case 16:
-              for (i=0; i<4; i++) {
-                buffer4[3]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
-                (*myPtrs->offsetV9Ptr)++;
-                buffer4[2]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
-                (*myPtrs->offsetV9Ptr)++;
-                buffer4[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
-                (*myPtrs->offsetV9Ptr)++;
-                buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
-                (*myPtrs->offsetV9Ptr)++;
-                if (1==moreIsNecessary){
-                  switch(i){
-                  case 0:
-                    if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 32){
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(32-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
+              if ((pftmp->fieldType==27)||(pftmp->fieldType==28)){
+                isIPv6 = 1;
+                for (i=0; i<4; i++) {
+                  buffer4[3]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+                  (*myPtrs->offsetV9Ptr)++;
+                  buffer4[2]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+                  (*myPtrs->offsetV9Ptr)++;
+                  buffer4[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+                  (*myPtrs->offsetV9Ptr)++;
+                  buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+                  (*myPtrs->offsetV9Ptr)++;
+                  if (1==moreIsNecessary){
+                    switch(i){
+                    case 0:
+                      if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 32){
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(32-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
+                            moreIsNecessary = 0;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
                           moreIsNecessary = 0;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                        }
+                      } else {
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                          moreIsNecessary = 0;
+                        }
+                      }
+                      break;
+                    case 1:
+                      if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 64){
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))>>(64-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(64-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check =
+                              ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
+                            moreIsNecessary = 0;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                          moreIsNecessary = 0;
+                        }
+                      } else {
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 
+                              ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                          moreIsNecessary = 0;
+                        }
+                      }
+                      break;
+                    case 2:
+                      if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 96){
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))>>(96-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(96-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check =
+                              ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
+                            moreIsNecessary = 0;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
                         moreIsNecessary = 0;
+                        }
+                      } else {
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 
+                              ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                          moreIsNecessary = 0;
+                        }
                       }
-                    } else {
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
+                      break;
+                    case 3:
+                      if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 128){
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))>>(128-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(128-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check =
+                              ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                          moreIsNecessary = 0;
+                        }
+                      } else {
+                        if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
+                            == 
+                            (*((unsigned long*)&buffer4))
+                            )
+                          {
+                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 
+                              ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
+                          } else {
+                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
+                          moreIsNecessary = 0;
+                        }
                       }
-                    }
-                    break;
-                  case 1:
-                    if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 64){
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))>>(64-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(64-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check =
-                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
-                          moreIsNecessary = 0;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
-                      }
-                    } else {
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 
-                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
-                      }
-                    }
-                    break;
-                  case 2:
-                    if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 96){
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))>>(96-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(96-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check =
-                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
-                          moreIsNecessary = 0;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
-                      }
-                    } else {
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 
-                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
-                      }
-                    }
-                    break;
-                  case 3:
-                    if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask <= 128){
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))>>(128-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(128-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check =
-                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
-                      }
-                    } else {
-                      if (ntohl(((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.tabAdd6[i]) 
-                          == 
-                          (*((unsigned long*)&buffer4))
-                          )
-                        {
-                          ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 
-                            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check && 1;
-                        } else {
-                        ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 0;
-                        moreIsNecessary = 0;
-                      }
-                    }
-                    break;
-                  default:
-                    break;
-                  } /* end of switch(i) */
-                } /* end of if moreIsNecessary */
-              }
-              moreIsNecessary = 1;
-              /* aggregation for IPv6 flows */
-
-              /* end aggregation */
+                      break;
+                    default:
+                      break;
+                    } /* end of switch(i) */
+                  } /* end of if moreIsNecessary */
+#if defined IPV6AGGIDSNMP
+                  if ((pftmp->fieldType==27)){
+                    agCache.tabAdd6S[i] = *((unsigned long*)&buffer4);
+                  } else if ((pftmp->fieldType==28)){
+                    agCache.tabAdd6D[i] = *((unsigned long*)&buffer4);
+                  }
+#endif
+                }
+                moreIsNecessary = 1;
+                /* aggregation for IPv6 flows */
+                
+                /* end aggregation */
+              } /* end of : if ((pftmp->fieldType==27)||(pftmp->fieldType==28)){ */
               break;
             default:
@@ -598 +609 @@
           break;
         case 16:
+          if ((pftmp->fieldType==27)||(pftmp->fieldType==28)){
+            isIPv6 = 1;
+          }
           for (i=0; i<4; i++) {
-            buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            buffer4[3]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
             (*myPtrs->offsetV9Ptr)++;
-            buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            buffer4[2]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
             (*myPtrs->offsetV9Ptr)++;
-            buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            buffer4[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
             (*myPtrs->offsetV9Ptr)++;
-            buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
             (*myPtrs->offsetV9Ptr)++;
-          }
-          /* aggregation IPv6 */          
-          /* end aggregation */
+#if defined IPV6AGGIDSNMP
+            if ((pftmp->fieldType==27)){
+              agCache.tabAdd6S[i] = *((unsigned long*)&buffer4);
+            } else if ((pftmp->fieldType==28)){
+              agCache.tabAdd6D[i] = *((unsigned long*)&buffer4);
+            }
+#endif
+          }
           break;
         default:
@@ -1065 +1084 @@
         } /* end of the prefix is in our list */
         bool = 0;
+#endif /* (IPV4AGGIDR) || (IPV4AGGIDSNMP) */
+#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;
+            }
+          }
+          ((struct IndexV6 *)((myPtrs->currentV6IndexTab)
+                              +((myPtrs->currentRouterPtr->ID)*ROUTER_INDEX_MAX)
+                              +(agCache.outputSnmp)))->bytesNbOUT = agCache.bytes;
+          isIPv6 = 0;
+          fprintf(stderr,"IPV6LINKAGG .%hu -> .%hu , router : %lu\n",
+                 agCache.inputSnmp,
+                 agCache.outputSnmp,
+                 myPtrs->currentRouterPtr->IpAddress
+                 );
+        }
+#endif /* IPV6LINKAGG */
         isMplsFlow = 0;
-#endif /* (IPV4AGGIDR) || (IPV4AGGIDSNMP) */
         /* 
          *

trunk/src/get_conf.c

@@ -701 +701 @@
       }
     }
-  qsort(prefixStrTab, prefixIndex, sizeof(struct PrefixV6), prefixV6Cmp);
+  qsort(pV6TabPtr, prefixIndex, sizeof(struct PrefixV6), prefixV6Cmp);
   if( fclose(prefixFile) == 0) {
     return (prefixIndex);

trunk/src/get_conf.h

@@ -76 +76 @@
 };
 
+struct IndexV6{
+  unsigned long routerIPAddress;
+  unsigned short indexSNMP; 
+  unsigned long long flowNbIN;  /* WARNING !!! */
+  unsigned long long bytesNbIN; /* Here, IN means "IN the equipement" */
+  unsigned long long pktsNbIN; 
+  unsigned long long flowNbOUT;
+  unsigned long long bytesNbOUT;
+  unsigned long long pktsNbOUT;
+};
+
 void initConf(char *);
 int longCmp(const void *, const void *);

trunk/src/renetcol.c

@@ -98 +98 @@
   int i,j;
   int k;
+  unsigned short routerIndex = 0;
 
 #if defined(IPV4AGGIDR)
@@ -108 +109 @@
 #if defined(IPV6AGGIDSNMP)
   fprintf(stderr, "renetcol compilation and execution with IPv6 Aggregation feature enable based on SNMP ID in %s file.\n", INTERFACES_TYPE_LIST);
+#endif
+#if defined(IPV6LINKAGG)
+  fprintf(stderr, "renetcol compilation and execution with IPv6 Links Aggregation.\n");
 #endif
   
@@ -123 +127 @@
   }
   /* Create the list of routers */
-  for (i=0; i<routerNb; i++){
-    routersListPtr = addRouter(routersListPtr, sortedRouterList[i]);
+  for (routerIndex=0; routerIndex<routerNb; routerIndex++){
+    routersListPtr = addRouter(routersListPtr, sortedRouterList[routerIndex],routerIndex);
   }
   
@@ -162 +166 @@
   }
 #if defined(IPV6AGGIDSNMP)
+fprintf(stderr, "ci0\n");
   if ( (shmForAgg->v6PrefixNb = 
         getPrefixV6(SUBNETS_V6_LIST, 
@@ -179 +184 @@
     exit(1);
   }
+fprintf(stderr, "ci00\n");
 #endif
 
@@ -230 +236 @@
     exit(4);
   }
-
+fprintf(stderr, " handler, SIGUSR1 from renetcolSender\n");
   /* handler, SIGUSR1 from renetcolSender */
   myAction.sa_handler = sigusr1Mgmt;
@@ -238 +244 @@
   sigaction (SIGUSR1, &myAction, NULL);
 
+fprintf(stderr, " Cache for fast rules access\n");
   /* Cache for fast rules access */
   setCache(myPtrs.rulesListPtr);
   myPtrs.rulesAddressPtr = (RuleDefPtr *)rulesAddress;
-
+fprintf(stderr, "IPC messages queue init\n");
   /* IPC messages queue init */
   myKey = createKey(argv[0]);
   myQueue = createQueue(myKey);
   sendMyPid(myQueue);
-
+fprintf(stderr, "get SNMP index information\n");
   /* get SNMP index information */
 #ifdef IPV4AGGIDSNMP
@@ -264 +271 @@
   myPtrs.currentV4Tab = shmForAgg->prefixV4Tab[shmForAgg->currentTable];
   myPtrs.secondV4Tab = shmForAgg->prefixV4Tab[shmForAgg->secondTable];
+#ifdef IPV6AGGIDSNMP
+fprintf(stderr, "ci1\n");
+  myPtrs.currentV6Tab = shmForAgg->prefixV6Tab[shmForAgg->currentTable];
+  myPtrs.secondV6Tab = shmForAgg->prefixV6Tab[shmForAgg->secondTable];
+#endif
+#ifdef IPV6LINKAGG
+fprintf(stderr, "ci2\n");
+  myPtrs.currentV6IndexTab = shmForAgg->indexV6Tab[shmForAgg->currentTable];
+  myPtrs.secondV6IndexTab = shmForAgg->indexV6Tab[shmForAgg->secondTable];
+fprintf(stderr, "ci3\n");
+#endif
 #ifdef ASACC
   myPtrs.asNb = shmForAgg->ASNb;
@@ -285 +303 @@
     }
   }
+#endif
+  /* INIT IPV6 index TABLES */
+#ifdef IPV6LINKAGG
+fprintf(stderr, "ci\n");
+  for (i=0; i<ROUTER_INDEX_MAX; i++){
+    for (j=0; j<MAX_INDEX_BY_ROUTER; j++) {
+      shmForAgg->indexV6Tab[0][i][j].bytesNbIN = 0;
+      shmForAgg->indexV6Tab[0][i][j].pktsNbIN = 0;
+      shmForAgg->indexV6Tab[0][i][j].flowNbIN = 0;
+      shmForAgg->indexV6Tab[1][i][j].bytesNbOUT = 0;
+      shmForAgg->indexV6Tab[1][i][j].pktsNbOUT = 0;
+      shmForAgg->indexV6Tab[1][i][j].flowNbOUT = 0;
+    }
+  }
+fprintf(stderr, "icci\n");
 #endif
 

trunk/src/renetcol.h

@@ -80 +80 @@
 #endif
   struct PrefixV6 prefixV6Tab[2][MAX_IPV6_PREFIX];
+#if defined(IPV6LINKAGG) && defined(IPV6AGGIDSNMP)
+  struct IndexV6 indexV6Tab[2][ROUTER_INDEX_MAX][MAX_INDEX_BY_ROUTER];
+#endif
 };
-
 
 void setCache(RulesPtr);

trunk/src/renetcolAgg.h

@@ -61 +61 @@
 #endif
  struct PrefixV6 prefixV6Tab[2][MAX_IPV6_PREFIX];
+#ifdef IPV6LINKAGG && IPV6AGGIDSNMP
+  struct IndexV6 indexV6Tab[2][ROUTER_INDEX_MAX][MAX_INDEX_BY_ROUTER];
+#endif
 }; 

trunk/src/renetcolParam.h

@@ -90 +90 @@
 
 /*
+ * maximum number of interfaces by router (one interface == one SNMP index)
+ */ 
+#define MAX_INDEX_BY_ROUTER 150 
+
+/*
  * Path to the rrd file
  */

trunk/src/routers_mgmt.c

@@ -39 +39 @@
 }
 
-RouterPtr addRouter(RouterPtr routersList, unsigned long address) 
+RouterPtr addRouter(RouterPtr routersList, unsigned long address, unsigned short id) 
 {
   RouterPtr tmp = (RouterPtr) malloc(sizeof(struct Router));
   if (tmp==NULL) {
-    syslog(LOG_ERR, "ERROR in malloc in add_routers function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addRouter function\n");
     exit(1);
   } else {
     tmp->IpAddress = address;
+    tmp->ID = id;
     tmp->tplList = NULL;
     tmp->tplOptList = NULL;
@@ -167 +168 @@
   unsigned long ipAddress;
   RouterPtr routerTmp = NULL;
+  unsigned short snmpIndex = 0;
+  unsigned short snmpCpt = 0;
 
   if (!(indexFile = fopen(filename, "r"))) {
@@ -198 +201 @@
         exit(1);
       }
+      snmpCpt = 0;
     }else{
       if ( strspn(line, "I") == 1 ) {
@@ -211 +215 @@
         if ( strcmp(tid, "B") == 0 ) {
           routerTmp->snmpIndexList[index] = 0;
+          routerTmp->snmpIndexID[snmpCpt] = index;
+          routerTmp->snmpIndexType[snmpCpt] = 0;
         } else if ( strcmp(tid, "C") == 0 ) {
           routerTmp->snmpIndexList[index] = 1;
+          routerTmp->snmpIndexID[snmpCpt] = index;
+          routerTmp->snmpIndexType[snmpCpt] = 1;
         } else {
           fprintf(stderr, "Error in file %s, line %d : bad code B or C \n", 

trunk/src/routers_mgmt.h

@@ -48 +48 @@
   TplOptionPtr tplOptList; /* list of the optional template definitions */
   unsigned long sampled; /* sampling value: (one for) 10, 100 or 1(full mode)*/
+  unsigned short ID;       /* internal ID */
 #ifdef IPV4AGGIDSNMP
   unsigned short snmpIndexList[MAX_SNMP_INDEX]; /* 0:Backbone, 1:Customer */
+  unsigned short snmpIndexType[MAX_INDEX_BY_ROUTER]; /* 0:Backbone, 1:Customer */
+  unsigned short snmpIndexID[MAX_INDEX_BY_ROUTER];
 #endif
   RouterPtr next;
@@ -72 +75 @@
   struct PrefixV4 *currentV4SubnetTab;
   struct PrefixV4 *secondV4SubnetTab;
+#ifdef IPV6AGGIDSNMP
+  struct PrefixV6 *currentV6Tab;
+  struct PrefixV6 *secondV6Tab;
+#endif
+#ifdef IPV6LINKAGG
+  struct IndexV6 *currentV6IndexTab;
+  struct IndexV6 *secondV6IndexTab;
+#endif
 #ifdef ASACC
   unsigned short asNb;
@@ -83 +94 @@
 
 RouterPtr notExistRouter(RouterPtr, unsigned long);
-RouterPtr addRouter(RouterPtr, unsigned long);
+RouterPtr addRouter(RouterPtr, unsigned long, unsigned short);
 RouterPtr updateRouter(RouterPtr, unsigned long, unsigned long);
 TplFlowSetPtr newRouterTplList();