Changeset 60 for trunk/src

Timestamp:

10/25/07 07:23:46 (15 years ago)

Author:

andreu

Message:

new aggregation mode based on SNMP index and AS aggregation

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• as.c (added)
• as.h (added)
• dataFlowSet.c (modified) (9 diffs)
• dataFlowSet.h (modified) (2 diffs)
• get_conf.c (modified) (3 diffs)
• get_conf.h (modified) (2 diffs)
• renetcol.c (modified) (3 diffs)
• renetcol.h (modified) (2 diffs)
• renetcolAgg.c (modified) (3 diffs)
• renetcolAgg.h (modified) (2 diffs)
• renetcolParam.h (modified) (3 diffs)
• routers_mgmt.h (modified) (1 diff)

trunk/src/Makefile.am

@@ -6 +6 @@
         dataFlowSet.h get_conf.c get_conf.h rules_mgmt.c rules_mgmt.h \
         remote_output.h remote_output.c prefix_mgmt.h prefix_mgmt.c \
-        pop.h renetcolParam.h
+        pop.h renetcolParam.h as.h as.c
 renetcolSender_SOURCES = renetcolSender.c renetcolSender.h msg_mgmt.h \
         msg_mgmt.c rules_mgmt.c rules_mgmt.h remote_output.h \
-        remote_output.c fields_mgmt.h fields_mgmt.c pop.h renetcolParam.h
+        remote_output.c fields_mgmt.h fields_mgmt.c pop.h renetcolParam.h\
+        as.h as.c
 renetcolMsgCtl_SOURCES = renetcolMsgCtl.c
-renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h pop.h renetcolParam.h
+renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h pop.h renetcolParam.h as.h
 BUILT_SOURCES = renetcol.o renetcolSender.o renetcolAgg.o
 renetcol_LDADD = -ldl -lc_p

trunk/src/dataFlowSet.c

@@ -66 +66 @@
   unsigned short tplMsgType = 11;
   struct PrefixV4 prefixKey, *res, *res2; /* for bsearch */
+#if defined(IPV4AGGIDSNMP)
+  struct PrefixV4 *res3;
+#endif
+#ifdef ASACC
+  struct AS asKey, *asres; /* for bsearch */
+#endif
   struct AggCache agCache;
   int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
@@ -229 +235 @@
               }
 #endif
+#ifdef ASACC
+              if (pftmp->fieldType==16){
+                agCache.asS = *((unsigned short*)&buffer2);
+              }   
+              if (pftmp->fieldType==17){
+                agCache.asD = *((unsigned short*)&buffer2);
+              }
+#endif
               break;
             case 3:
@@ -482 +496 @@
           }       
 #endif
+#ifdef ASACC
+          if (pftmp->fieldType==16){
+            agCache.asS = *((unsigned short*)&buffer2);
+          }       
+          if (pftmp->fieldType==17){
+            agCache.asD = *((unsigned short*)&buffer2);
+          }
+#endif
           break;
         case 3:
@@ -548 +570 @@
         /* Aggregation mode must be enable in ./configure options   */
         /* first we must know if the address belong to our prefix   */
+        /*
+         * AS ACCOUNTING
+         */
+#if defined(ASACC) && defined(IPV4AGGIDSNMP)
+        if ( (bool == 1) && (isMplsFlow == 0) ){
+          asKey.as = agCache.asS;
+          asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
+          if (asres != NULL) {
+            if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {         
+              if (myPtrs->currentRouterPtr->sampled != 0 ){
+                /* OUT ("traffic from the AS")  */
+                asres->bytesNbOUT += agCache.bytes;
+                asres->pktsNbOUT += agCache.pkts;
+                (asres->flowNbOUT)++;
+              }
+              if (asres->sampling == 0 
+                  && myPtrs->currentRouterPtr->sampled != 0){
+                asres->sampling = myPtrs->currentRouterPtr->sampled;
+              }
+              asres = NULL;
+              asKey.as = agCache.asD;
+              asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
+              if (asres!=NULL){
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the AS")  */
+                  asres->bytesNbIN += agCache.bytes;
+                  asres->pktsNbIN += agCache.pkts;
+                  (asres->flowNbIN)++;
+                }
+                if (asres->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0){
+                  asres->sampling = myPtrs->currentRouterPtr->sampled;
+                }
+                asres = NULL;
+              }
+            }
+          } else {
+            asres = NULL;
+            asKey.as = agCache.asD;
+            asres = bsearch(&asKey, myPtrs->currentASTab, myPtrs->asNb, sizeof(struct AS), asGlobalCmp);
+            if (asres!=NULL){
+              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the AS")  */
+                  asres->bytesNbIN += agCache.bytes;
+                  asres->pktsNbIN += agCache.pkts;
+                  (asres->flowNbIN)++;
+                }
+                if (asres->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0){
+                  asres->sampling = myPtrs->currentRouterPtr->sampled;
+                }
+              }
+            }
+          }
+        }
+#endif
+        /*
+         * PREFIX &/or MATRIX ACCOUNTING
+         */
 #if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
         if ( (bool == 1) && (isMplsFlow == 0) ){
@@ -569 +651 @@
                 res->sampling = myPtrs->currentRouterPtr->sampled;
               }
