Changeset 22

Timestamp:

01/17/07 18:37:59 (16 years ago)

Author:

andreu

Message:

aggregation et timer

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/dataFlowSet.c (modified) (19 diffs)
• src/dataFlowSet.h (modified) (1 diff)
• src/fields_mgmt.c (modified) (2 diffs)
• src/get_conf.c (modified) (3 diffs)
• src/get_conf.h (modified) (2 diffs)
• src/renetcol.c (modified) (13 diffs)
• src/renetcol.h (modified) (2 diffs)

trunk/configure.in

@@ -3 +3 @@
 
 AC_PREREQ(2.59)
-AC_INIT(RENETCOL, 0.0.5, andreu@renater.fr)
+AC_INIT(RENETCOL, 0.0.7, andreu@renater.fr)
 AC_CONFIG_SRCDIR(src/)
 AC_PROG_MAKE_SET
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
-CFLAGS="-I/usr/local/include -g -ansi -Wall -D _SVID_SOURCE \
-        -DSIGSETJMP_IS_BROKEN \
-        -D _XOPEN_SOURCE \
-        -pedantic \
-        -pg"
+CFLAGS="-I/usr/local/include -g -ansi -Wall -D _SVID_SOURCE -DSIGSETJMP_IS_BROKEN -D _XOPEN_SOURCE -pedantic -pg"
 
 CFLAGS_CRIHAN="-DCRIHAN"
+CFLAGS_IPV4AGG="-DIPV4AGG"
+CFLAGS_DEBUGTPLDEF="-DDEBUGTPLDEF"
                                 
 # Checks for programs.
@@ -35 +33 @@
 fi
 
+AC_ARG_ENABLE(ipv4agg,[  --enable-ipv4agg aggregation for IPv4 prefix=yes],
+ipv4agg=$enableval,ipv4agg=yes)
+if test $ipv4agg = yes ; then
+CFLAGS="$CFLAGS $CFLAGS_IPV4AGG"
+fi
+
+AC_ARG_ENABLE(debugtpldef,[  --enable-debugtpldef Debug template definition=no],
+debugtpldef=$enableval,debugtpldef=no)
+if test $debugtpldef = yes ; then
+CFLAGS="$CFLAGS $CFLAGS_DEBUGTPLDEF"
+fi
+
 AC_SUBST(CFLAGS)
 

trunk/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = renetcol renetcolSender renetcolMsgCtl
-renetcol_SOURCES = renetcol.c template.c V9Header_mgmt.c msg_mgmt.c fields_mgmt.c \
-                routers_mgmt.c tplflset_mgmt.c headers_mgmt.c renetcol.h template.h \
-                V9Header_mgmt.h msg_mgmt.h fields_mgmt.h 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
-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
+renetcol_SOURCES = renetcol.c template.c V9Header_mgmt.c msg_mgmt.c \
+        fields_mgmt.c routers_mgmt.c tplflset_mgmt.c headers_mgmt.c \
+        renetcol.h template.h V9Header_mgmt.h msg_mgmt.h fields_mgmt.h \
+        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
+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
 renetcolMsgCtl_SOURCES = renetcolMsgCtl.c
 BUILT_SOURCES = renetcol.o renetcolSender.o 

trunk/src/dataFlowSet.c

@@ -27 +27 @@
 
 /*
- * checkDataFlowSet
+ * Check Data FlowSet 
  *
+ * @param shift Shift
+ * @param cr Current router pointer
+ * @param v9Ptr Pointer in the datagram ??
+ * @param offv9 index in the datagram
+ * @param buf Pointer to the buffer
+ * @param cFNPtr Pointer on the current flowset number
+ * @param cFId Pointer on the current flowset ID
+ * @param pcktPtr Pointer on the datagram buffer
+ * @param rulesCache Pointer on the rules table (cache for the next param)
+ * @param rlPtr Pointer on the rules list
+ * @param myQueue FIXME : to erase/delete/suppress
+ * @param V4PTab Pointer on the IPv4 Prefix Table
+ * @param nbPV4 Previous table size
+ * @param ipCache Cache for all IP flow (for CRIHAN compilation option)
+ * @param mplsCache Cache for all MPLS flow (for CRIHAN compilation option)
+ * @param ipCounter Param to defined IP Cache size
+ * @param mplsCounter Param to defined MPLS Cache size 
+ * @return shift (index in the datagram) FIXME 
+ * 
+ * FIXME to tune : just a param like a table ?
  */
 unsigned short 
