Changeset 96 for trunk/src

Timestamp:

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

Author:

andreu

Message:

IPV6 links aggregation UP

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (1 diff)
• get_conf.h (modified) (1 diff)
• renetcol.c (modified) (10 diffs)
• renetcolAgg.c (modified) (4 diffs)
• renetcolAgg.h (modified) (1 diff)
• renetcolParam.h (modified) (2 diffs)
• routers_mgmt.c (modified) (4 diffs)
• routers_mgmt.h (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 */

trunk/src/get_conf.h

@@ -78 +78 @@
 struct IndexV6{
   unsigned long routerIPAddress;
+  unsigned short hasStats;
   unsigned short indexSNMP; 
+  unsigned long sampling;
   unsigned long long flowNbIN;  /* WARNING !!! */
   unsigned long long bytesNbIN; /* Here, IN means "IN the equipement" */

trunk/src/renetcol.c

@@ -101 +101 @@
 
 #if defined(IPV4AGGIDR)
-  fprintf(stderr, "renetcol compilation and execution with IPv4 Aggregation feature enable based on routers ID in %s file.\n", ROUTERS_LIST);
+  fprintf(stderr, "renetcol compilation and execution with IPv4 Prefixes Aggregation feature enable based on routers ID in %s file.\n", ROUTERS_LIST);
 #endif
 
 #if defined(IPV4AGGIDSNMP)
-  fprintf(stderr, "renetcol compilation and execution with IPv4 Aggregation feature enable based on SNMP ID in %s file.\n", INTERFACES_TYPE_LIST);
+  fprintf(stderr, "renetcol compilation and execution with IPv4 Prefixes Aggregation feature enable based on SNMP ID in %s file.\n", INTERFACES_TYPE_LIST);
 #endif
 #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);
+  fprintf(stderr, "renetcol compilation and execution with IPv6 Prefixes Aggregation feature enable based on SNMP ID in %s file.\n", INTERFACES_TYPE_LIST);
 #endif
 #if defined(IPV6LINKAGG)
@@ -166 +166 @@
   }
 #if defined(IPV6AGGIDSNMP)
-fprintf(stderr, "ci0\n");
   if ( (shmForAgg->v6PrefixNb = 
         getPrefixV6(SUBNETS_V6_LIST, 
@@ -184 +183 @@
     exit(1);
   }
-fprintf(stderr, "ci00\n");
 #endif
 
@@ -236 +234 @@
     exit(4);
   }
-fprintf(stderr, " handler, SIGUSR1 from renetcolSender\n");
   /* handler, SIGUSR1 from renetcolSender */
   myAction.sa_handler = sigusr1Mgmt;
@@ -244 +241 @@
   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
@@ -272 +266 @@
   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
@@ -306 +297 @@
   /* 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].hasStats = 0;
+      shmForAgg->indexV6Tab[0][i][j].sampling = 0;
       shmForAgg->indexV6Tab[0][i][j].bytesNbIN = 0;
       shmForAgg->indexV6Tab[0][i][j].pktsNbIN = 0;
       shmForAgg->indexV6Tab[0][i][j].flowNbIN = 0;
+      shmForAgg->indexV6Tab[0][i][j].bytesNbOUT = 0;
+      shmForAgg->indexV6Tab[0][i][j].pktsNbOUT = 0;
+      shmForAgg->indexV6Tab[0][i][j].flowNbOUT = 0;
+      shmForAgg->indexV6Tab[1][i][j].hasStats = 0;
+      shmForAgg->indexV6Tab[1][i][j].sampling = 0;
+      shmForAgg->indexV6Tab[1][i][j].bytesNbIN = 0;
+      shmForAgg->indexV6Tab[1][i][j].pktsNbIN = 0;
+      shmForAgg->indexV6Tab[1][i][j].flowNbIN = 0;
       shmForAgg->indexV6Tab[1][i][j].bytesNbOUT = 0;
       shmForAgg->indexV6Tab[1][i][j].pktsNbOUT = 0;
@@ -317 +317 @@
     }
   }
-fprintf(stderr, "icci\n");
 #endif
 
@@ -508 +507 @@
   int gardeFou = 0;
   time_t lastIPOutput, lastMPLSOutput;
+  RouterPtr tmp = routersListPtr;  
+  int dd = 0;
+  FILE *TPLFILE;
 
   now = time((time_t *)NULL);
@@ -533 +535 @@
 #ifdef MATRIX
       myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
+#endif
+#ifdef IPV6LINKAGG
+      myPtrs.currentV6IndexTab = &(shmForAgg->indexV6Tab[shmForAgg->currentTable][0][0]);
+      myPtrs.secondV6IndexTab = &(shmForAgg->indexV6Tab[shmForAgg->secondTable][0][0]);
+      if (!(TPLFILE = fopen("/tmp/IPV6LINKAGG.txt", "w"))) {
+        syslog (LOG_ERR, "error during %s opening", "/tmp/IPV6LINKAGG.txt");
+      }
+      tmp = routersListPtr;
+      for (; tmp; tmp=tmp->next) {
+        for (dd=0;dd<MAX_INDEX_BY_ROUTER;dd++) {
+          if ( tmp->snmpIndexType[dd] != 2) {
+            fprintf(TPLFILE,
+                    "router: %lu.%lu.%lu.%lu dd: %hu , indexSNMP : %hu , type : %hu ,total bytes IN : %llu, OUT : %llu\n",
+                    (tmp->IpAddress>>24),
+                    (tmp->IpAddress<<8>>24),
+                    (tmp->IpAddress<<16>>24),
+                    (tmp->IpAddress<<24>>24),
+                    dd,
+                    tmp->snmpIndexID[dd],
+                    tmp->snmpIndexType[dd],
+                    ((struct IndexV6 *)((myPtrs.secondV6IndexTab)
+                                        +((tmp->ID)*ROUTER_INDEX_MAX)
+                                        +(tmp->snmpIndexID[dd])))->bytesNbIN,
+                    ((struct IndexV6 *)((myPtrs.secondV6IndexTab)
+                                        +((tmp->ID)*ROUTER_INDEX_MAX)
+                                        +(tmp->snmpIndexID[dd])))->bytesNbOUT
+                    ); 
+          }
+        }
+      }
+      fclose(TPLFILE);
 #endif
     }

trunk/src/renetcolAgg.c

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2007 GIP RENATER 
+ * Copyright (C) 2007 - 2009 GIP RENATER 
  */
 
@@ -53 +53 @@
   static char name[2048];
   static char ipStr[24];
+#ifdef IPV6LINKAGG
+  static char ipv6LinkStr[40]; /* 10_0_0_1_20_136 <router address> + <sampling> + <SNMP index> */
+#endif
 #if defined(MATRIX) && defined(IPV4AGGIDR)
   static char indexStr[24];
@@ -596 +599 @@
           }
         }