+#if defined(IPV4AGGIDSNMP)
+              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
+              res3 = bsearch(&prefixKey, V4PTab, nbPV4, 
+                             sizeof(struct PrefixV4), prefGlobalCmp);
+              if (res3!=NULL){
+                if (myPtrs->currentRouterPtr->sampled != 0 ){
+                  /* IN ("traffic to the prefix/subnet")  */
+                  res3->bytesNbIN += agCache.bytes;
+                  res3->pktsNbIN += agCache.pkts;
+                  (res3->flowNbIN)++;
+                }
+                if (res3->sampling == 0 
+                    && myPtrs->currentRouterPtr->sampled != 0){
+                  res3->sampling = myPtrs->currentRouterPtr->sampled;
+                }
+              }
+#endif
 #if defined(MATRIX) && defined(IPV4AGGIDR)
               /* inter-pop matrix Accounting */
@@ -603 +702 @@
               /* doublon or bad reference in prefix list */
             }
-          } else {
+          } else { /* the prefix in source don't exist in your prefix list */
             prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
                           sizeof(struct PrefixV4), prefGlobalCmp);
             if (res!=NULL){
-              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
+              if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the prefix/subnet")  */
@@ -628 +727 @@
                   res->sampling = myPtrs->currentRouterPtr->sampled;
                 }
-/*            } else { */
+              } else {
                 /* doublon or bad reference in prefix list */
               }
             } else {
+              /* UNKNOW SUBNET CASE                                        */
+              /*                                                           */
               /* HERE : we are in the cases of the address/mask don't      */
               /*        belong to a prefix listed in the IPv4 prefix file  */
@@ -663 +764 @@
 #endif /* (IPV4AGGIDR) || (IPV4AGGIDSNMP) */
         /* 
-         * Redirection if needed 
+         *
+         * SOCKET OUTPUT TO A REMOTE CLIENT
+         *
          * switch the rules definition (check & fieldToRecord), 
          * we send the flow or a part of the flow to a remote host or a file.
@@ -772 +875 @@
      *
      *
-     *       Optional template
+     *  OPTIONAL TEMPLATE
      *
      *

trunk/src/dataFlowSet.h

@@ -32 +32 @@
 #include "msg_mgmt.h"
 #include "get_conf.h"
+#include "as.h"
 #include "pop.h"
 #include "prefix_mgmt.h"
@@ -84 +85 @@
   uint32_t tabAdd6S[4];
   uint32_t tabAdd6D[4];
+#ifdef ASACC
+  unsigned short asS;
+  unsigned short asD;
+#endif
   /*  unsigned short mplsLabel1;
       unsigned long ifAdd; */

trunk/src/get_conf.c

@@ -66 +66 @@
 
   if (!(routerFile = fopen(filename, "r"))) {
-    fprintf (stderr, "error during %s opening\n", filename);
+    fprintf (stderr, "error during file \"%s\" opening\n", filename);
     exit(1);
   }
@@ -147 +147 @@
 
   if (!(prefixFile = fopen(filename, "r"))) {
-    fprintf (stderr, "error during %s opening\n", filename);
+    fprintf (stderr, "error during file \"%s\" opening\n", filename);
     exit(1);
   }
@@ -229 +229 @@
   }
 }