@@ -65 +85 @@
   struct PrefixV4 prefixKey, *res; /* for bsearch */
   struct AggCache agCache;
-#ifdef CRIHAN
-  struct IPFLowCache ipFirstCache; /* CRI */
-  struct MPLSFlowCache mplsFirstCache; /* CRI */
-  unsigned long firstTime = 0; /* CRI */
-  unsigned long lastTime = 0; /* CRI */
-#endif /* CRIHAN */
-  int bool = 0;
+  int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
+                /* flow, we test on the field and then put bool at 1 */
+#ifdef CRIHAN
+  struct IPFLowCache ipFirstCache;
+  struct MPLSFlowCache mplsFirstCache;
+  unsigned long firstTime = 0; 
+  unsigned long lastTime = 0; 
 
-#ifdef CRIHAN
   ipFirstCache.ipProt = 0;
   ipFirstCache.bytes = 0;
@@ -117 +136 @@
       return (data_length+shift);
     }
-    /* aggreg */
-/*     agCache.routerAd = pcktPtr->ipH->srcAdd; */
-    /* end aggreg */
+#ifdef IPV4AGG
+    agCache.routerAd = pcktPtr->ipH->srcAdd; 
+#endif
 
 #ifdef CRIHAN
@@ -164 +183 @@
               }
               /* end rule check */
-              /* aggregation */
-/*            if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){ */
-/*              agCache.maskS = *((unsigned char*)&buffer1); */
-/*            } */
-/*            if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){ */
-/*              agCache.maskD = *((unsigned char*)&buffer1); */
-/*            } */
-/*            if (pftmp->fieldType==60){ */
-/*              agCache.ipProt = *((unsigned char*)&buffer1); */
-/*            } */
-/*            if (pftmp->fieldType==4){ */
-/*              agCache.tProt = *((unsigned char*)&buffer1); */
-/*            } */
-/*            if (pftmp->fieldType==61){ */
-/*              agCache.sens = *((unsigned char*)&buffer1); */
-/*            } */
-/*            if (pftmp->fieldType==5){ */
-/*              agCache.dscp = *((unsigned char*)&buffer1); */
-/*            } */
-              /* end aggregation */
+#ifdef IPV4AGG
+              if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
+                agCache.maskS = *((unsigned char*)&buffer1);
+              }
+              if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){
+                agCache.maskD = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==60){
+                agCache.ipProt = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==4){
+                agCache.tProt = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==61){
+                agCache.sens = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==5){
+                agCache.dscp = *((unsigned char*)&buffer1);
+              }
+#endif        
 #ifdef CRIHAN
               if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
@@ -198 +217 @@
                 ipFirstCache.tProt = *((unsigned char*)&buffer1); 
               }
-#endif /* CRIHAN */
+#endif
               break;
             case 2:
@@ -206 +225 @@
                   == *((unsigned short*)&buffer2))
                 ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
-              /* aggregation */
-/*            if (pftmp->fieldType==10){ */
-/*              agCache.idSnmp = *((unsigned short*)&buffer2); */
-/*            } */
-              /* end aggregation */
+#ifdef IPV4AGG
+              if (pftmp->fieldType==10){
+                agCache.idSnmp = *((unsigned short*)&buffer2);
+              }
+#endif
 #ifdef CRIHAN
               if (pftmp->fieldType==10){
@@ -224 +243 @@
                 ipFirstCache.dPort = *((unsigned short*)&buffer2);
               }
-#endif /* CRIHAN */ 
+#endif
               break;
             case 3:
@@ -240 +259 @@
                 mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
               }
-#endif /* CRIHAN */
+#endif
               break;
             case 4:
@@ -255 +274 @@
                   }
               }       