+#ifdef IPV6LINKAGG
+        /* 
+         *
+         * IPv6 Links ACCOUNTING 
+         *
+         */
+        for (i=0; i<ROUTER_INDEX_MAX; i++){
+          for (j=0; j<MAX_INDEX_BY_ROUTER; j++) {
+          /* HERE create or update RRD FILE for IPV6 LINKs AGGregation */
+            if (shmForAgg->indexV6Tab[index][i][j].hasStats == 1) {
+              for (k=0; k<strlen(name); k++) {name[k] = '\0';}
+              for (k=0; k<strlen(createstr); k++) {createstr[k] = '\0';}
+              for (k=0; k<strlen(ipv6LinkStr); k++) {ipv6LinkStr[k] = '\0';}
+              for (k=0; k<strlen(buf); k++) {buf[k] = '\0';}
+              strcat(name, SNMP_INDEX_RRD_LOCATION);
+              sprintf(ipv6LinkStr, "%lu_%lu_%lu_%lu_%hu_%hu", 
+                      shmForAgg->indexV6Tab[index][i][j].routerIPAddress>>24,
+                      shmForAgg->indexV6Tab[index][i][j].routerIPAddress<<8>>24,
+                      shmForAgg->indexV6Tab[index][i][j].routerIPAddress<<16>>24,
+                      shmForAgg->indexV6Tab[index][i][j].routerIPAddress<<24>>24,
+                      (unsigned short) 1,
+                      shmForAgg->indexV6Tab[index][i][j].indexSNMP
+                      );
+              strcat(name, ipv6LinkStr);
+              strcat(name, RRD_EXTENSION);
+              if ( (fp=fopen(name,"r")) == NULL ){
+                opt[0]= (char *) malloc((strlen(RRD_PARAM_INDEX_0) + 1) * sizeof(char));
+                strcpy(opt[0], RRD_PARAM_INDEX_0);
+                opt[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
+                strcpy(opt[1], name);
+                opt[2]= (char *) malloc((strlen(RRD_PARAM_INDEX_1) + 1) * sizeof(char));
+                strcpy(opt[2], RRD_PARAM_INDEX_1);
+                opt[3]= (char *) malloc((strlen(RRD_PARAM_INDEX_2) + 1) * sizeof(char));
+                strcpy(opt[3], RRD_PARAM_INDEX_2);
+                opt[4]= (char *) malloc((strlen(RRD_PARAM_INDEX_3) + 1) * sizeof(char));
+                strcpy(opt[4], RRD_PARAM_INDEX_3);
+                opt[5]= (char *) malloc((strlen(RRD_PARAM_INDEX_4) + 1) * sizeof(char));
+                strcpy(opt[5], RRD_PARAM_INDEX_4);
+                opt[6]= (char *) malloc((strlen(RRD_PARAM_INDEX_5) + 1) * sizeof(char));
+                strcpy(opt[6], RRD_PARAM_INDEX_5);
+                opt[7]= (char *) malloc((strlen(RRD_PARAM_INDEX_6) + 1) * sizeof(char));
+                strcpy(opt[7], RRD_PARAM_INDEX_6);
+                opt[8]= (char *) malloc((strlen(RRD_PARAM_INDEX_7) + 1) * sizeof(char));
+                strcpy(opt[8], RRD_PARAM_INDEX_7);
+                opt[9]= (char *) malloc((strlen(RRD_PARAM_INDEX_8) + 1) * sizeof(char));
+                strcpy(opt[9], RRD_PARAM_INDEX_8);
+                opt[10]= (char *) malloc((strlen(RRD_PARAM_INDEX_9) + 1) * sizeof(char));
+                strcpy(opt[10], RRD_PARAM_INDEX_9);
+                opt[11]= (char *) malloc((strlen(RRD_PARAM_INDEX_10) + 1) * sizeof(char));
+                strcpy(opt[11], RRD_PARAM_INDEX_10);
+                opt[12]= (char *) malloc((strlen(RRD_PARAM_INDEX_11) + 1) * sizeof(char));
+                strcpy(opt[12], RRD_PARAM_INDEX_11);
+                opt[13]= (char *) malloc((strlen(RRD_PARAM_INDEX_12) + 1) * sizeof(char));
+                strcpy(opt[13], RRD_PARAM_INDEX_12);
+                opt[14]= (char *) malloc((strlen(RRD_PARAM_INDEX_13) + 1) * sizeof(char));
+                strcpy(opt[14], RRD_PARAM_INDEX_13);
+                opt[15]= (char *) malloc((strlen(RRD_PARAM_INDEX_14) + 1) * sizeof(char));
+                strcpy(opt[15], RRD_PARAM_INDEX_14);
+                opt[16]= (char *) malloc((strlen(RRD_PARAM_INDEX_15) + 1) * sizeof(char));
+                strcpy(opt[16], RRD_PARAM_INDEX_15);
+                opt[17]= (char *) malloc((strlen(RRD_PARAM_INDEX_16) + 1) * sizeof(char));
+                strcpy(opt[17], RRD_PARAM_INDEX_16);
+                opt[18]= (char *) malloc((strlen(RRD_PARAM_INDEX_17) + 1) * sizeof(char));
+                strcpy(opt[18], RRD_PARAM_INDEX_17);
+                optind = opterr = 0;
+                rrd_clear_error();
+                if ( rrd_create(19,opt) < 0) {
+                  syslog(LOG_ERR, "RRD create file %s, error: %s\n", name, rrd_get_error());
+                  rrd_create_er_ct++;
+                } else {
+                  rrd_create_ok_ct++;
+                }
+                for ( k=0; k<19; k++) {
+                  free(opt[k]);
+                  opt[k] = NULL;
+                }
+              }else{ 
+                fclose(fp);
+                rrd_already_created_ct++;
+                snprintf(buf, 
+                         2048, 
+                         "%lu:%llu:%llu:%llu:%llu:%llu:%llu",  
+                         now-300,  /* or ctime(&now) with %s */
+                         shmForAgg->indexV6Tab[index][i][j].flowNbIN,  /* 1 */
+                         shmForAgg->indexV6Tab[index][i][j].flowNbOUT,
+                         shmForAgg->indexV6Tab[index][i][j].bytesNbIN,
+                         shmForAgg->indexV6Tab[index][i][j].bytesNbOUT,
+                         shmForAgg->indexV6Tab[index][i][j].pktsNbIN,  /* 5 */
+                         shmForAgg->indexV6Tab[index][i][j].pktsNbOUT
+                         );
+                optUpdate[0]= (char *) malloc((strlen(RRD_UPDATE_0) + 1) * sizeof(char));
+                strcpy(optUpdate[0], RRD_UPDATE_0);
+                optUpdate[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
+                strcpy(optUpdate[1], name);
+                optUpdate[2]= (char *) malloc((strlen(buf) + 1) * sizeof(char));
+                strcpy(optUpdate[2], buf);
+                optind = opterr = 0; 
+                rrd_clear_error();
+                if ( rrd_update(3, optUpdate) < 0 ) { 
+                  syslog(LOG_ERR, "RRD update file %s, error: %s\n", name, rrd_get_error());
+                  rrd_update_er_ct++;
+                } else {
+                  rrd_update_ok_ct++;
+                }
+                for ( k=0; k<3; k++) {
+                  free(optUpdate[k]);
+                  optUpdate[k] = NULL;
+                }
+              }
+              shmForAgg->indexV6Tab[index][i][j].bytesNbIN = 0;
+              shmForAgg->indexV6Tab[index][i][j].pktsNbIN = 0;
+              shmForAgg->indexV6Tab[index][i][j].flowNbIN = 0;
+              shmForAgg->indexV6Tab[index][i][j].bytesNbOUT = 0;
+              shmForAgg->indexV6Tab[index][i][j].pktsNbOUT = 0;
+              shmForAgg->indexV6Tab[index][i][j].flowNbOUT = 0;
+            }
+          }
+        }
+#endif
 #endif /* AS */
         now2 = time((time_t *)NULL);
@@ -669 +791 @@
         }
 #endif
+#ifdef IPV6LINKAGG
+        for (i=0; i<ROUTER_INDEX_MAX; i++){
+          for (j=0; j<MAX_INDEX_BY_ROUTER; j++) {
+            shmForAgg->indexV6Tab[index][i][j].bytesNbIN = 0;
+            shmForAgg->indexV6Tab[index][i][j].pktsNbIN = 0;
+            shmForAgg->indexV6Tab[index][i][j].flowNbIN = 0;
+            shmForAgg->indexV6Tab[index][i][j].bytesNbOUT = 0;
+            shmForAgg->indexV6Tab[index][i][j].pktsNbOUT = 0;
+            shmForAgg->indexV6Tab[index][i][j].flowNbOUT = 0;
+          }
+        }
+#endif
       } /* end is first update */ 
     } /* end read ok */

