Changeset 36

Timestamp:

05/19/07 11:57:44 (16 years ago)

Author:

andreu

Message:

ticket #1 #2 #7 closed - release 0.0.9beta

Location:

trunk

Files:

• src/Makefile.am (modified) (1 diff)
• src/dataFlowSet.c (modified) (7 diffs)
• src/dataFlowSet.h (modified) (1 diff)
• src/pop.h (added)
• src/renetcol.c (modified) (9 diffs)
• src/renetcol.h (modified) (2 diffs)
• src/renetcolAgg.c (modified) (7 diffs)
• src/renetcolAgg.h (modified) (2 diffs)
• src/renetcolParam.h (added)
• src/renetcolSender.h (modified) (1 diff)
• src/routers_mgmt.h (modified) (1 diff)
• tool/check.sh (modified) (2 diffs)
• tool/renetcolGUI_0_0_7.py (modified) (2 diffs)

trunk/src/Makefile.am

@@ -5 +5 @@
         routers_mgmt.h tplflset_mgmt.h headers_mgmt.h dataFlowSet.c \
         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
+        remote_output.h remote_output.c prefix_mgmt.h prefix_mgmt.c \
+        pop.h renetcolParam.h
 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
+        remote_output.c fields_mgmt.h fields_mgmt.c pop.h renetcolParam.h
 renetcolMsgCtl_SOURCES = renetcolMsgCtl.c
-renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h rrdwrap.h rrdwrap.c
+renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h rrdwrap.h rrdwrap.c pop.h renetcolParam.h
 BUILT_SOURCES = renetcol.o renetcolSender.o renetcolAgg.o
 renetcol_LDADD = -ldl -lc_p

trunk/src/dataFlowSet.c

@@ -60 +60 @@
   unsigned char buffer4[4];
   RulesPtr tmpRuleList = myPtrs->rulesListPtr;
+  RulesPtr tmpRL = myPtrs->rulesListPtr;
   msgType myMsg;
   char *msgTextIndex;
+  char *msgToSend;
   unsigned short tplMsgType = 11;
-  struct PrefixV4 prefixKey, *res; /* for bsearch */
+  struct PrefixV4 prefixKey, *res, *res2; /* for bsearch */
   struct AggCache agCache;
   int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
@@ -674 +676 @@
         /* Aggregation mode must be enable in ./configure options   */
         /* first we must know if the address belong to our prefix   */