+
+/* 
+ * 
+ */
+int compASStr(a,b)
+{
+  static unsigned short a0;
+  static unsigned short b0;
+  sscanf((char *)a,"%hu\n",&a0);
+  sscanf((char *)b,"%hu\n",&b0);
+  if (a0 > b0) return(1);
+  if (a0 < b0) return(-1);
+  return(0);
+}
+
+/* 
+ * getAS()
+ *
+ * read AS file and sort the list
+ */
+unsigned short getAS(char *filename, struct AS *ASTabPtr)
+{
+  FILE *asFile;
+  char line[200];
+  unsigned short counter = 0;
+  unsigned short n0;
+  unsigned short buffer;
+  int i = 0;
+  char ASStrTab[MAX_AS][7];
+
+  if (!(asFile = fopen(filename, "r"))) {
+    fprintf (stderr, "error during file \"%s\" opening\n", filename);
+    exit(1);
+  }
+  for(i=0;i<MAX_AS;i++){
+    ASTabPtr[i].as = 0;
+    ASTabPtr[i].sampling = 0;
+  }
+  while (fgets(line, 7, asFile) != 0)
+    {
+      strcpy(ASStrTab[counter], line);
+      counter++;
+      if (counter > MAX_AS) {
+        fprintf(stderr, "bufferoverflow in getAS function (get_conf.c)\
+change the value of MAX_AS declaration and recompile, counter: %hu \n",
+                        counter);
+        exit(1);
+      }
+    }
+  qsort(ASStrTab, counter, 7, compASStr);
+  for(i=0;i<counter;i++)
+    {
+      sscanf(ASStrTab[i],"%hu\n",
+             &n0);
+      buffer = (unsigned short)n0;
+      ASTabPtr[i].as = *((unsigned short*)&buffer);
+      ASTabPtr[i].sampling = 0;
+    }
+  if( fclose(asFile) == 0) {
+    return (counter);
+  } else {
+    fprintf(stderr,"%s not closed, \n", filename);
+    exit(1);
+    return(counter);
+  }
+}
+

trunk/src/get_conf.h

@@ -27 +27 @@
 
 #include "renetcolParam.h"
+#include "as.h"
 
 struct PrefixV4{
@@ -57 +58 @@
 int getRegisteredRouters(char *, unsigned long *, unsigned long *);
 unsigned short getPrefixV4(char *, struct PrefixV4 *);
+unsigned short getAS(char *, struct AS *);
 
 #endif /* GET_CONF_H */

trunk/src/renetcol.c

@@ -167 +167 @@
 #endif
 
+#ifdef ASACC
+  /* get the AS list */
+  if ( (shmForAgg->ASNb = getAS(AS_LIST, &(shmForAgg->ASTab[0][0]))) < 1){
+    fprintf(stderr, "renetcol: Error in %s\n", AS_LIST);
+    exit(1);
+  } else {
+    fprintf(stderr, "%hu AS are readed from %s\n", 
+            shmForAgg->ASNb,
+            AS_LIST);
+  }
+  if ( (shmForAgg->ASNb = getAS(AS_LIST, &(shmForAgg->ASTab[1][0]))) < 1){
+    fprintf(stderr, "renetcol: Error in %s\n", AS_LIST);
+    exit(1);
+  }
+#endif
+
   /* the fork */
   fprintf(stderr, "renetcol: I become a deamon, next messages via syslogd. By.\n");
@@ -207 +223 @@
   myPtrs.currentV4Tab = shmForAgg->prefixV4Tab[shmForAgg->currentTable];
   myPtrs.secondV4Tab = shmForAgg->prefixV4Tab[shmForAgg->secondTable];
+#ifdef ASACC
+  myPtrs.asNb = shmForAgg->ASNb;
+  myPtrs.currentASTab = shmForAgg->ASTab[shmForAgg->currentTable];
+  myPtrs.secondASTab = shmForAgg->ASTab[shmForAgg->secondTable];
+#endif
 #ifdef MATRIX
   myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
@@ -433 +454 @@
       }
       shmForAgg->readed = 1;
