Changeset 25 for trunk/src

Timestamp:

02/08/07 22:44:36 (16 years ago)

Author:

andreu

Message:

aggregation feature : prefix selection even if no routed subnet

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (1 diff)
• prefix_mgmt.c (modified) (2 diffs)
• prefix_mgmt.h (modified) (1 diff)
• renetcol.c (modified) (2 diffs)
• renetcolAgg.c (modified) (3 diffs)
• renetcolAgg.h (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -624 +624 @@
           res = bsearch(&prefixKey, V4PTab, nbPV4, 
                         sizeof(struct PrefixV4), prefCmp);
-          if (res!=NULL){ /* OUT ("traffic from the prefix")  */
+          if (res!=NULL){ 
+            /* OUT ("traffic from the prefix/subnet")  */
             res->bytesNbOUT += agCache.bytes;
             res->pktsNbOUT += agCache.pkts;

trunk/src/prefix_mgmt.c

@@ -23 +23 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <stdio.h>
 
 #include "prefix_mgmt.h"
@@ -38 +37 @@
           );
 }
+
+
+/*
+ * prefGlobalCmp()
+ */
+int
+prefGlobalCmp(const void *elem1, const void *elem2){
+  struct PrefixV4 *el1 = (struct PrefixV4 *) elem1;
+  struct PrefixV4 *el2 = (struct PrefixV4 *) elem2;
+  if ( el1->beginning >= el2->beginning && el1->beginning <= el2->end ) {
+    return 0;
+  } else if (el1->beginning < el2->beginning) {
+    return -1;
+  } else if (el1->beginning > el2->end) {
+    return 1;
+  } else {
+    syslog(LOG_ERR,"You have won !!! This case doesn't exist !!!!");
+    exit(1);
+    return 0;
+  }
+}
+

trunk/src/prefix_mgmt.h

@@ -26 +26 @@
 #define PREFIX_MGMT_H
 
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <errno.h>
+
 #include "get_conf.h"
 
-int prefCmp(const void *, const void *);
+int prefCmp(const void *, const void *); /* quickly cmp, used in headers_mgmt.c */
+int prefGlobalCmp(const void *, const void *); /* bigger cmp, used in dataflowset.c */ 
 
 #endif /* PREFIX_MGMT_H */

trunk/src/renetcol.c

@@ -151 +151 @@
   fprintf(stderr, "renetcol: reading the IPv4 prefix...\n");
   if ( (shmForAgg->v4PrefixNb = getPrefixV4(prefixV4FileName, &(shmForAgg->prefixV4Tab[0][0]))) < 1){
-    fprintf(stderr, "renetcol:  Error \n");
+    fprintf(stderr, "renetcol: Error \n");
     exit(1);
   } else {
-    fprintf(stderr, "renetcol:  OK \n");
+    fprintf(stderr, "renetcol: OK \n");
   }
   if ( (shmForAgg->v4PrefixNb = getPrefixV4(prefixV4FileName, &(shmForAgg->prefixV4Tab[1][0]))) < 1){
@@ -160 +160 @@
     exit(1);
   } else {
-    fprintf(stderr, "renetcol:  OK \n");
+    fprintf(stderr, "renetcol: OK \n");
   }
   myPtrs.rulesListPtr = NULL;
   fprintf(stderr, "renetcol: reading the rules...\n");
   myPtrs.rulesListPtr = getLightRules(myPtrs.rulesListPtr, rulesFileName);
-  fprintf(stderr, "renetcol : OK \n");
+  fprintf(stderr, "renetcol: OK \n");
   tmp = myPtrs.rulesListPtr;
   for ( ; tmp->next; tmp=tmp->next) {

trunk/src/renetcolAgg.c

@@ -69 +69 @@
       now = time((time_t *)NULL);
       for (i=0; i<shmForAgg->v4PrefixNb; i++){
-        
         /* HERE Put in RRD FILE */
-        
-        name[0] = '\0';
+        name[0] = '\0';
         createstr[0] = '\0';
         ipStr[0] = '\0';
         buf[0] = '\0';
-/*      strcat(name, RRD_LOCATION); */
+        strcat(name, RRD_LOCATION);
         sprintf(ipStr, "%lu", shmForAgg->prefixV4Tab[index][i].beginning); 
         strcat(name, ipStr);
-/*      strcat(name, SAMPLING_HERE); */
+        /*      strcat(name, SAMPLING_HERE); */
         strcat(name, RRD_EXTENSION);
         fprintf(stderr, "%s\n", name);
@@ -87 +85 @@
           fprintf(stderr, "%s\n", createstr);
           res_rrd = wrap_rrd_create(createstr);
-/*        printf("%d\n", res_rrd); */
         }else{
           fclose(fp);
         }
     
-        snprintf(buf, 1024, "%s%s %lu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu", 
-/*               RRD_LOCATION, */
+        snprintf(buf, 2048, "%s%s%s %lu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu", 
+                 RRD_LOCATION, 
                  ipStr,
                  RRD_EXTENSION, 
-                 now,  /* or ctime(&now) with %s */
+                 now,  /* or ctime(&now) with %s FIXME -300 */
                  shmForAgg->prefixV4Tab[index][i].flowNbIN,  /* 1  */
                  shmForAgg->prefixV4Tab[index][i].flowNbOUT,
@@ -129 +126 @@
                  );
         printf("\n%s\n", buf); 
-        res_rrd = wrap_rrd_update(buf);
-        printf("resultat wrap_rrd_update : %d\n", res_rrd);
-        
-/*      fprintf(stderr, "%lu \n %llu flows,\t %llu bytes,\t %llu pkts\n Pkts (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Bytes (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Flows (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n \n %llu flows,\t %llu bytes,\t %llu pkts\n Pkts (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Bytes (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Flows (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n \n", */
-/*              shmForAgg->prefixV4Tab[index][i].beginning, */
-/*              shmForAgg->prefixV4Tab[index][i].flowNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].bytesNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].pktsNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].udpPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].tcpPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].icmpPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].othersPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].udpBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].tcpBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].icmpBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].othersBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].udpFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].tcpFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].icmpFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].othersFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[index][i].flowNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].bytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].pktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].udpPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].tcpPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].icmpPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].othersPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].udpBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].tcpBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].icmpBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].othersBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].udpFlowNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].tcpFlowNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].icmpFlowNbOUT, */
-/*              shmForAgg->prefixV4Tab[index][i].othersFlowNbOUT */
-/*              ); */
+        if ( 0 == (res_rrd = wrap_rrd_update(buf) )) { 
+          syslog(LOG_ERR, "wrap_rrd_update return : %d, param were : %s", res_rrd, buf);
+        }
+        /* Reinit the shared table */
         shmForAgg->prefixV4Tab[index][i].flowNbIN = 0;
         shmForAgg->prefixV4Tab[index][i].bytesNbIN = 0;

trunk/src/renetcolAgg.h

@@ -39 +39 @@
 
 #include "rrdwrap.h"
+#include "dataFlowSet.h"
 
-#define RRD_LOCATION "/tmp/"
+#define RRD_LOCATION ""
 #define RRD_EXTENSION ".rrd"
 #define END_RRD_CREATE " --start 1106560200 DS:inFlows:GAUGE:600:U:U DS:outFlows:GAUGE:600:U:U DS:inBytes:GAUGE:600:U:U DS:outBytes:GAUGE:600:U:U DS:inPkts:GAUGE:600:U:U DS:outPkts:GAUGE:600:U:U DS:inUdpPkts:GAUGE:600:U:U DS:outUdpPkts:GAUGE:600:U:U DS:inTcpPkts:GAUGE:600:U:U DS:outTcpPkts:GAUGE:600:U:U DS:inIcmpPkts:GAUGE:600:U:U DS:outIcmpPkts:GAUGE:600:U:U DS:inOthersPkts:GAUGE:600:U:U DS:outOthersPkts:GAUGE:600:U:U DS:inUdpBytes:GAUGE:600:U:U DS:outUdpBytes:GAUGE:600:U:U DS:inTcpBytes:GAUGE:600:U:U DS:outTcpBytes:GAUGE:600:U:U DS:inIcmpBytes:GAUGE:600:U:U DS:outIcmpBytes:GAUGE:600:U:U DS:inOthersBytes:GAUGE:600:U:U DS:outOthersBytes:GAUGE:600:U:U DS:inUdpFlows:GAUGE:600:U:U DS:outUdpFlows:GAUGE:600:U:U DS:inTcpFlows:GAUGE:600:U:U DS:outTcpFlows:GAUGE:600:U:U DS:inIcmpFlows:GAUGE:600:U:U DS:outIcmpFlows:GAUGE:600:U:U DS:inOthersFlows:GAUGE:600:U:U DS:outOthersFlows:GAUGE:600:U:U RRA:AVERAGE:0.5:1:2100 RRA:AVERAGE:0.5:24:1550 RRA:AVERAGE:0.5:288:1594 RRA:AVERAGE:0.5:2016:1040 RRA:MAX:0.5:1:2100 RRA:MAX:0.5:24:1550 RRA:MAX:0.5:288:1594 RRA:MAX:0.5:2016:1040"
-
-#include "dataFlowSet.h"
-
 #define SHMSIZE 3000000