-              /* aggregation */
-/*            if ((pftmp->fieldType==8)){ */
-/*              agCache.v4AdS = *((unsigned long*)&buffer4); */
-/*            } */
-/*            if ((pftmp->fieldType==12)){ */
-/*              agCache.v4AdD = *((unsigned long*)&buffer4); */
-/*            } */
-/*            if (pftmp->fieldType==1){ */
-/*              agCache.bytes = *((unsigned long*)&buffer4); */
-/*            } */
-/*            if (pftmp->fieldType==2){ */
-/*              agCache.pkts = *((unsigned long*)&buffer4); */
-/*            } */
-              /* end aggregation */
+#ifdef IPV4AGG
+              if ((pftmp->fieldType==8)){
+                agCache.v4AdS = *((unsigned long*)&buffer4);
+              }
+              if ((pftmp->fieldType==12)){
+                agCache.v4AdD = *((unsigned long*)&buffer4);
+              }
+              if (pftmp->fieldType==1){
+                agCache.bytes = *((unsigned long*)&buffer4);
+              }
+              if (pftmp->fieldType==2){
+                agCache.pkts = *((unsigned long*)&buffer4);
+              }
+#endif
 #ifdef CRIHAN
               if (pftmp->fieldType==8){
@@ -290 +309 @@
                 lastTime = *((unsigned long*)&buffer4);
               }
-#endif /* CRIHAN */
+#endif
               break;
             case 16:
@@ -415 +434 @@
               }
               moreIsNecessary = 1;
-              /* aggregation */
+              /* aggregation for IPv6 flows */
               
               /* end aggregation */
@@ -437 +456 @@
       } else {
         /* 
-         * no rule within this field type, but we must reading the value 
+         * no rule within this field type, but we must read the value 
          */
         switch (field_size) {
         case 1:
           buffer1 = *(buf+(*offV9)); (*offV9)++;
-          /* aggregation */
-/*        if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){ */
-/*          agCache.maskS = *((unsigned char*)&buffer1); */
-/*        } */
-/*        if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){ */
-/*          agCache.maskD = *((unsigned char*)&buffer1); */
-/*        } */
-/*        if (pftmp->fieldType==60){ */
-/*          agCache.ipProt = *((unsigned char*)&buffer1); */
-/*        } */
-/*        if (pftmp->fieldType==4){ */
-/*          agCache.tProt = *((unsigned char*)&buffer1); */
-/*        } */
-/*        if (pftmp->fieldType==61){ */
-/*          agCache.sens = *((unsigned char*)&buffer1); */
-/*        } */
-/*        if (pftmp->fieldType==5){ */
-/*          agCache.dscp = *((unsigned char*)&buffer1); */
-/*        }        */
-          /* end aggregation */
+#ifdef IPV4AGG
+          if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
+            agCache.maskS = *((unsigned char*)&buffer1);
+          }
+          if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){
+            agCache.maskD = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==60){
+            agCache.ipProt = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==4){
+            agCache.tProt = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==61){
+            agCache.sens = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==5){
+            agCache.dscp = *((unsigned char*)&buffer1);
+          }       
+#endif
 #ifdef CRIHAN
           if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
@@ -476 +495 @@
             ipFirstCache.tProt = *((unsigned char*)&buffer1); 
           }
-#endif /* CRIHAN */
+#endif
           break;
         case 2:
           buffer2[1]= *(buf+(*offV9)); (*offV9)++;
           buffer2[0]= *(buf+(*offV9)); (*offV9)++;
-          /* aggregation */
+#ifdef IPV4AGG
           if (pftmp->fieldType==10){
             agCache.idSnmp = *((unsigned short*)&buffer2);
           }       
-          /* end aggregation */
+#endif
 #ifdef CRIHAN
           if (pftmp->fieldType==10){
@@ -499 +518 @@
             ipFirstCache.dPort = *((unsigned short*)&buffer2);
           }
-#endif /* CRIHAN */
+#endif
           break;
         case 3:
@@ -512 +531 @@
             mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
           }
-#endif /* CRIHAN */
+#endif
           break;
         case 4:
@@ -519 +538 @@
           buffer4[1]= *(buf+(*offV9)); (*offV9)++;
           buffer4[0]= *(buf+(*offV9)); (*offV9)++;