trunk/src/renetcolAgg.h

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

trunk/src/renetcolParam.h

@@ -100 +100 @@
 #define MATRIX_RRD_LOCATION "/mnt/data/RRD/RENATER/MATRIX/"
 #define AS_RRD_LOCATION "/mnt/data/RRD/RENATER/AS/"
+#define SNMP_INDEX_RRD_LOCATION "/mnt/data/RRD/RENATER/SNMP_INDEX/"
 
 /*
@@ -178 +179 @@
 #define RRD_PARAM_AS_16 "RRA:MAX:0.5:24:1550"
 #define RRD_PARAM_AS_17 "RRA:MAX:0.5:288:1594"
+#define RRD_PARAM_INDEX_0 "rrdcreate"
+#define RRD_PARAM_INDEX_1 "--start"
+#define RRD_PARAM_INDEX_2 "1106560200"
+#define RRD_PARAM_INDEX_3 "--step"
+#define RRD_PARAM_INDEX_4 "300"
+#define RRD_PARAM_INDEX_5 "DS:inFlows:GAUGE:600:U:U"
+#define RRD_PARAM_INDEX_6 "DS:outFlows:GAUGE:600:U:U"
+#define RRD_PARAM_INDEX_7 "DS:inBytes:GAUGE:600:U:U"
+#define RRD_PARAM_INDEX_8 "DS:outBytes:GAUGE:600:U:U"
+#define RRD_PARAM_INDEX_9 "DS:inPkts:GAUGE:600:U:U"
+#define RRD_PARAM_INDEX_10 "DS:outPkts:GAUGE:600:U:U"
+#define RRD_PARAM_INDEX_11 "RRA:AVERAGE:0.5:1:2100"
+#define RRD_PARAM_INDEX_12 "RRA:AVERAGE:0.5:24:1550"
+#define RRD_PARAM_INDEX_13 "RRA:AVERAGE:0.5:288:1594"
+#define RRD_PARAM_INDEX_14 "RRA:AVERAGE:0.5:2016:1040"
+#define RRD_PARAM_INDEX_15 "RRA:MAX:0.5:1:2100"
+#define RRD_PARAM_INDEX_16 "RRA:MAX:0.5:24:1550"
+#define RRD_PARAM_INDEX_17 "RRA:MAX:0.5:288:1594"
 #define RRD_UPDATE_0 "rrdupdate"
 #define RECEPT_PORT "52571"

trunk/src/routers_mgmt.c

@@ -164 +164 @@
   char tad[16];
   int index = 0;
+  int i = 0;
   unsigned short n0, n1, n2, n3;
   unsigned char buffer4[4];
@@ -201 +202 @@
         exit(1);
       }
+      for (i=0; i<MAX_INDEX_BY_ROUTER; i++) {
+        routerTmp->snmpIndexType[i] = 2;
+        routerTmp->snmpIndexID[i] = 0;
+      }      
       snmpCpt = 0;
     }else{
+      if (snmpCpt==0){
+        routerTmp->snmpIndexType[0] = 1;
+        routerTmp->snmpIndexID[0] = 0;
+        snmpCpt++;
+      }
       if ( strspn(line, "I") == 1 ) {
         if (sscanf(line, "%s %s %s\n",
@@ -217 +227 @@
           routerTmp->snmpIndexID[snmpCpt] = index;
           routerTmp->snmpIndexType[snmpCpt] = 0;
+/*        fprintf(stderr, "snmpCpt %hu --> 0 \n", snmpCpt); */
         } else if ( strcmp(tid, "C") == 0 ) {
           routerTmp->snmpIndexList[index] = 1;
           routerTmp->snmpIndexID[snmpCpt] = index;
           routerTmp->snmpIndexType[snmpCpt] = 1;
+/*        fprintf(stderr, "snmpCpt %hu --> 1 , indexSNMP: %hu\n", snmpCpt, index); */
         } else {
           fprintf(stderr, "Error in file %s, line %d : bad code B or C \n", 
@@ -226 +238 @@
           exit(1);
         }
+        snmpCpt++;
       } else {
         fprintf(stderr, "Error in file %s, line %d : bad index line \n", 

trunk/src/routers_mgmt.h

@@ -47 +47 @@
   TplFlowSetPtr tplList;   /* list of the template definition */
   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 */
+  unsigned long sampled;   /* sampling value: (one for) 10, 100 or 1(full mode)*/
+  unsigned short ID;       /* internal ID, create during routers file reading */
 #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];
+  unsigned short snmpIndexList[MAX_SNMP_INDEX];      /* 0:Backbone, 1:Customer */
+  unsigned short snmpIndexType[MAX_INDEX_BY_ROUTER]; /* 0:Backbone, 1:Customer use rtr ID*/
+  unsigned short snmpIndexID[MAX_INDEX_BY_ROUTER];   /* use ID , router ID */
 #endif
   RouterPtr next;