+#ifdef ASACC
+      myPtrs.currentASTab = shmForAgg->ASTab[shmForAgg->currentTable];
+#endif
 #ifdef MATRIX
       myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);

trunk/src/renetcol.h

@@ -61 +61 @@
 #include "pop.h"
 #include "renetcolParam.h"
+#include "as.h"
 
-/* #include "mysql_mgmt.h" */
-
-struct SHMForAgg {
+struct SHMForAgg {/* if you change it, you must change renetcolAgg.h struct */
   unsigned short currentTable;
   unsigned short secondTable;
   unsigned short readed;
   unsigned short v4PrefixNb;
+#ifdef ASACC
+  unsigned short ASNb;
+  struct AS ASTab[2][MAX_AS];
+#endif
   struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];
   struct PrefixV4 prefixV4SubnetTab[2][MAX_IPV4_SUBNET];
@@ -75 +78 @@
 #endif
   /*  struct PrefixV6 ; */
-}; /* if you change it, you must change renetcolAgg.h structure */
+};
 
 

trunk/src/renetcolAgg.c

@@ -54 +54 @@
   static char ipStr[24];
   static char indexStr[24];
+  static char asStr[7];
   static char createstr[2048];
   char *opt[27];
@@ -480 +481 @@
         /* END MATRIX INTER POP ACC */
 #endif /* MATRIX */