+        myPtrs->nbFluxTT++;
 #ifdef IPV4AGG
         if ( (bool == 1) && (isMplsFlow == 0) ){
@@ -681 +684 @@
           if (res!=NULL){
             if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+              myPtrs->nbFluxSR4++;
               /* OUT ("traffic from the prefix/subnet")  */
               res->bytesNbOUT += agCache.bytes;
               res->pktsNbOUT += agCache.pkts;
               (res->flowNbOUT)++;
+              /* 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){
+                myPtrs->nbFluxIR4++;
+                ((struct POP *)((myPtrs->matrixPOP)
+                                +((res->routerNb)*ROUTER_INDEX_MAX)
+                                +((res2->routerNb))))->pktsNb += agCache.pkts;
+                ((struct POP *)((myPtrs->matrixPOP)
+                                +((res->routerNb)*ROUTER_INDEX_MAX)
+                                +((res2->routerNb))))->bytesNb += agCache.bytes; 
+                ((struct POP *)((myPtrs->matrixPOP)
+                                +((res->routerNb)*ROUTER_INDEX_MAX)
+                                +((res2->routerNb))))->flowNb++; 
+              } else {
+                myPtrs->nbFluxSE++;
+                (
+                 ((struct POP *)(myPtrs->matrixPOP)
+                 +((res->routerNb)*ROUTER_INDEX_MAX)
+                 +((ROUTER_INDEX_MAX-1))))->pktsNb += agCache.pkts; 
+                (
+                 ((struct POP *)(myPtrs->matrixPOP)
+                 +((res->routerNb)*ROUTER_INDEX_MAX)
+                 +((ROUTER_INDEX_MAX-1))))->bytesNb += agCache.bytes; 
+                (
+                 ((struct POP *)(myPtrs->matrixPOP)
+                 +((res->routerNb)*ROUTER_INDEX_MAX)
+                 +((ROUTER_INDEX_MAX-1))))->flowNb++; 
+              }
+              /* end interpop matrix accounting */
             } else {
               /* doublon or bad reference in prefix list */
@@ -725 +760 @@
               /*     -  prefix not referenced but not allowed to be routed */
               /*     -  spoofing                                           */
+              myPtrs->nbFluxUK++;
 #ifdef PRINTUNKNOWNSUBNET 
               fprintf(stderr, "%lu.%lu.%lu.%lu/%hu -> %lu.%lu.%lu.%lu/%hu (R:%lu.%lu.%lu.%lu) \n",
@@ -759 +795 @@
          */
         tmpRuleList = myPtrs->rulesListPtr;
+        tmpRL = myPtrs->rulesListPtr;
         while (tmpRuleList){
-/*        RulesPtr tmpRuleList_for_to = myPtrs->rulesListPtr; */
           RuleDefPtr tmpRuleDefList = tmpRuleList->def;
           unsigned short check = 1;
-/*        int s=0; */
+          int s=0;
           secondOffset = secondOldOffset;
           while (tmpRuleDefList){
@@ -773 +809 @@
             /* msg building */
             secondPftmp = tmp->lastField;
-            msgTextIndex = mempcpy(mempcpy(mempcpy(myMsg.text, 
+            msgTextIndex = mempcpy(mempcpy(mempcpy(myMsg.text,   
                                                    &tplMsgType, 
                                                    sizeof(unsigned short) 
@@ -795 +831 @@
             myMsg.type = 1;
             /* OLD transfert type */
-            msgSend( myQueue, myMsg);
+/*          msgSend( myQueue, myMsg); */
             /* NEW transfert type */
-/*          for ( ; tmpRuleList_for_to; tmpRuleList_for_to=tmpRuleList_for_to->next){ */
-/*            fprintf(stderr, "?\n"); */
-/*            if (tmpRuleList_for_to->id == tmpRuleList->id){ */
-/*              fprintf(stderr, "y\n"); */
-/*              s = sendMessage(tmpRuleList_for_to->host->sockId, &(myMsg.text), sizeof(myMsg.text), */
-/*                              tmpRuleList_for_to->host->hostAddressPtr); */
-/*              fprintf(stderr, "o\n"); */
-/*            } */
-/*          } */
+            for ( ; tmpRL; tmpRL=tmpRL->next){
+              if (tmpRL->id == tmpRuleList->id){
+                s = sendMessage(tmpRL->host->sockId, myMsg.text, sizeof(myMsg.text),
+                                tmpRL->host->hostAddressPtr);
+              }
+            }
             /* FIXME : perhaps check "s" */
             noEnd = 1;

trunk/src/dataFlowSet.h

@@ -32 +32 @@
 #include "msg_mgmt.h"
 #include "get_conf.h"
+#include "pop.h"
 #include "prefix_mgmt.h"
+#include "renetcolParam.h"
 
 #define TRESHOLD_TEMPLATE_ID 300

trunk/src/renetcol.c

@@ -26 +26 @@
 #include "renetcol.h"
 
-struct MyPtrs myPtrs; /* defined in dataflowset.h */
+struct MyPtrs myPtrs; /* defined in routers_mgmt.h */
 
 struct SHMForAgg *shmForAgg;
@@ -69 +69 @@
 unsigned long indexedRouterList[ROUTER_INDEX_MAX];
 int routerNb = 0;                                  /* routers number */
-/* unsigned short v4PrefixNb = 0;                    IPv4 prefix number */ 
-/* struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];  IPv4 prefix structure */
-
-
-key_t myKey = 0; /* FIXME to delete in futur */
-int myQueue = 0; /* FIXME to delete in futur */
+
+key_t myKey = 0; 
+int myQueue = 0;
 
 /* Next structure used as cache in rules reading */
@@ -109 +106 @@
   int shmid;
   key_t key;
+  int i,j;
   
   if ( argc != 4) {
@@ -159 +157 @@
 
   myPtrs.rulesListPtr = NULL;
-  myPtrs.rulesListPtr = getLightRules(myPtrs.rulesListPtr, rulesFileName);
+/*   myPtrs.rulesListPtr = getLightRules(myPtrs.rulesListPtr, rulesFileName); */
+  myPtrs.rulesListPtr = getRules(myPtrs.rulesListPtr, rulesFileName);
   tmp = myPtrs.rulesListPtr;
   for ( ; tmp->next; tmp=tmp->next) {
@@ -166 +165 @@
     }
   }
+  tmp = NULL;
 /*   printRule(rulesListPtr); */
 /*   exit(1); */
@@ -204 +204 @@
   myPtrs.routersID = &indexedRouterList;
   myPtrs.currentV4Tab = shmForAgg->prefixV4Tab[shmForAgg->currentTable];
-  myPtrs.secondV4Tab = shmForAgg->prefixV4Tab[shmForAgg->secondTable];  
- 
+  myPtrs.secondV4Tab = shmForAgg->prefixV4Tab[shmForAgg->secondTable];
+  myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
+
+  myPtrs.nbFluxSR4 =0;
+  myPtrs.nbFluxSE =0;
+  myPtrs.nbFluxIR4 =0;
+  myPtrs.nbFluxUK = 0;
+  myPtrs.nbFluxTT = 0;
+
+  for (i=0; i<ROUTER_INDEX_MAX; i++){
+    for (j=0; j<ROUTER_INDEX_MAX; j++) {
+      shmForAgg->matrixPOP[0][i][j].bytesNb = 0;
+      shmForAgg->matrixPOP[0][i][j].pktsNb = 0;
+      shmForAgg->matrixPOP[0][i][j].flowNb = 0;
+      shmForAgg->matrixPOP[1][i][j].bytesNb = 0;
+      shmForAgg->matrixPOP[1][i][j].pktsNb = 0;
+      shmForAgg->matrixPOP[1][i][j].flowNb = 0;
+    }
+  }
+
   if (myPtrs.pcktPtr==NULL) {
     fprintf(stderr, "ERROR in struct Datagram allocation\n");
@@ -300 +318 @@
   }
   myPtrs.rulesListPtr = NULL;
-  myPtrs.rulesListPtr = getLightRules(myPtrs.rulesListPtr, rulesFileName);
+  myPtrs.rulesListPtr = getRules(myPtrs.rulesListPtr, rulesFileName);
   tmp = myPtrs.rulesListPtr;
   for ( ; tmp; tmp=tmp->next) {
@@ -379 +397 @@
   int regRouter = 0;
   time_t now = time((time_t *)NULL);
-  int iIP, iMPLS, i;
+  int iIP, iMPLS, i, z, x;
   int loopNb = 0;
   int gardeFou = 0;
@@ -404 +422 @@
       }
       shmForAgg->readed = 1;
+      myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
+      fprintf(stderr,"\n\nComptage FLUX:\n SR4: %llu\n SE: %llu\n IR4: %llu\n UK: %llu\n TT: %llu\n",
+              myPtrs.nbFluxSR4,
+              myPtrs.nbFluxSE,
+              myPtrs.nbFluxIR4,
+              myPtrs.nbFluxUK,
+              myPtrs.nbFluxTT
+              );
+      myPtrs.nbFluxSR4 =0;
+      myPtrs.nbFluxSE =0;
+      myPtrs.nbFluxIR4 =0;
+      myPtrs.nbFluxUK = 0;
+      myPtrs.nbFluxTT = 0;
     }
     if (sigusr1Up == 1){

trunk/src/renetcol.h

@@ -59 +59 @@
 #include "rules_mgmt.h"
 #include "msg_mgmt.h"
+#include "pop.h"
+#include "renetcolParam.h"
 
 /* #include "mysql_mgmt.h" */
-
-#define SOCKET_BUFFER_SIZE 1500
-
-#define RECEPTION_ADDRESS "" /* your collector address like 10.0.0.90 */
-#define RECEPTION_PORT 9999 /* your collector port to recept netflow export */
-
-#define TIME_OUT 300 /* MAJSCH */
-
-#define ROUTER_INDEX_MAX 70
-#define FIELD_TYPE_NUMBER 89
-#define MAX_RULES_PER_FIELD 10
-
-#ifdef CRIHAN
-#define OUTPUT_IP "/tmp/ipflow"
-#define EXTENSION ".txt" 
-#define OUTPUT_MPLS "/tmp/mplsflow"
-#define MAX_IP_OUTPUT_FILES 3
-#define MAX_MPLS_OUTPUT_FILES 3
-#define IP_TIME_THRESHOLD 60 /* in sec */
-#define MPLS_TIME_THRESHOLD 60 /* in sec */
-#endif /* CRIHAN */
-
-#define MAX_IP_FLOW 10000
-#define MAX_MPLS_FLOW 200
-
-#define SHMSIZE 33554432
-
-#define STEP 5  /* in min */
 
 struct SHMForAgg {
@@ -96 +70 @@
   unsigned short v4PrefixNb;
   struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];
+  struct POP matrixPOP[2][ROUTER_INDEX_MAX][ROUTER_INDEX_MAX];
   /*  struct PrefixV6 ; */
-};
+}; /* if you change it, you must change renetcolAgg.h structure */
 
 

trunk/src/renetcolAgg.c

@@ -41 +41 @@
 {
   int shmid;
-  int i, j, index;
+  int i, j, k = 0;
+  int index = 1;
   int rrd_update_er_ct = 0;
   int rrd_update_ok_ct = 0;
@@ -53 +54 @@
   static char name[2048];
   static char ipStr[24];
+  static char indexStr[24];
   static char createstr[2048];
   char *opt[27];
@@ -88 +90 @@
       now = time((time_t *)NULL);
       if (isFirstUpdate == 0) {
+        /* SUBNET ACCOUNTING */
         for (i=0; i<shmForAgg->v4PrefixNb; i++){
           /* HERE create or update RRD FILE */
@@ -95 +98 @@
             for (j=0; j<strlen(ipStr); j++) {ipStr[j] = '\0';}
             for (j=0; j<strlen(buf); j++) {buf[j] = '\0';}
-            strcat(name, RRD_LOCATION);
+            strcat(name, PREFIX_RRD_LOCATION);
             sprintf(ipStr, "%lu_%lu_%lu_%lu_%hu_%lu", 
                     shmForAgg->prefixV4Tab[index][i].beginning>>24,
@@ -107 +110 @@
             strcat(name, RRD_EXTENSION);
             if ( (fp=fopen(name,"r")) == NULL ){
-              opt[0]= (char *) malloc((strlen(RRD_PARAM_0) + 1) * sizeof(char));
-              strcpy(opt[0], RRD_PARAM_0);
+              opt[0]= (char *) malloc((strlen(RRD_PARAM_PREFIX_0) + 1) * sizeof(char));
+              strcpy(opt[0], RRD_PARAM_PREFIX_0);
               opt[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
               strcpy(opt[1], name);
-              opt[2]= (char *) malloc((strlen(RRD_PARAM_1) + 1) * sizeof(char));
-              strcpy(opt[2], RRD_PARAM_1);
-              opt[3]= (char *) malloc((strlen(RRD_PARAM_2) + 1) * sizeof(char));
-              strcpy(opt[3], RRD_PARAM_2);
-              opt[4]= (char *) malloc((strlen(RRD_PARAM_3) + 1) * sizeof(char));
-              strcpy(opt[4], RRD_PARAM_3);
-              opt[5]= (char *) malloc((strlen(RRD_PARAM_4) + 1) * sizeof(char));
-              strcpy(opt[5], RRD_PARAM_4);
-              opt[6]= (char *) malloc((strlen(RRD_PARAM_5) + 1) * sizeof(char));
-              strcpy(opt[6], RRD_PARAM_5);
-              opt[7]= (char *) malloc((strlen(RRD_PARAM_6) + 1) * sizeof(char));
-              strcpy(opt[7], RRD_PARAM_6);
-              opt[8]= (char *) malloc((strlen(RRD_PARAM_7) + 1) * sizeof(char));
-              strcpy(opt[8], RRD_PARAM_7);
-              opt[9]= (char *) malloc((strlen(RRD_PARAM_8) + 1) * sizeof(char));
-              strcpy(opt[9], RRD_PARAM_8);
-              opt[10]= (char *) malloc((strlen(RRD_PARAM_9) + 1) * sizeof(char));
-              strcpy(opt[10], RRD_PARAM_9);
-              opt[11]= (char *) malloc((strlen(RRD_PARAM_10) + 1) * sizeof(char));
-              strcpy(opt[11], RRD_PARAM_10);
-              opt[12]= (char *) malloc((strlen(RRD_PARAM_11) + 1) * sizeof(char));
-              strcpy(opt[12], RRD_PARAM_11);
-              opt[13]= (char *) malloc((strlen(RRD_PARAM_12) + 1) * sizeof(char));
-              strcpy(opt[13], RRD_PARAM_12);
-              opt[14]= (char *) malloc((strlen(RRD_PARAM_13) + 1) * sizeof(char));
-              strcpy(opt[14], RRD_PARAM_13);
-              opt[15]= (char *) malloc((strlen(RRD_PARAM_14) + 1) * sizeof(char));
-              strcpy(opt[15], RRD_PARAM_14);
-              opt[16]= (char *) malloc((strlen(RRD_PARAM_15) + 1) * sizeof(char));
-              strcpy(opt[16], RRD_PARAM_15);
-              opt[17]= (char *) malloc((strlen(RRD_PARAM_16) + 1) * sizeof(char));
-              strcpy(opt[17], RRD_PARAM_16);
-              opt[18]= (char *) malloc((strlen(RRD_PARAM_17) + 1) * sizeof(char));
-              strcpy(opt[18], RRD_PARAM_17);
-              opt[19]= (char *) malloc((strlen(RRD_PARAM_18) + 1) * sizeof(char));
-              strcpy(opt[19], RRD_PARAM_18);
-              opt[20]= (char *) malloc((strlen(RRD_PARAM_19) + 1) * sizeof(char));
-              strcpy(opt[20], RRD_PARAM_19);
-              opt[21]= (char *) malloc((strlen(RRD_PARAM_20) + 1) * sizeof(char));
-              strcpy(opt[21], RRD_PARAM_20);
-              opt[22]= (char *) malloc((strlen(RRD_PARAM_21) + 1) * sizeof(char));
-              strcpy(opt[22], RRD_PARAM_21);
-              opt[23]= (char *) malloc((strlen(RRD_PARAM_22) + 1) * sizeof(char));
-              strcpy(opt[23], RRD_PARAM_22);
-              opt[24]= (char *) malloc((strlen(RRD_PARAM_23) + 1) * sizeof(char));
-              strcpy(opt[24], RRD_PARAM_23);
-              opt[25]= (char *) malloc((strlen(RRD_PARAM_24) + 1) * sizeof(char));
-              strcpy(opt[25], RRD_PARAM_24);
-              opt[26]= (char *) malloc((strlen(RRD_PARAM_25) + 1) * sizeof(char));
-              strcpy(opt[26], RRD_PARAM_25);
+              opt[2]= (char *) malloc((strlen(RRD_PARAM_PREFIX_1) + 1) * sizeof(char));
+              strcpy(opt[2], RRD_PARAM_PREFIX_1);
+              opt[3]= (char *) malloc((strlen(RRD_PARAM_PREFIX_2) + 1) * sizeof(char));
+              strcpy(opt[3], RRD_PARAM_PREFIX_2);
+              opt[4]= (char *) malloc((strlen(RRD_PARAM_PREFIX_3) + 1) * sizeof(char));
+              strcpy(opt[4], RRD_PARAM_PREFIX_3);
+              opt[5]= (char *) malloc((strlen(RRD_PARAM_PREFIX_4) + 1) * sizeof(char));
+              strcpy(opt[5], RRD_PARAM_PREFIX_4);
+              opt[6]= (char *) malloc((strlen(RRD_PARAM_PREFIX_5) + 1) * sizeof(char));
+              strcpy(opt[6], RRD_PARAM_PREFIX_5);
+              opt[7]= (char *) malloc((strlen(RRD_PARAM_PREFIX_6) + 1) * sizeof(char));
+              strcpy(opt[7], RRD_PARAM_PREFIX_6);
+              opt[8]= (char *) malloc((strlen(RRD_PARAM_PREFIX_7) + 1) * sizeof(char));
+              strcpy(opt[8], RRD_PARAM_PREFIX_7);
+              opt[9]= (char *) malloc((strlen(RRD_PARAM_PREFIX_8) + 1) * sizeof(char));
+              strcpy(opt[9], RRD_PARAM_PREFIX_8);
+              opt[10]= (char *) malloc((strlen(RRD_PARAM_PREFIX_9) + 1) * sizeof(char));
+              strcpy(opt[10], RRD_PARAM_PREFIX_9);
+              opt[11]= (char *) malloc((strlen(RRD_PARAM_PREFIX_10) + 1) * sizeof(char));
+              strcpy(opt[11], RRD_PARAM_PREFIX_10);
+              opt[12]= (char *) malloc((strlen(RRD_PARAM_PREFIX_11) + 1) * sizeof(char));
+              strcpy(opt[12], RRD_PARAM_PREFIX_11);
+              opt[13]= (char *) malloc((strlen(RRD_PARAM_PREFIX_12) + 1) * sizeof(char));
+              strcpy(opt[13], RRD_PARAM_PREFIX_12);
+              opt[14]= (char *) malloc((strlen(RRD_PARAM_PREFIX_13) + 1) * sizeof(char));
+              strcpy(opt[14], RRD_PARAM_PREFIX_13);
+              opt[15]= (char *) malloc((strlen(RRD_PARAM_PREFIX_14) + 1) * sizeof(char));
+              strcpy(opt[15], RRD_PARAM_PREFIX_14);
+              opt[16]= (char *) malloc((strlen(RRD_PARAM_PREFIX_15) + 1) * sizeof(char));
+              strcpy(opt[16], RRD_PARAM_PREFIX_15);
+              opt[17]= (char *) malloc((strlen(RRD_PARAM_PREFIX_16) + 1) * sizeof(char));
+              strcpy(opt[17], RRD_PARAM_PREFIX_16);
+              opt[18]= (char *) malloc((strlen(RRD_PARAM_PREFIX_17) + 1) * sizeof(char));
+              strcpy(opt[18], RRD_PARAM_PREFIX_17);
+              opt[19]= (char *) malloc((strlen(RRD_PARAM_PREFIX_18) + 1) * sizeof(char));
+              strcpy(opt[19], RRD_PARAM_PREFIX_18);
+              opt[20]= (char *) malloc((strlen(RRD_PARAM_PREFIX_19) + 1) * sizeof(char));
+              strcpy(opt[20], RRD_PARAM_PREFIX_19);
+              opt[21]= (char *) malloc((strlen(RRD_PARAM_PREFIX_20) + 1) * sizeof(char));
+              strcpy(opt[21], RRD_PARAM_PREFIX_20);
+              opt[22]= (char *) malloc((strlen(RRD_PARAM_PREFIX_21) + 1) * sizeof(char));
+              strcpy(opt[22], RRD_PARAM_PREFIX_21);
+              opt[23]= (char *) malloc((strlen(RRD_PARAM_PREFIX_22) + 1) * sizeof(char));
+              strcpy(opt[23], RRD_PARAM_PREFIX_22);
+              opt[24]= (char *) malloc((strlen(RRD_PARAM_PREFIX_23) + 1) * sizeof(char));
+              strcpy(opt[24], RRD_PARAM_PREFIX_23);
+              opt[25]= (char *) malloc((strlen(RRD_PARAM_PREFIX_24) + 1) * sizeof(char));
+              strcpy(opt[25], RRD_PARAM_PREFIX_24);
+              opt[26]= (char *) malloc((strlen(RRD_PARAM_PREFIX_25) + 1) * sizeof(char));
+              strcpy(opt[26], RRD_PARAM_PREFIX_25);
               optind = opterr = 0;
               rrd_clear_error();
@@ -230 +233 @@
             shmForAgg->prefixV4Tab[index][i].fourthCoSOUT = 0; 
           }
-        }      
+        }
+        /* MATRIX INTER POP ACCOUNTING */
+        /* rrd */
+        for (i=0; i<ROUTER_INDEX_MAX; i++){
+          for (j=0; j<ROUTER_INDEX_MAX; j++){
+            /* HERE create or update RRD FILE */
+            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(indexStr); k++) {indexStr[k] = '\0';}
+            for (k=0; k<strlen(buf); k++) {buf[k] = '\0';}
+            strcat(name, MATRIX_RRD_LOCATION);
+            sprintf(indexStr, "%d_%d", 
+                    i,
+                    j
+                    ); 
+            strcat(name, indexStr);
+            strcat(name, RRD_EXTENSION);
+            if ( (fp=fopen(name,"r")) == NULL ){
+              opt[0]= (char *) malloc((strlen(RRD_PARAM_MATRIX_0) + 1) * sizeof(char));
+              strcpy(opt[0], RRD_PARAM_MATRIX_0);
+              opt[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
+              strcpy(opt[1], name);
+              opt[2]= (char *) malloc((strlen(RRD_PARAM_MATRIX_1) + 1) * sizeof(char));
+              strcpy(opt[2], RRD_PARAM_MATRIX_1);
+              opt[3]= (char *) malloc((strlen(RRD_PARAM_MATRIX_2) + 1) * sizeof(char));
+              strcpy(opt[3], RRD_PARAM_MATRIX_2);
+              opt[4]= (char *) malloc((strlen(RRD_PARAM_MATRIX_3) + 1) * sizeof(char));
+              strcpy(opt[4], RRD_PARAM_MATRIX_3);
+              opt[5]= (char *) malloc((strlen(RRD_PARAM_MATRIX_4) + 1) * sizeof(char));
+              strcpy(opt[5], RRD_PARAM_MATRIX_4);
+              opt[6]= (char *) malloc((strlen(RRD_PARAM_MATRIX_5) + 1) * sizeof(char));
+              strcpy(opt[6], RRD_PARAM_MATRIX_5);
+              opt[7]= (char *) malloc((strlen(RRD_PARAM_MATRIX_6) + 1) * sizeof(char));
+              strcpy(opt[7], RRD_PARAM_MATRIX_6);
+              opt[8]= (char *) malloc((strlen(RRD_PARAM_MATRIX_7) + 1) * sizeof(char));
+              strcpy(opt[8], RRD_PARAM_MATRIX_7);
+              opt[9]= (char *) malloc((strlen(RRD_PARAM_MATRIX_8) + 1) * sizeof(char));
+              strcpy(opt[9], RRD_PARAM_MATRIX_8);
+              opt[10]= (char *) malloc((strlen(RRD_PARAM_MATRIX_9) + 1) * sizeof(char));
+              strcpy(opt[10], RRD_PARAM_MATRIX_9);
+              opt[11]= (char *) malloc((strlen(RRD_PARAM_MATRIX_10) + 1) * sizeof(char));
+              strcpy(opt[11], RRD_PARAM_MATRIX_10);
+              opt[12]= (char *) malloc((strlen(RRD_PARAM_MATRIX_11) + 1) * sizeof(char));
+              strcpy(opt[12], RRD_PARAM_MATRIX_11);
+              opt[13]= (char *) malloc((strlen(RRD_PARAM_MATRIX_12) + 1) * sizeof(char));
+              strcpy(opt[13], RRD_PARAM_MATRIX_12);
+              opt[14]= (char *) malloc((strlen(RRD_PARAM_MATRIX_13) + 1) * sizeof(char));
+              strcpy(opt[14], RRD_PARAM_MATRIX_13);
+              opt[15]= (char *) malloc((strlen(RRD_PARAM_MATRIX_14) + 1) * sizeof(char));
+              strcpy(opt[15], RRD_PARAM_MATRIX_14);
+              optind = opterr = 0;
+              rrd_clear_error();
+              if ( rrd_create(16,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<16; k++) {
+                free(opt[k]);
+                opt[k] = NULL;
+              }
+            }else{ 
+              fclose(fp);
+              rrd_already_created_ct++;
+              snprintf(buf, 
+                       2048, 
+                       "%lu:%llu:%llu:%llu",  
+                       now-300,  /* or ctime(&now) with %s */
+                       shmForAgg->matrixPOP[index][i][j].flowNb,
+                       shmForAgg->matrixPOP[index][i][j].bytesNb,
+                       shmForAgg->matrixPOP[index][i][j].pktsNb
+                       );
+              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;
+              }
+            }
+
+          }
+        }
+        /* reinit */
+        for (i=0; i<ROUTER_INDEX_MAX; i++){
+          for (j=0; j<ROUTER_INDEX_MAX; j++) {
+            shmForAgg->matrixPOP[index][i][j].bytesNb = 0;
+            shmForAgg->matrixPOP[index][i][j].pktsNb = 0;
+            shmForAgg->matrixPOP[index][i][j].flowNb = 0;
+          }
+        }
+        /* END MATRIX INTER POP ACC */
         now2 = time((time_t *)NULL);
         /* #ifdef DEBUGAGG */
@@ -250 +356 @@
       } else {
         isFirstUpdate = 0;
+        /* Reinit the shared table */
+        for (i=0; i<shmForAgg->v4PrefixNb; i++){
+          shmForAgg->prefixV4Tab[index][i].flowNbIN = 0;
+          shmForAgg->prefixV4Tab[index][i].bytesNbIN = 0;
+          shmForAgg->prefixV4Tab[index][i].pktsNbIN = 0;
+          shmForAgg->prefixV4Tab[index][i].flowNbOUT = 0;
+          shmForAgg->prefixV4Tab[index][i].bytesNbOUT = 0;
+          shmForAgg->prefixV4Tab[index][i].pktsNbOUT = 0;
+          shmForAgg->prefixV4Tab[index][i].firstCoSIN = 0;
+          shmForAgg->prefixV4Tab[index][i].secondCoSIN = 0;
+          shmForAgg->prefixV4Tab[index][i].thirdCoSIN = 0;
+          shmForAgg->prefixV4Tab[index][i].fourthCoSIN = 0;
+          shmForAgg->prefixV4Tab[index][i].firstCoSOUT = 0;
+          shmForAgg->prefixV4Tab[index][i].secondCoSOUT = 0;
+          shmForAgg->prefixV4Tab[index][i].thirdCoSOUT = 0;
+          shmForAgg->prefixV4Tab[index][i].fourthCoSOUT = 0; 
+        }
+        /* reinit */
+        for (i=0; i<ROUTER_INDEX_MAX; i++){
+          for (j=0; j<ROUTER_INDEX_MAX; j++) {
+            shmForAgg->matrixPOP[index][i][j].bytesNb = 0;
+            shmForAgg->matrixPOP[index][i][j].pktsNb = 0;
+            shmForAgg->matrixPOP[index][i][j].flowNb = 0;
+          }
+        }
       }  
     } 

trunk/src/renetcolAgg.h

@@ -41 +41 @@
 #include "rrdwrap.h"
 #include "dataFlowSet.h"
-
-#define RRD_LOCATION "/home/maintenance/RRD/"
-#define RRD_EXTENSION ".rrd"
-
-#define RRD_PARAM_0 "rrdcreate"
-#define RRD_PARAM_1 "--start"
-#define RRD_PARAM_2 "1106560200"
-#define RRD_PARAM_3 "--step"
-#define RRD_PARAM_4 "300"
-#define RRD_PARAM_5 "DS:inFlows:GAUGE:600:U:U"
-#define RRD_PARAM_6 "DS:outFlows:GAUGE:600:U:U"
-#define RRD_PARAM_7 "DS:inBytes:GAUGE:600:U:U"
-#define RRD_PARAM_8 "DS:outBytes:GAUGE:600:U:U"
-#define RRD_PARAM_9 "DS:inPkts:GAUGE:600:U:U"
-#define RRD_PARAM_10 "DS:outPkts:GAUGE:600:U:U"
-#define RRD_PARAM_11 "DS:inFirstCoS:GAUGE:600:U:U"
-#define RRD_PARAM_12 "DS:outFirstCoS:GAUGE:600:U:U"
-#define RRD_PARAM_13 "DS:inSecondCoS:GAUGE:600:U:U"
-#define RRD_PARAM_14 "DS:outSecondCoS:GAUGE:600:U:U"
-#define RRD_PARAM_15 "DS:inThirdCoS:GAUGE:600:U:U"
-#define RRD_PARAM_16 "DS:outThirdCoS:GAUGE:600:U:U"
-#define RRD_PARAM_17 "DS:inFourthCoS:GAUGE:600:U:U"
-#define RRD_PARAM_18 "DS:outFourthCoS:GAUGE:600:U:U"
-#define RRD_PARAM_19 "RRA:AVERAGE:0.5:1:2100"
-#define RRD_PARAM_20 "RRA:AVERAGE:0.5:24:1550"
-#define RRD_PARAM_21 "RRA:AVERAGE:0.5:288:1594"
-#define RRD_PARAM_22 "RRA:AVERAGE:0.5:2016:1040"
-#define RRD_PARAM_23 "RRA:MAX:0.5:1:2100"
-#define RRD_PARAM_24 "RRA:MAX:0.5:24:1550"
-#define RRD_PARAM_25 "RRA:MAX:0.5:288:1594"
-
-#define RRD_UPDATE_0 "rrdupdate"
-
-#define SHMSIZE 33554432 /* FIXME get from another file ? */
+#include "pop.h"
+#include "renetcolParam.h"
 
 struct SHMForAgg {
@@ -82 +50 @@
   unsigned short v4PrefixNb;
   struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];
+  struct POP matrixPOP[2][ROUTER_INDEX_MAX][ROUTER_INDEX_MAX];
   /*  struct PrefixV6 ; */
-};
+}; /* if you change it, you must change renetcol.h structure */

trunk/src/renetcolSender.h

@@ -41 +41 @@
 #include "rules_mgmt.h"
 #include "remote_output.h"
+#include "renetcolParam.h"
 
-#define RECEPT_PORT "52571"
-#define VAR_SHARED_SIZE 4
-#define FILE_TEMPO "/tmp/rules.tmp"
-         
 typedef union semun
 {

trunk/src/routers_mgmt.h

@@ -67 +67 @@
   struct PrefixV4 *currentV4Tab;
   struct PrefixV4 *secondV4Tab;
+  struct POP *matrixPOP;
+  unsigned long long nbFluxSR4;
+  unsigned long long nbFluxSE;
+  unsigned long long nbFluxIR4;
+  unsigned long long nbFluxUK;
+  unsigned long long nbFluxTT;
 };
 

trunk/tool/check.sh

@@ -1 +1 @@
 #!/bin/sh
 
-num=`ps ax |grep -i "renetcol" | grep -v grep | grep -v defunct |wc -l`
+num=`ps ax|grep "renetcol" |grep -v grep|grep -v defunct|grep -v check|wc -l|awk '{print $1}'`
 
-if [ 4 -gt $num ]
-then 
+if [ $num -lt 4 ]
+then
+  killall renetcol
+  sleep 1
   killall renetcolSender
   sleep 1
@@ -11 +13 @@
   /home/maintenance/renetcol-0.0.9/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.9/src/renetcol
   echo "renetcolMsgCtl started"
-  sleep 5
-  /home/maintenance/renetcol-0.0.9/src/renetcol /home/maintenance/renetcol-0.0.9/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.8/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.8/src/rules.txt
+  sleep 2
+  /home/maintenance/renetcol-0.0.9/src/renetcol /home/maintenance/renetcol-0.0.9/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.9/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.9/src/rules.txt
   echo "renetcol restarted"
-  /home/maintenance/renetcol-0.0.9/src/renetcolSender /home/maintenance/renetcol-0.0.9/src/renetcol 1 /home/maintenance/renetcol-0.0.8/src/rules.txt
+  /home/maintenance/renetcol-0.0.9/src/renetcolSender /home/maintenance/renetcol-0.0.9/src/renetcol 1 /home/maintenance/renetcol-0.0.9/src/rules.txt
   echo "renetcolSender restarted"
-  /home/maintenance/renetcol-0.0.9/src/renetcolAgg 
+  /home/maintenance/renetcol-0.0.9/src/renetcolAgg
 else
   echo "All is up"

trunk/tool/renetcolGUI_0_0_7.py

@@ -1 +1 @@
 
-##  File: renetcolGUI_0_0_3.py
+##  File: renetcolGUI_0_0_7.py
   
 ##  Authors: ANDREU Francois-Xavier 
@@ -1003 +1003 @@
     print "BPG_IPV6_NEXT_HOP: 63,"
     print "IP_PROTOCOL_VERSION: 60, please note that the IPv4 template don't have this field"
-    print "ROUTER_SRC_ADDR: 0, here it's not a real number for a field"
+    print "ROUTER_SRC_ADDR: 0, !!! it's not a real number for a field, but it's a great function"
     print "----------------------------------------------------------------"