-          /* aggregation */
-/*        if ((pftmp->fieldType==8)){ */
-/*          bool = 1; */
-/*          agCache.v4AdS = *((unsigned long*)&buffer4); */
-/*        } else if ((pftmp->fieldType==12)){ */
-/*          agCache.v4AdD = *((unsigned long*)&buffer4); */
-/*        } else if (pftmp->fieldType==1){ */
-/*          agCache.bytes = *((unsigned long*)&buffer4); */
-/*        } else if (pftmp->fieldType==2){ */
-/*          agCache.pkts = *((unsigned long*)&buffer4); */
-/*        } */
-          /* end aggregation */
+#ifdef IPV4AGG
+          if ((pftmp->fieldType==8)){
+            bool = 1;
+            agCache.v4AdS = *((unsigned long*)&buffer4);
+          } else if ((pftmp->fieldType==12)){
+            agCache.v4AdD = *((unsigned long*)&buffer4);
+          } else if (pftmp->fieldType==1){
+            agCache.bytes = *((unsigned long*)&buffer4);
+          } else if (pftmp->fieldType==2){
+            agCache.pkts = *((unsigned long*)&buffer4);
+          }
+#endif
 #ifdef CRIHAN
           if (pftmp->fieldType==8){
@@ -552 +571 @@
             lastTime = *((unsigned long*)&buffer4);
           }
-#endif /* CRIHAN */
+#endif
           break;
         case 16:
@@ -561 +580 @@
             buffer2[0]= *(buf+(*offV9)); (*offV9)++;
           }
-          /* aggregation */       
+          /* aggregation IPv6 */          
           /* end aggregation */
           break;
@@ -617 +636 @@
           (*mplsCounter)++;
         }
-#endif /* CRIHAN */
-        /* put aggregation cache information to tables */
-/*      if (bool == 1){ */
-/*        prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS); */
-/*        res = bsearch(&prefixKey, V4PTab, nbPV4,  */
-/*                      sizeof(struct PrefixV4), prefCmp); */
-/*      } */
-        bool = 0;    
-        /* end put */
+#endif 
+        /* put aggregation cache information to IPv4 Prefixes table */
+#ifdef IPV4AGG
+        if (bool == 1){
+          prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS);
+          res = bsearch(&prefixKey, V4PTab, nbPV4, 
+                        sizeof(struct PrefixV4), prefCmp);
+          if (res!=NULL){
+            res->bytesNb += agCache.bytes;
+            res->pktsNb += agCache.pkts;
+            res->flowNb += 1;
+            switch (agCache.ipProt) {
+            case 1:
+              res->icmpBytesNb += agCache.bytes;
+              res->icmpPktsNb += agCache.pkts;
+              res->icmpFlowNb += 1;
+              break;
+            case 6:
+              res->tcpBytesNb += agCache.bytes;
+              res->tcpPktsNb += agCache.pkts;
+              res->tcpFlowNb += 1;            
+              break;
+            case 17:
+              res->udpBytesNb += agCache.bytes;
+              res->udpPktsNb += agCache.pkts;
+              res->udpFlowNb += 1;
+              break;
+            default:
+              res->othersBytesNb += agCache.bytes;
+              res->othersPktsNb += agCache.pkts;
+              res->othersFlowNb += 1;         
+            }
+          }
+/*        if (res==NULL){ */
+/*          fprintf(stderr, "IPv4_spoofing? ");  */
+/*        } */
+        }
+        bool = 0;
+#endif
         /* 
          * Redirection if needed 

trunk/src/dataFlowSet.h

@@ -73 +73 @@
   unsigned char tProt;
   unsigned char ipProt;
-  unsigned char sens; /* In/out */
+  unsigned char sens; /* In/out field 61 */
   unsigned short idSnmp;
   unsigned long bytes;

trunk/src/fields_mgmt.c