+#ifdef ASACC
+        /* 
+         *
+         * AS ACCOUNTING 
+         *
+         */
+        for (i=0; i<shmForAgg->ASNb; i++){
+          /* HERE create or update RRD FILE */
+          if (shmForAgg->ASTab[index][i].sampling != 0) {
+            for (j=0; j<strlen(name); j++) {name[j] = '\0';}
+            for (j=0; j<strlen(createstr); j++) {createstr[j] = '\0';}
+            for (j=0; j<strlen(asStr); j++) {asStr[j] = '\0';}
+            for (j=0; j<strlen(buf); j++) {buf[j] = '\0';}
+            strcat(name, AS_RRD_LOCATION);
+            sprintf(asStr, "%hu_%lu", 
+                    shmForAgg->ASTab[index][i].as,
+                    shmForAgg->ASTab[index][i].sampling
+                    ); 
+            strcat(name, asStr);
+            strcat(name, RRD_EXTENSION);
+            if ( (fp=fopen(name,"r")) == NULL ){
+              opt[0]= (char *) malloc((strlen(RRD_PARAM_AS_0) + 1) * sizeof(char));
+              strcpy(opt[0], RRD_PARAM_AS_0);
+              opt[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
+              strcpy(opt[1], name);
+              opt[2]= (char *) malloc((strlen(RRD_PARAM_AS_1) + 1) * sizeof(char));
+              strcpy(opt[2], RRD_PARAM_AS_1);
+              opt[3]= (char *) malloc((strlen(RRD_PARAM_AS_2) + 1) * sizeof(char));
+              strcpy(opt[3], RRD_PARAM_AS_2);
+              opt[4]= (char *) malloc((strlen(RRD_PARAM_AS_3) + 1) * sizeof(char));
+              strcpy(opt[4], RRD_PARAM_AS_3);
+              opt[5]= (char *) malloc((strlen(RRD_PARAM_AS_4) + 1) * sizeof(char));
+              strcpy(opt[5], RRD_PARAM_AS_4);
+              opt[6]= (char *) malloc((strlen(RRD_PARAM_AS_5) + 1) * sizeof(char));
+              strcpy(opt[6], RRD_PARAM_AS_5);
+              opt[7]= (char *) malloc((strlen(RRD_PARAM_AS_6) + 1) * sizeof(char));
+              strcpy(opt[7], RRD_PARAM_AS_6);
+              opt[8]= (char *) malloc((strlen(RRD_PARAM_AS_7) + 1) * sizeof(char));
+              strcpy(opt[8], RRD_PARAM_AS_7);
+              opt[9]= (char *) malloc((strlen(RRD_PARAM_AS_8) + 1) * sizeof(char));
+              strcpy(opt[9], RRD_PARAM_AS_8);
+              opt[10]= (char *) malloc((strlen(RRD_PARAM_AS_9) + 1) * sizeof(char));
+              strcpy(opt[10], RRD_PARAM_AS_9);
+              opt[11]= (char *) malloc((strlen(RRD_PARAM_AS_10) + 1) * sizeof(char));
+              strcpy(opt[11], RRD_PARAM_AS_10);
+              opt[12]= (char *) malloc((strlen(RRD_PARAM_AS_11) + 1) * sizeof(char));
+              strcpy(opt[12], RRD_PARAM_AS_11);
+              opt[13]= (char *) malloc((strlen(RRD_PARAM_AS_12) + 1) * sizeof(char));
+              strcpy(opt[13], RRD_PARAM_AS_12);
+              opt[14]= (char *) malloc((strlen(RRD_PARAM_AS_13) + 1) * sizeof(char));
+              strcpy(opt[14], RRD_PARAM_AS_13);
+              opt[15]= (char *) malloc((strlen(RRD_PARAM_AS_14) + 1) * sizeof(char));
+              strcpy(opt[15], RRD_PARAM_AS_14);
+              opt[16]= (char *) malloc((strlen(RRD_PARAM_AS_15) + 1) * sizeof(char));
+              strcpy(opt[16], RRD_PARAM_AS_15);
+              opt[17]= (char *) malloc((strlen(RRD_PARAM_AS_16) + 1) * sizeof(char));
+              strcpy(opt[17], RRD_PARAM_AS_16);
+              opt[18]= (char *) malloc((strlen(RRD_PARAM_AS_17) + 1) * sizeof(char));
+              strcpy(opt[18], RRD_PARAM_AS_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 ( j=0; j<19; j++) {
+                free(opt[j]);
+                opt[j] = 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->ASTab[index][i].flowNbIN,  /* 1 */
+                       shmForAgg->ASTab[index][i].flowNbOUT,
+                       shmForAgg->ASTab[index][i].bytesNbIN,
+                       shmForAgg->ASTab[index][i].bytesNbOUT,
+                       shmForAgg->ASTab[index][i].pktsNbIN,  /* 5 */
+                       shmForAgg->ASTab[index][i].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 ( j=0; j<3; j++) {
+                free(optUpdate[j]);
+                optUpdate[j] = NULL;
+              }
+            }
+            /* Reinit the shared tables */
+            shmForAgg->ASTab[index][i].flowNbIN = 0;
+            shmForAgg->ASTab[index][i].bytesNbIN = 0;
+            shmForAgg->ASTab[index][i].pktsNbIN = 0;
+            shmForAgg->ASTab[index][i].flowNbOUT = 0;
+            shmForAgg->ASTab[index][i].bytesNbOUT = 0;
+            shmForAgg->ASTab[index][i].pktsNbOUT = 0;
+          }
+        }
+#endif /* AS */
         now2 = time((time_t *)NULL);
 #ifdef DEBUGAGG
@@ -541 +656 @@
         }
 #endif
+#ifdef ASACC
+        for (i=0; i<shmForAgg->ASNb; i++){
+          shmForAgg->ASTab[index][i].flowNbIN = 0;
+          shmForAgg->ASTab[index][i].bytesNbIN = 0;
+          shmForAgg->ASTab[index][i].pktsNbIN = 0;
+          shmForAgg->ASTab[index][i].flowNbOUT = 0;
+          shmForAgg->ASTab[index][i].bytesNbOUT = 0;
+          shmForAgg->ASTab[index][i].pktsNbOUT = 0;
+        }
+#endif
       } /* end is first update */ 
     } /* end read ok */

trunk/src/renetcolAgg.h

@@ -42 +42 @@
 #include "pop.h"
 #include "renetcolParam.h"
+#include "as.h"
 
-struct SHMForAgg {
+struct SHMForAgg { /* if you change it, you must change renetcol.h structure */
   unsigned short currentTable;
   unsigned short secondTable;
   unsigned short readed;
   unsigned short v4PrefixNb;
+#ifdef ASACC
+  unsigned short ASNb;
+  struct AS ASTab[2][MAX_AS];
+#endif
   struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];
   struct PrefixV4 prefixV4SubnetTab[2][MAX_IPV4_SUBNET];
@@ -54 +59 @@
 #endif
   /*  struct PrefixV6 ; */
-}; /* if you change it, you must change renetcol.h structure */
+}; 

