Changeset 58 for trunk/src

Timestamp:

10/09/07 12:01:26 (15 years ago)

Author:

andreu

Message:

new aggregation method, new configuration files, corrections on the php script for graph generation.

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (7 diffs)
• dataFlowSet.h (modified) (1 diff)
• renetcol.c (modified) (12 diffs)
• renetcolAgg.c (modified) (1 diff)
• renetcolParam.h (modified) (1 diff)
• renetcolSender.c (modified) (7 diffs)
• routers_mgmt.c (modified) (3 diffs)
• routers_mgmt.h (modified) (3 diffs)

trunk/src/dataFlowSet.c

@@ -153 +153 @@
       field_size = (int) pftmp->fieldLength;
       
-      /* special case: check yes on all flows from one router (phantom field nb 0) */
+      /* special case: check yes on all flows from one router */
+      /* (phantom field nb 0) */
       /* FIXME : this code is repeated, perhaps past before */
       while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {
@@ -222 +223 @@
 #ifdef IPV4AGG
               if (pftmp->fieldType==10){
-                agCache.idSnmp = *((unsigned short*)&buffer2);
+                agCache.inputSnmp = *((unsigned short*)&buffer2);
+              }
+              if (pftmp->fieldType==14){
+                agCache.outputSnmp = *((unsigned short*)&buffer2);
               }
 #endif
@@ -472 +476 @@
 #ifdef IPV4AGG
           if (pftmp->fieldType==10){
-            agCache.idSnmp = *((unsigned short*)&buffer2);
+            agCache.inputSnmp = *((unsigned short*)&buffer2);
+          }       
+          if (pftmp->fieldType==14){
+            agCache.outputSnmp = *((unsigned short*)&buffer2);
           }       
 #endif
@@ -547 +554 @@
                         sizeof(struct PrefixV4), prefGlobalCmp);
           if (res!=NULL){
-            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+/*          if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { */
+            if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {         
               /* OUT ("traffic from the prefix/subnet")  */
               res->bytesNbOUT += agCache.bytes;
               res->pktsNbOUT += agCache.pkts;
               (res->flowNbOUT)++;
+              if (res->sampling == 0) {
+                res->sampling = myPtrs->currentRouterPtr->sampled;
+              } else if (res->sampling != myPtrs->currentRouterPtr->sampled) {
+                syslog(LOG_INFO,
+                       "2 sampling values for 1 subnet: %lu.%lu.%lu.%lu % from router %lu.%lu.%lu.%lu",
+                       agCache.v4AdS>>24,
+                       agCache.v4AdS<<8>>24,
+                       agCache.v4AdS<<16>>24,
+                       agCache.v4AdS<<24>>24,
+                       (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+              }
               /* inter-pop matrix Accounting */
               prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
               res2 = bsearch(&prefixKey, V4PTab, nbPV4, 
                             sizeof(struct PrefixV4), prefGlobalCmp);
-              if (res2!=NULL){
+              if (res2!=NULL){          
                 ((struct POP *)((myPtrs->matrixPOP)
                                 +((res->routerNb)*ROUTER_INDEX_MAX)
@@ -588 +610 @@
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
                           sizeof(struct PrefixV4), prefGlobalCmp);
-            if (res!=NULL){ 
-              if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
-                /* IN ("traffic to the prefix")  */
+            if (res!=NULL){
+              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
+                /* IN ("traffic to the prefix/subnet")  */
                 res->bytesNbIN += agCache.bytes;
                 res->pktsNbIN += agCache.pkts;
-                (res->flowNbIN)++;
-              } else {
+                (res->flowNbIN)++;      
+/*            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { */
+/*               IN ("traffic to the prefix")  */ 
+/*              res->bytesNbIN += agCache.bytes; */
+/*              res->pktsNbIN += agCache.pkts; */
+/*              (res->flowNbIN)++; */
+/*              if (res->sampling == 0) { */
+/*                res->sampling = myPtrs->currentRouterPtr->sampled; */
+/*              } else if (res->sampling !=  myPtrs->currentRouterPtr->sampled) { */
+/*                syslog(LOG_INFO, */
+/*                       "2 sampling values for 1 /: %lu.%lu.%lu.%lu % from router %lu.%lu.%lu.%lu", */
+/*                       agCache.v4AdS>>24, */
+/*                       agCache.v4AdS<<8>>24, */
+/*                       agCache.v4AdS<<16>>24, */
+/*                       agCache.v4AdS<<24>>24, */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd>>24), */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
+/*                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)); */
+/*              } */
+/*            } else { */
                 /* doublon or bad reference in prefix list */
-                
-/*              fprintf(stderr, "IN NC: %lu.%lu.%lu.%lu/%hu -> %lu.%lu.%lu.%lu/%hu R:%lu.%lu.%lu.%lu \n", */
-/*                      (agCache.v4AdS>>24), */
-/*                      (agCache.v4AdS<<8>>24),  */
-/*                      (agCache.v4AdS<<16>>24),  */
-/*                      (agCache.v4AdS<<24>>24),  */
-/*                      (agCache.maskS),  */
-/*                      (agCache.v4AdD>>24),  */
-/*                      (agCache.v4AdD<<8>>24),  */
-/*                      (agCache.v4AdD<<16>>24),  */
-/*                      (agCache.v4AdD<<24>>24),  */
-/*                      (agCache.maskD),  */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd>>24),  */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
-/*                      (myPtrs->pcktPtr->ipH->srcAdd<<24>>24) */
-/*                      ); */
               }
             } else {
@@ -788 +812 @@
           if (pftmp->fieldType==34){
             if ((*((unsigned long*)&buffer4)==1) 
-                || (*((unsigned long*)&buffer4)==10) 
+                || (*((unsigned long*)&buffer4)==10)
+                || (*((unsigned long*)&buffer4)==100)
                 || (*((unsigned long*)&buffer4)==1000)) {
               if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
@@ -795 +820 @@
                         myPtrs->currentRouterPtr->sampled);
 #endif                     
+                syslog(LOG_INFO,"Sampling value change for router : %lu.%lu.%lu.%lu, old: %lu, new: %lu",
+                       (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                       (myPtrs->pcktPtr->ipH->srcAdd<<24>>24),
+                       myPtrs->currentRouterPtr->sampled,
+                       *((unsigned long*)&buffer4)
+                       );
                 myPtrs->currentRouterPtr->sampled = *((unsigned long*)&buffer4);
-                for (i=0; i<nbPV4; i++) {
-                  /* we update the PrefixV4 structure with the sampled information */
-                  if ( myPtrs->currentRouterPtr->IpAddress == myPtrs->routersID[V4PTab[i].routerNb]) {
-                    V4PTab[i].sampling = *((unsigned long*)&buffer4);
-                    myPtrs->secondV4Tab[i].sampling = *((unsigned long*)&buffer4);
-                  }
-                }
-              }
+              }
+            }else{
+              syslog(LOG_INFO,"Sampling value not standard for router : %lu.%lu.%lu.%lu",
+                     (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                     (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                     (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                     (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)
+                     );
             }
           }

trunk/src/dataFlowSet.h

@@ -75 +75 @@
   unsigned char ipProt;
   unsigned char sens; /* In/out field 61 */
-  unsigned short idSnmp;
+  unsigned short inputSnmp;
+  unsigned short outputSnmp;
   unsigned long bytes;
   unsigned long pkts;

trunk/src/renetcol.c

@@ -36 +36 @@
 FILE *fIP;                                 /* pointer on the IP output file */
 FILE *fMPLS;                              /* pointer on the MPLS output file */
-
-char *rulesFileName;                    /* file name of the rules (like acl) */
-char *configFileName;                   /* file name where routers list is */
-char *prefixV4FileName;                 /* IPv4 prefix list */
 
 struct sigaction myAction; /* handler for renetcolSender communication */
@@ -101 +97 @@
   key_t key;
   int i,j;
-  
-  if ( argc != 4) {
-    fprintf (stderr,
-             "%s: Usage: %s <routers file> <prefix IPv4 file> <rules file>\n exp: %s routers.txt IPv4_prefix.txt rules.txt\n", 
-             argv[0], argv[0], argv[0]);
-    exit(1);
-  }
+  int k;
 
 #ifdef IPV4AGG
@@ -114 +104 @@
   
   openlog(argv[0], LOG_PID, LOG_USER);
+
+  initCache();
+  /* GET the list of routers who are available to send NDE to the collector */
+  if ( (routerNb = getRegisteredRouters(ROUTERS_LIST, 
+                                        &sortedRouterList[0], 
+                                        &indexedRouterList[0])) == -1) {
+    fprintf(stderr, 
+            "ERROR in getRegisteredRouters from file %s\n", 
+            ROUTERS_LIST);
+    exit(-1);
+  }
+  /* Create the list of routers */
+  for (i=0; i<routerNb; i++){
+    fprintf(stderr, "add router : %lu\n", sortedRouterList[i]);
+    routersListPtr = addRouter(routersListPtr, sortedRouterList[i]);
+  }
   
-  configFileName = (char *) malloc((strlen(argv[1])+1) * sizeof(char));
-  strcpy (configFileName, argv[1]);
-  prefixV4FileName = (char *) malloc((strlen(argv[2])+1) * sizeof(char));
-  strcpy (prefixV4FileName, argv[2]);
-  rulesFileName = (char *) malloc((strlen(argv[3])+1) * sizeof(char));
-  strcpy (rulesFileName, argv[3]);
-
-  initCache();
-  routerNb = getRegisteredRouters(configFileName, &sortedRouterList[0], 
-                                  &indexedRouterList[0]);
+  /* Shared memory */
   key = 8765;
   if ((shmid = shmget(key, SHMSIZE, IPC_CREAT | 0666)) < 0) {
@@ -135 +132 @@
   }
 
-  if ( (shmForAgg->v4PrefixNb = getPrefixV4(prefixV4FileName, &(shmForAgg->prefixV4Tab[0][0]))) < 1){
+  if ( (shmForAgg->v4PrefixNb = getPrefixV4(SUBNETS_LIST, &(shmForAgg->prefixV4Tab[0][0]))) < 1){
     fprintf(stderr, "renetcol: Error \n");
     exit(1);
   }
-  if ( (shmForAgg->v4PrefixNb = getPrefixV4(prefixV4FileName, &(shmForAgg->prefixV4Tab[1][0]))) < 1){
+  if ( (shmForAgg->v4PrefixNb = getPrefixV4(SUBNETS_LIST, &(shmForAgg->prefixV4Tab[1][0]))) < 1){
     fprintf(stderr, "renetcol:  Error \n");
     exit(1);
@@ -148 +145 @@
   shmForAgg->readed = 0;
 
+  /* get the rules */
   myPtrs.rulesListPtr = NULL;
-/*   myPtrs.rulesListPtr = getLightRules(myPtrs.rulesListPtr, rulesFileName); */
-  myPtrs.rulesListPtr = getRules(myPtrs.rulesListPtr, rulesFileName);
+  myPtrs.rulesListPtr = getRules(myPtrs.rulesListPtr, RULES_FILE);
   tmp = myPtrs.rulesListPtr;
   for ( ; tmp->next; tmp=tmp->next) {
@@ -162 +159 @@
 #endif
 
-
+  /* the fork */
   fprintf(stderr, "renetcol: I become a deamon, next messages via syslogd. By.\n");
   if (fork () != 0)
@@ -177 +174 @@
   sigaction (SIGUSR1, &myAction, NULL);
 
-  /* Pointer on rules Table */
+  /* Cache for fast rules access */
   setCache(myPtrs.rulesListPtr);
   myPtrs.rulesAddressPtr = (RuleDefPtr *)rulesAddress;
 
-  /* init IPC messages queue */
+  /* IPC messages queue init */
   myKey = createKey(argv[0]);
   myQueue = createQueue(myKey);
   sendMyPid(myQueue);
+
+  /* get SNMP index information */
+  k = getSNMPIndexList(INTERFACES_TYPE_LIST, routersListPtr);
 
   /* INIT THE CURRENTS VARIABLES*/
@@ -199 +199 @@
   myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
 
+  /* INIT MATRIX TABLES */
   for (i=0; i<ROUTER_INDEX_MAX; i++){
     for (j=0; j<ROUTER_INDEX_MAX; j++) {
@@ -210 +211 @@
   }
 
+  /* Checkup */
   if (myPtrs.pcktPtr==NULL) {
     fprintf(stderr, "ERROR in struct Datagram allocation\n");
@@ -217 +219 @@
     myPtrs.pcktPtr->udp_header = (UdpHeaderPtr) malloc(sizeof(struct UdpHeader));
   }
-
   if (! (myPtrs.ptr_buffer = malloc(sockBufSize)))  
     {
@@ -304 +305 @@
   }
   myPtrs.rulesListPtr = NULL;
-  myPtrs.rulesListPtr = getRules(myPtrs.rulesListPtr, rulesFileName);
+  myPtrs.rulesListPtr = getRules(myPtrs.rulesListPtr, RULES_FILE);
   tmp = myPtrs.rulesListPtr;
   for ( ; tmp; tmp=tmp->next) {
@@ -438 +439 @@
       if ((myPtrs.currentRouterPtr=notExistRouter(routersListPtr, 
                                                   myPtrs.pcktPtr->ipH->srcAdd))==NULL) {
-        routersListPtr = addRouter(routersListPtr, 
-                                   myPtrs.pcktPtr->ipH->srcAdd, 
-                                   (unsigned long) 0,
-                                   shmForAgg->prefixV4Tab[shmForAgg->currentTable],
-                                   (size_t) shmForAgg->v4PrefixNb,
-                                   &myPtrs
-                                   );
         myPtrs.currentRouterPtr = routersListPtr;
       }

trunk/src/renetcolAgg.c

@@ -27 +27 @@
  * In this file, I use directly the C rrd librairy to create and update
  * the rrd files which contain the statistique for each subnet.
- * When your system (CPU+MEM+HD) is too fast and the number of your subnet too big
+ * When your system is too fast and the number of your subnet too big
  * (> 1024), the create and update process can be too fast and before the 
  * creation end the maximum number of files which can be opened for one process

trunk/src/renetcolParam.h

@@ -32 +32 @@
 #define RECEPTION_ADDRESS "" /* your collector address - syntax: 10.0.0.90 */
 #define RECEPTION_PORT 9999 /* your collector port to recept netflow export */
+#define ROUTER_INDEX_MAX 55 /* routers number + 1 */
+#define ROUTERS_LIST "/home/andreu/renetcol-0.0.12beta/src/routers.txt"     /* FILE with your routers IP address */ 
+#define SUBNETS_LIST "/home/andreu/renetcol-0.0.12beta/src/IPv4_prefix.txt"     /* FILE with your subnets */
+#define RULES_FILE "/home/andreu/renetcol-0.0.12beta/src/rules.txt"       /* FILE for the rules */
+#define INTERFACES_TYPE_LIST "" /* FILE with SNMP index of the interfaces */
+                                /* tagged "C"ustomers or "B"ackbone */
+#define MAX_SNMP_INDEX 900 /* maximum SNMP index for interfaces */
+
 #define STEP 5  /* interval - in min */
-#define ROUTER_INDEX_MAX 55 /* routers number + 1 */
 #define FIELD_TYPE_NUMBER 89
 #define MAX_RULES_PER_FIELD 10 /* maximum rules number for one field */

trunk/src/renetcolSender.c

@@ -31 +31 @@
 long type;
 RulesPtr rulesListPtr;
-char *rulesFileName;
 char *keyId;
 char *remoteHost;
@@ -78 +77 @@
     if (strncmp("DELETE", buffer, 6)==0){
       /* DELETE ALL RULES FROM A REMOTE CLIENT */
-      if (!(ruleFile = fopen(rulesFileName, "r"))) {
-        syslog (LOG_ERR, "error during %s opening\n", rulesFileName);
+      if (!(ruleFile = fopen(RULES_FILE, "r"))) {
+        syslog (LOG_ERR, "error during %s opening\n", RULES_FILE);
         close(sock);
         exit(1);
@@ -116 +115 @@
           }
           fclose(tmpFile);
-          if (remove(rulesFileName)!=0){
+          if (remove(RULES_FILE)!=0){
             syslog(LOG_ERR, "rules.txt remove pb: %s", strerror(errno));
             close(sock);
             return 1;
           }
-          if (rename(FILE_TEMPO, rulesFileName)!=0){
+          if (rename(FILE_TEMPO, RULES_FILE)!=0){
             syslog(LOG_ERR, "rename file pb: %s", strerror(errno));
             close(sock);
@@ -139 +138 @@
         return 1;
       }
-      if (!(ruleFile = fopen(rulesFileName, "a"))) {
-        syslog (LOG_ERR, "error during %s opening", rulesFileName);
+      if (!(ruleFile = fopen(RULES_FILE, "a"))) {
+        syslog (LOG_ERR, "error during %s opening", RULES_FILE);
         close(sock);
         return 1;
@@ -278 +277 @@
   }
   rulesListPtr = NULL;
-  rulesListPtr = getRules(rulesListPtr, rulesFileName);
+  rulesListPtr = getRules(rulesListPtr, RULES_FILE);
   tmp = rulesListPtr;
   for ( ; tmp; tmp=tmp->next) {
@@ -300 +299 @@
   pid_t renetcolPID = 0;
 
-  if ( argc != 4) {
+  if ( argc != 3) {
     fprintf (stderr,
-             "%s: Usage: %s <key> <msg type> <rules file>\n exp: %s renetcol 1 rules.txt\n", 
+             "%s: Usage: %s <key> <msg type>\n exp: %s renetcol 1 \n", 
              argv[0], argv[0], argv[0]);
     exit(1);
@@ -314 +313 @@
   keyId = (char *) malloc((strlen(argv[1])+1) * sizeof(char));
   strcpy (keyId, argv[1]);
-  rulesFileName = (char *) malloc((strlen(argv[3])+1) * sizeof(char));
-  strcpy (rulesFileName, argv[3]);
   rulesListPtr = NULL;
-  rulesListPtr = getRules(rulesListPtr, rulesFileName);
+  rulesListPtr = getRules(rulesListPtr, RULES_FILE);
   /* we delete rules which are not type socket */
   tmp = rulesListPtr;

trunk/src/routers_mgmt.c

@@ -33 +33 @@
     i++;
     if ( tmp->IpAddress == address ){
-/*       fprintf (stderr, "ExistRouter %d parcours %lu.%lu.%lu.%lu\ \n",  */
-/*             i, */
-/*             address>>24, */
-/*             address<<8>>24, */
-/*             address<<16>>24, */
-/*             address<<24>>24 */
-/*             ); */
       return tmp;
     }
   }
-/*   fprintf (stderr, "notExistRouter %lu.%lu.%lu.%lu\n", */
-/*         address>>24, */
-/*         address<<8>>24, */
-/*         address<<16>>24, */
-/*         address<<24>>24); */
   return NULL;
 }
 
-RouterPtr addRouter(RouterPtr routersList, unsigned long address, 
-                unsigned long spled, struct PrefixV4 *V4PTab, 
-                 size_t nbPV4, struct MyPtrs *myPtrs) 
-{
-  int i = 0;
+RouterPtr addRouter(RouterPtr routersList, unsigned long address) 
+{
   RouterPtr tmp = (RouterPtr) malloc(sizeof(struct Router));
   if (tmp==NULL) {
-    /* FIXME : syslog here */
-    fprintf(stderr, "ERROR in malloc in add_routers function\n");
+    syslog(LOG_ERR, "ERROR in malloc in add_routers function\n");
     exit(1);
   } else {
@@ -65 +49 @@
     tmp->tplList = NULL;
     tmp->tplOptList = NULL;
-    tmp->sampled = spled;
+    tmp->sampled = 1; /* ==1 required in case of no sampling configured */
     tmp->next = routersList;
     if (routersList!=NULL) { routersList->prev = tmp;}
     tmp->prev = NULL;
-    /* initialization of the subnets which depend on this routers, aim: to create the rrd files */
-    for (i=0; i<nbPV4; i++) {
-      if ( tmp->IpAddress == myPtrs->routersID[V4PTab[i].routerNb]) {
-        V4PTab[i].sampling = 1;
-        myPtrs->secondV4Tab[i].sampling = 1; 
-      }
-    }
     return tmp;
   }
+}
+
+RouterPtr updateRouter(RouterPtr routersList, unsigned long address, 
+                       unsigned long spled) 
+{
+  RouterPtr tmp = NULL;
+  if ((tmp = notExistRouter(routersList, 
+                            address))==NULL) {
+    syslog(LOG_INFO,"Router Address not registered : %lu.%lu.%lu.%lu)",
+           (address>>24),
+           (address<<8>>24),
+           (address<<16>>24),
+           (address<<24>>24));
+    return routersList;
+  } else {
+    fprintf(stderr, "\nSAMPLED VALUE: %lu\n", spled);
+    tmp->sampled = spled; 
+    return tmp;
+  }
+  return NULL;
 }
 
@@ -151 +148 @@
   return NULL; /* FIXME I don't known */
 }
+
+int getSNMPIndexList(char *filename, RouterPtr routersListPtr)
+{
+  FILE *indexFile = NULL;
+  char line[200];
+  int cptLine = 0;
+  char tindex[5];
+  char ttoken[2];
+  char tid[2];
+  char tad[16];
+  int index = 0;
+  unsigned short n0, n1, n2, n3;
+  unsigned char buffer4[4];
+  unsigned long ipAddress;
+  RouterPtr routerTmp = NULL;
+
+  if (!(indexFile = fopen(filename, "r"))) {
+    fprintf (stderr, "error during %s opening\n", filename);
+    exit(1);
+  }
+  while ( fgets(line, 200, indexFile) != 0) {    
+    cptLine++;
+    if ( strspn(line, "R") == 1 ) {
+      if (sscanf(line, "%s %s\n",
+                 ttoken,
+                 tad) == 0) {
+        fprintf(stderr, "Error in file %s, line %d\n", 
+                filename, cptLine);
+        exit(1);
+      }
+      if (sscanf(tad,"%hu.%hu.%hu.%hu\n",&n0,&n1,&n2,&n3) == 0){
+        fprintf(stderr, "Address error in file %s, line %d\n", 
+                filename, cptLine);
+        exit(1);
+      }
+      buffer4[3] = (unsigned char)n0;
+      buffer4[2] = (unsigned char)n1;
+      buffer4[1] = (unsigned char)n2;
+      buffer4[0] = (unsigned char)n3;   
+      ipAddress = *((unsigned long*)(&buffer4));
+      if ((routerTmp = notExistRouter(routersListPtr,
+                                      ipAddress))==NULL){
+        fprintf(stderr, "Error in file %s, line %d : IP unknown : %lu\n",
+                filename, cptLine, ipAddress);
+        exit(1);
+      }
+    }else{
+      if ( strspn(line, "I") == 1 ) {
+        if (sscanf(line, "%s %s %s\n",
+                   ttoken,
+                   tindex,
+                   tid) == 0) {
+          fprintf(stderr, "Error in file %s, line %d\n", 
+                  filename, cptLine);
+          exit(1);
+        }
+        index = atoi(tindex);
+        if ( strcmp(tid, "B") == 0 ) {
+          routerTmp->snmpIndexList[index] = 0;
+        } else if ( strcmp(tid, "C") == 0 ) {
+          routerTmp->snmpIndexList[index] = 1;
+        } else {
+          fprintf(stderr, "Error in file %s, line %d : bad code B or C \n", 
+                  filename, cptLine);
+          exit(1);
+        }
+      } else {
+        fprintf(stderr, "Error in file %s, line %d : bad index line \n", 
+                filename, cptLine);
+        exit(1);
+      }
+    }
+  }
+  return 1;
+}

trunk/src/routers_mgmt.h

@@ -32 +32 @@
 #include <errno.h>
 #include <sys/ioctl.h>
+#include <syslog.h>
 
+#include "renetcolParam.h"
 #include "tplflset_mgmt.h"
 #include "get_conf.h"
@@ -42 +44 @@
 typedef struct Router * RouterPtr;
 typedef struct Router {
-  unsigned long IpAddress;
-  TplFlowSetPtr tplList;
-  TplOptionPtr tplOptList;
-  unsigned long sampled;
+  unsigned long IpAddress; /* IP address used for NDE (often a loopback) */
+  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 snmpIndexList[MAX_SNMP_INDEX]; /* 0:Backbone, 1:Customer */
   RouterPtr next;
   RouterPtr prev;
@@ -67 +70 @@
 
 RouterPtr notExistRouter(RouterPtr, unsigned long);
-RouterPtr addRouter(RouterPtr, unsigned long, unsigned long, struct PrefixV4 *, size_t, struct MyPtrs *);
+RouterPtr addRouter(RouterPtr, unsigned long);
+RouterPtr updateRouter(RouterPtr, unsigned long, unsigned long);
 TplFlowSetPtr newRouterTplList();
 TplFlowSetPtr deleteTplFlSet(TplFlowSetPtr);
 TplOptionPtr newRouterTplOptList();
 TplOptionPtr deleteTplOption(TplOptionPtr);
+int getSNMPIndexList(char *, RouterPtr);
 
 /*int rm_routers(p_routers, unsigned long);