@@ -34 +34 @@
 {
   FieldPtr tmp = pf;
-  fprintf(stderr, "template definition: (field, size)\n");
   for (; tmp; tmp=tmp->next) {
     fprintf(stderr, "(%hu,%hu) ", tmp->fieldType, tmp->fieldLength);
@@ -47 +46 @@
 {
   FieldPtr tmp = pf;
-  fprintf(stderr, "fields set (inv): \n");
   for (; tmp; tmp=tmp->prev) {
     fprintf(stderr, " %hu %hu \n", tmp->fieldType, tmp->fieldLength);

trunk/src/get_conf.c

@@ -141 +141 @@
   unsigned char buffer4[4];
   int i = 0;
-  char prefixStrTab[10000][50];
+  char prefixStrTab[MAX_IPV4_PREFIX][50];
 
   if (!(prefixFile = fopen(filename, "r"))) {
@@ -151 +151 @@
       strcpy(prefixStrTab[counter], line);
       counter++;
-      if (counter == 10000) {
+      if (counter == MAX_IPV4_PREFIX) {
         fprintf(stderr, "bufferoverflow in getPrefixV4 function (get_conf.c)\
-change the value of prefixStrTab declaration and recompile \n");
+change the value of MAX_IPV4_PREFIX  declaration and recompile \n");
         exit(1);
       }
@@ -172 +172 @@
       pV4TabPtr[i].mask = n4;
       pV4TabPtr[i].routerNb = n5;
+      pV4TabPtr[i].flowNb = 0;
+      pV4TabPtr[i].bytesNb = 0;
+      pV4TabPtr[i].pktsNb = 0;
+      pV4TabPtr[i].udpPktsNb = 0;
+      pV4TabPtr[i].tcpPktsNb = 0;
+      pV4TabPtr[i].icmpPktsNb = 0;
+      pV4TabPtr[i].othersPktsNb = 0;
+      pV4TabPtr[i].udpBytesNb = 0;
+      pV4TabPtr[i].tcpBytesNb = 0;
+      pV4TabPtr[i].icmpBytesNb = 0;
+      pV4TabPtr[i].othersBytesNb = 0;
     }
   if( fclose(prefixFile) == 0) {

trunk/src/get_conf.h

@@ -2 +2 @@
  * File: get_conf.h
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2005 GIP RENATER 
@@ -26 +26 @@
 #define GET_CONF_H
 
+#define MAX_IPV4_PREFIX 10000
+
 struct PrefixV4{
-  unsigned long beginning;
+  unsigned long beginning; /* FIXME to transform in start */
   unsigned long end;
-  unsigned short mask;
-  unsigned short routerNb;
+  unsigned short mask;     /* prefix mask  */
+  unsigned short routerNb; /* router ID */
+  unsigned long long flowNb; /* flow number accounting */
+  unsigned long long bytesNb; /* bytes number accounting */
+  unsigned long long pktsNb; /* packets number accounting */
+  unsigned long long udpPktsNb;
+  unsigned long long tcpPktsNb;
+  unsigned long long icmpPktsNb;
+  unsigned long long othersPktsNb;
+  unsigned long long udpBytesNb;
+  unsigned long long tcpBytesNb;
+  unsigned long long icmpBytesNb;
+  unsigned long long othersBytesNb;
+  unsigned long long udpFlowNb;
+  unsigned long long tcpFlowNb;
+  unsigned long long icmpFlowNb;
+  unsigned long long othersFlowNb;
 };
 

trunk/src/renetcol.c

@@ -26 +26 @@
 #include "renetcol.h"
 
-#ifdef CRIHAN
+/* #ifdef CRIHAN */
 struct IPFLowCache tabIP[MAX_IP_FLOW], *tabIPPtr = tabIP;
 struct MPLSFlowCache tabMPLS[MAX_MPLS_FLOW], *tabMPLSPtr = tabMPLS;
-unsigned long ipNb = 0;
-unsigned long mplsNb = 0;
+unsigned long ipNb = 0; /* counter of IP flows number */
+unsigned long mplsNb = 0; /* counter of MPLS flow number */
 unsigned long *ipNbPtr = &ipNb;
 unsigned long *mplsNbPtr = &mplsNb;
-unsigned short currentIPOutputFile = 0;
-unsigned short currentMPLSOutputFile = 0;
+unsigned short currentIPOutputFile = 0; /* index on the current IP file */
+unsigned short currentMPLSOutputFile = 0; /* index on the current MPLS file */
 char outputName[256];
-char cof_str[20];
-FILE *fIP;
-FILE *fMPLS;
-#endif /* CRIHAN */
-
-char *rulesFileName;
-char *configFileName; 
-char *prefixV4FileName; 
-struct sigaction myAction;
-sigjmp_buf contextSigalrm;
-/* struct sigaction myAction;  for timer */ 
+char cof_str[20]; /* current ouput file name */
+FILE *fIP; /* pointer on the IP output file */
+FILE *fMPLS; /* pointer on the MPLS output file */
+/* #endif */
+
+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 */
+sigjmp_buf contextSigalrm; /* '' */
 volatile sig_atomic_t sigusr1Up = 0;
-/* V9 */
-unsigned short offsetV9 = 0;
+/* struct sigaction myAction;  for timer not used in this version */
+
+unsigned short currentIntervalle = 0; /* based on 5 min intervalles */ 
+
+unsigned short offsetV9 = 0; /* index in a neflow v9 packet */
 unsigned short *offsetV9Ptr = &offsetV9;
+
 unsigned char buffer1;
 unsigned char buffer2[2];
 unsigned char buffer4[4];
 unsigned char buffer6[6];
+
 short currentFlowsetNumber;
 short *currentFlowsetNumberPtr = &currentFlowsetNumber;
 short currentFlowsetId;
 short *currentFlowsetIdPtr = &currentFlowsetId;
-TplFlowSetPtr curTplFlSetPtr;
+TplFlowSetPtr curTplFlSetPtr; /* current template flowset pointer */
 TplOptionPtr curTplOptionPtr;
 RouterPtr routersListPtr;
@@ -66 +71 @@
 unsigned long sortedRouterList[ROUTER_INDEX_MAX];
 unsigned long indexedRouterList[ROUTER_INDEX_MAX];
-int routerNb = 0;
-unsigned short v4PrefixNb = 0;
-struct PrefixV4 prefixV4Tab[PREFIX_V4_MAX];
-RulesPtr rulesListPtr;
+int routerNb = 0; /* routers number */
+unsigned short v4PrefixNb = 0; /* IPv4 prefix number */
+struct PrefixV4 prefixV4Tab[MAX_IPV4_PREFIX]; /* IPv4 prefix structure */
+RulesPtr rulesListPtr; /* Rules list */
 NetFlowV9HeaderPtr currentHeaderV9Ptr;
-key_t myKey = 0;
-int myQueue = 0;
-RuleDefPtr rulesAddress[FIELD_TYPE_NUMBER+1][MAX_RULES_PER_FIELD];
+key_t myKey = 0; /* FIXME to delete in futur */
+int myQueue = 0; /* FIXME to delete in futur */
+
+/* Next structure used as cache in rules reading */
+RuleDefPtr rulesAddress[FIELD_TYPE_NUMBER+1][MAX_RULES_PER_FIELD]; 
 RuleDefPtr *rulesAddressPtr;
+
 int reInitConf = 0;
-/* ENDV9 */
+
 static unsigned long datagramNumber;
-static time_t now;
+
+static time_t lastRock;
+static struct tm *tmPtr;
+
 static unsigned long myHost; /* FIXME to erase */
-static struct tm *tmPtr;
 extern int errno;
 static int inputSock;
@@ -112 +122 @@
   }
 
+#ifdef CRIHAN
+  fprintf(stderr, "renetcol compilation with CRIHAN feature enable\n");
+#endif
+#ifdef IPV4AGG
+  fprintf(stderr, "renetcol compilation and execution with IPv4 Aggregation feature enable\n");
+#endif
+  
   openlog(argv[0], LOG_PID, LOG_USER);
-
+  
   configFileName = (char *) malloc((strlen(argv[1])+1) * sizeof(char));
   strcpy (configFileName, argv[1]);
@@ -156 +173 @@
   sigaction (SIGUSR1, &myAction, NULL);
 
+  /* Pointer on rules Table */
   setCache(rulesListPtr);
   rulesAddressPtr = (RuleDefPtr *)rulesAddress;
@@ -188 +206 @@
   datagramNumber =0; /* FIXME : ???? */
 
-  now = time((time_t *)NULL);
-  tmPtr = localtime(&now);
   socketLoop(); /* all work on datagram is made here */
   closelog();
@@ -314 +330 @@
 {
   static unsigned short n0, n1, n2, n3;
-  
+
   initSocket();
   if (sscanf(receptAddress,"%hu.%hu.%hu.%hu",&n0,&n1,&n2,&n3)==0) {
@@ -335 +351 @@
   short version = 0;
   int regRouter = 0;
-  /* CRI */
   time_t now = time((time_t *)NULL);
-  int iIP, iMPLS;
+  int iIP, iMPLS, i;
   time_t lastIPOutput, lastMPLSOutput;
   time_t receptionTime;
-  /* end */
 
   now = time((time_t *)NULL);
+  tmPtr = localtime(&now);
+  currentIntervalle = tmPtr->tm_min;
   lastMPLSOutput = now;
   lastIPOutput = now;
   do {
+    if ( ((tmPtr->tm_min)%2 == 0) && (currentIntervalle != tmPtr->tm_min)){
+      printf("We change the table, min : %d\n", tmPtr->tm_min);
+      currentIntervalle = tmPtr->tm_min;
+    }
     if (sigusr1Up == 1){
       sigusr1Up = 0;
@@ -379 +399 @@
                                        currentFlowsetNumberPtr,
                                        myQueue);
-/*        showAllTplFlSet();  */
+          /* FIXME : TplFlSet Def in a file before next release */
+          /* showAllTplFlSet(); */
         } else if (currentFlowsetId == 1) {
           shift = checkTemplateOption(currentRouterPtr, offsetV9Ptr, 
@@ -400 +421 @@
       break;
     default:
+      /* FIXME : Uncomment before next release */
 /*        syslog(LOG_INFO,  */
 /*           "NetFlow exp. version unknown: %hu, from router: %lu.%lu.%lu.%lu", */
@@ -409 +431 @@
       break;
     }
+/*     for (i=0; i<v4PrefixNb; i++){ */
+/*       fprintf(stderr, "%lu %llu flows\n", */
+/*            prefixV4Tab[i].beginning, */
+/*            prefixV4Tab[i].flowNb); */
+/*     } */
 
 #ifdef CRIHAN
@@ -493 +520 @@
     }
 #endif /* CRIHAN */
+    now = time((time_t *)NULL);
+    tmPtr = localtime(&now);
   } while (1);
 }
@@ -602 +631 @@
   TplFlowSetPtr tmpFS;
   TplOptionPtr tmpOP;
-  fprintf(stderr,"All template definitions: (field, size) :\n");
+  fprintf(stderr,"\n*********************************************\n* All template definitions: (field, size) : *\n*********************************************\n");
   for (; tmp; tmp=tmp->next) {
-    fprintf(stderr,"router %lu.%lu.%lu.%lu : \n",
+    fprintf(stderr,"----------------------\nrouter %lu.%lu.%lu.%lu : \n----------------------\n",
             (tmp->IpAddress>>24),
             (tmp->IpAddress<<8>>24),
@@ -611 +640 @@
     tmpFS =  tmp->tplList;
     for (; tmpFS; tmpFS=tmpFS->next) {
-      fprintf(stderr,"ID %hu: ", tmpFS->templateFlowSetId);
+      fprintf(stderr,"TId %hu (sourceId: %lu):\n", 
+              tmpFS->templateFlowSetId,
+              tmpFS->sourceId);
       printFieldSet(tmpFS->fieldSet);
       fprintf(stderr,"\n");
     }
     if ((tmpOP = tmp->tplOptList) != NULL){
-      fprintf(stderr,"template option: \n");
       for (; tmpOP; tmpOP=tmpOP->next) {
-        fprintf(stderr,"ID %hu: ", tmpOP->templateOptionId);
+        fprintf(stderr,"OpTId %hu (sourceId: %lu) >\n", 
+                tmpOP->templateOptionId,
+                tmpOP->sourceId);
         printFieldSet(tmpOP->fieldSet);
         fprintf(stderr,"\n");

trunk/src/renetcol.h

@@ -70 +70 @@
 
 #define ROUTER_INDEX_MAX 70
-#define PREFIX_V4_MAX 4000
 #define FIELD_TYPE_NUMBER 89
 #define MAX_RULES_PER_FIELD 10
@@ -80 +79 @@
 #define MAX_IP_OUTPUT_FILES 3
 #define MAX_MPLS_OUTPUT_FILES 3
-#define MAX_IP_FLOW 10000
-#define MAX_MPLS_FLOW 200
 #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
 
 void setCache(RulesPtr);