trunk/src/renetcolParam.h

@@ -44 +44 @@
  * FILE with your routers IP address 
 */ 
-#define ROUTERS_LIST "/home/andreu/renetcol-0.0.12beta/src/routers.txt"
+#define ROUTERS_LIST "/home/andreu/renetcol-0.0.12beta/conf/routers.txt"
 /* 
  * FILE with your prefix/subnet 
  */
-#define SUBNETS_LIST "/home/andreu/renetcol-0.0.12beta/src/IPv4_prefix.txt"
+#define SUBNETS_LIST "/home/andreu/renetcol-0.0.12beta/conf/IPv4_prefix.txt"
 /* 
- * two constants, here a subnet is include in a prefix 
+ * FILE with the list of AS with accounting
+ */
+#define AS_LIST "/home/andreu/renetcol-0.0.12beta/conf/AS.txt"
+/* 
+ * constants, here a subnet is include in a prefix 
  */
 #define MAX_IPV4_PREFIX 4000
 #define MAX_IPV4_SUBNET 1000
+#define MAX_AS 3
 /* 
  * FILE for the rules 
  */
-#define RULES_FILE "/home/andreu/renetcol-0.0.12beta/src/rules.txt"
+#define RULES_FILE "/home/andreu/renetcol-0.0.12beta/conf/rules.txt"
 /* 
  * FILE with SNMP index of the interfaces 
@@ -72 +77 @@
 #define PREFIX_RRD_LOCATION "/mnt/data/RRD/RENATER/IPv4_SUBNET/"
 #define MATRIX_RRD_LOCATION "/mnt/data/RRD/RENATER/MATRIX/"
-
+#define AS_RRD_LOCATION "/mnt/data/RRD/RENATER/AS/"
 
 /****************************************************************
@@ -125 +130 @@
 #define RRD_PARAM_MATRIX_13 "RRA:MAX:0.5:24:1550"
 #define RRD_PARAM_MATRIX_14 "RRA:MAX:0.5:288:1594"
+#define RRD_PARAM_AS_0 "rrdcreate"
+#define RRD_PARAM_AS_1 "--start"
+#define RRD_PARAM_AS_2 "1106560200"
+#define RRD_PARAM_AS_3 "--step"
+#define RRD_PARAM_AS_4 "300"
+#define RRD_PARAM_AS_5 "DS:inFlows:GAUGE:600:U:U"
+#define RRD_PARAM_AS_6 "DS:outFlows:GAUGE:600:U:U"
+#define RRD_PARAM_AS_7 "DS:inBytes:GAUGE:600:U:U"
+#define RRD_PARAM_AS_8 "DS:outBytes:GAUGE:600:U:U"
+#define RRD_PARAM_AS_9 "DS:inPkts:GAUGE:600:U:U"
+#define RRD_PARAM_AS_10 "DS:outPkts:GAUGE:600:U:U"
+#define RRD_PARAM_AS_11 "RRA:AVERAGE:0.5:1:2100"
+#define RRD_PARAM_AS_12 "RRA:AVERAGE:0.5:24:1550"
+#define RRD_PARAM_AS_13 "RRA:AVERAGE:0.5:288:1594"
+#define RRD_PARAM_AS_14 "RRA:AVERAGE:0.5:2016:1040"
+#define RRD_PARAM_AS_15 "RRA:MAX:0.5:1:2100"
+#define RRD_PARAM_AS_16 "RRA:MAX:0.5:24:1550"
+#define RRD_PARAM_AS_17 "RRA:MAX:0.5:288:1594"
 #define RRD_UPDATE_0 "rrdupdate"
 #define RECEPT_PORT "52571"

trunk/src/routers_mgmt.h

@@ -72 +72 @@
   struct PrefixV4 *currentV4SubnetTab;
   struct PrefixV4 *secondV4SubnetTab;
+#ifdef ASACC
+  unsigned short asNb;
+  struct AS *currentASTab;
+  struct AS *secondASTab;
+#endif
 #ifdef MATRIX
   struct POP *matrixPOP;