Changeset 94 for trunk/src

Timestamp:

02/06/09 16:58:57 (14 years ago)

Author:

andreu

Message:

IPv6 aggregation : prefix reading

Location:

trunk/src

Files:

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

trunk/src/dataFlowSet.c

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2005 2006 2007 GIP RENATER 
+ * Copyright (C) 2005 - 2009 GIP RENATER 
  */
 
@@ -494 +494 @@
           }
           j++;
-          pos = (pftmp->fieldType)*10+j;
+          pos = (pftmp->fieldType)*MAX_RULES_PER_FIELD+j;
         } /* end while myPtrs->rulesAddressPtr */
       } else {

trunk/src/get_conf.c

@@ -27 +27 @@
 #include <string.h>
 #include <stdlib.h>
+#include <arpa/inet.h>
 
 #include "get_conf.h"
@@ -488 +489 @@
 }
 
+/* 
+ * prefixV6Cmp
+ */
+int
+prefixV6Cmp(const void *elem1, const void *elem2){
+  struct PrefixV6 *el1 = (struct PrefixV6 *) elem1;
+  struct PrefixV6 *el2 = (struct PrefixV6 *) elem2;
+
+  if (ntohl(el1->start[0]) < ntohl(el2->start[0])) {
+    return (-1);
+  } else if (ntohl(el1->start[0]) > ntohl(el2->start[0])) {
+    return (1);
+  } else {
+    if (ntohl(el1->start[1]) < ntohl(el2->start[1])) {
+      return (-1);
+    } else if (ntohl(el1->start[1]) > ntohl(el2->start[1])) {
+      return (1);
+    } else {
+      if (ntohl(el1->start[2]) < ntohl(el2->start[2])) {
+        return (-1);
+      } else if (ntohl(el1->start[2]) > ntohl(el2->start[2])) {
+        return (1);
+      } else {
+        if (ntohl(el1->start[3]) < ntohl(el2->start[3])) {
+          return (-1);
+        } else if (ntohl(el1->start[3]) > ntohl(el2->start[3])) {
+          return (1);
+        } else {
+          if (ntohl(el1->start[4]) < ntohl(el2->start[4])) {
+            return (-1);
+          } else if (ntohl(el1->start[4]) > ntohl(el2->start[4])) {
+            return (1);
+          } else {
+            if (ntohl(el1->start[5]) < ntohl(el2->start[5])) {
+             return (-1);
+            } else if (ntohl(el1->start[5]) > ntohl(el2->start[5])) {
+              return (1);
+            } else {
+              if (ntohl(el1->start[6]) < ntohl(el2->start[6])) {
+               return (-1);
+              } else if (ntohl(el1->start[6]) > ntohl(el2->start[6])) {
+                return (1);
+              } else {
+                if (ntohl(el1->start[7]) < ntohl(el2->start[7])) {
+                 return (-1);
+                } else if (ntohl(el1->start[7]) > ntohl(el2->start[7])) {
+                  return (1);
+                } else {
+                  return 0;
+                } /* 7 */
+              } /* 6 */
+            } /* 5 */
+          } /* 4 */
+        } /* 3 */
+      } /* 2 */
+    } /* 1 */
+  } /* 0 */
+}
+
+/* 
+ * getPrefixV6()
+ *
+ * read IPv6 prefix file and sort the list
+ */
+unsigned short getPrefixV6(char *filename,
+                           struct PrefixV6 *pV6TabPtr)
+{
+  FILE *prefixFile;
+  char line[200];
+  unsigned short counter = 0;
+  char s0[40];
+  unsigned short n0;
+#if defined(MULTISAMPLING)
+  unsigned short n1;
+#endif
+  struct in6_addr in6addr;
+  struct in6_addr in6addr16;
+  int i = 0;
+  char prefixStrTab[MAX_IPV6_PREFIX][50];
+  unsigned short prefixIndex = 0;
+  int res = 0;
+
+  if (!(prefixFile = fopen(filename, "r"))) {
+    fprintf (stderr, "error during file \"%s\" opening\n", filename);
+    exit(1);
+  }
+
+  for(i=0;i<MAX_IPV6_PREFIX;i++){
+    pV6TabPtr[i].start[0] = 0;
+    pV6TabPtr[i].start[1] = 0;
+    pV6TabPtr[i].start[2] = 0;
+    pV6TabPtr[i].start[3] = 0;
+    pV6TabPtr[i].end[0] = 0;
+    pV6TabPtr[i].end[1] = 0;
+    pV6TabPtr[i].end[2] = 0;
+    pV6TabPtr[i].end[3] = 0;
+    pV6TabPtr[i].mask = 0;
+    pV6TabPtr[i].hasSubnet = 0;
+    pV6TabPtr[i].sampling = 0;
+    pV6TabPtr[i].flowNbIN = 0;
+    pV6TabPtr[i].bytesNbIN = 0;
+    pV6TabPtr[i].pktsNbIN = 0;
+    pV6TabPtr[i].flowNbOUT = 0;
+    pV6TabPtr[i].bytesNbOUT = 0;
+    pV6TabPtr[i].pktsNbOUT = 0;
+    pV6TabPtr[i].firstCoSIN = 0;
+    pV6TabPtr[i].secondCoSIN = 0;
+    pV6TabPtr[i].thirdCoSIN = 0;
+    pV6TabPtr[i].fourthCoSIN = 0;
+    pV6TabPtr[i].firstCoSOUT = 0;
+    pV6TabPtr[i].secondCoSOUT = 0;
+    pV6TabPtr[i].thirdCoSOUT = 0;
+    pV6TabPtr[i].fourthCoSOUT = 0;
+  }
+
+  while (fgets(line, 50, prefixFile) != 0)
+    {
+      strcpy(prefixStrTab[counter], line);
+      counter++;
+      if (counter == MAX_IPV6_PREFIX) {
+        fprintf(stderr, "bufferoverflow in getPrefixV6 function (get_conf.c)\
+change the value of MAX_IPV6_PREFIX  declaration and make again a compilation \n");
+        exit(1);
+      }
+    }
+#ifdef DEBUG
+  for(i=0;i<counter;i++) {
+    fprintf(stderr,"i : %hu - line : %s\n", i,prefixStrTab[i]);
+  }
+#endif
+  for(i=0;i<counter;i++)
+    {
+#if defined(IPV4AGGIDSNMP)
+#if defined(MULTISAMPLING)
+      sscanf(prefixStrTab[i],"%s %hu %hu\n",
+             s0,&n0,&n1);
+#else
+      sscanf(prefixStrTab[i],"%s %hu\n",
+             s0,&n0);
+#endif
+#endif
+      res = inet_pton(AF_INET6,
+                      s0,
+                      &in6addr16);
+      res = inet_pton(AF_INET6,
+                      s0,
+                      &in6addr);
+      if (res != 1){
+        fprintf(stderr,"BAD Prefix %s \n",s0);
+      } else {
+        pV6TabPtr[prefixIndex].start[0] = in6addr.s6_addr32[0];
+        pV6TabPtr[prefixIndex].start[1] = in6addr.s6_addr32[1];
+        pV6TabPtr[prefixIndex].start[2] = in6addr.s6_addr32[2];
+        pV6TabPtr[prefixIndex].start[3] = in6addr.s6_addr32[3];
+        if ((unsigned short)n0 <= 16) {
+            in6addr16.s6_addr16[0] = htons( ntohs(in6addr16.s6_addr16[0]) |~((~0)<<(16-(n0))));
+            in6addr16.s6_addr16[1] = (~0);
+            in6addr16.s6_addr16[2] = (~0);
+            in6addr16.s6_addr16[3] = (~0);
+            in6addr16.s6_addr16[4] = (~0);
+            in6addr16.s6_addr16[5] = (~0);
+            in6addr16.s6_addr16[6] = (~0);
+            in6addr16.s6_addr16[7] = (~0);
+        } else if ((unsigned short)n0 <= 32) {
+            in6addr16.s6_addr16[1] = htons( ntohs(in6addr16.s6_addr16[1]) |~((~0)<<(32-(n0))));
+            in6addr16.s6_addr16[2] = (~0);
+            in6addr16.s6_addr16[3] = (~0);
+            in6addr16.s6_addr16[4] = (~0);
+            in6addr16.s6_addr16[5] = (~0);
+            in6addr16.s6_addr16[6] = (~0);
+            in6addr16.s6_addr16[7] = (~0);
+        } else if ((unsigned short)n0 <= 48) {
+            in6addr16.s6_addr16[2] = htons( ntohs(in6addr16.s6_addr16[2]) |~((~0)<<(48-(n0))));
+            in6addr16.s6_addr16[3] = (~0);
+            in6addr16.s6_addr16[4] = (~0);
+            in6addr16.s6_addr16[5] = (~0);
+            in6addr16.s6_addr16[6] = (~0);
+            in6addr16.s6_addr16[7] = (~0);
+        } else if ((unsigned short)n0 <= 64) {
+            in6addr16.s6_addr16[3] = htons( ntohs(in6addr16.s6_addr16[3]) |~((~0)<<(64-(n0))));
+            in6addr16.s6_addr16[4] = (~0);
+            in6addr16.s6_addr16[5] = (~0);
+            in6addr16.s6_addr16[6] = (~0);
+            in6addr16.s6_addr16[7] = (~0);
+        } else if ((unsigned short)n0 <= 80) {
+            in6addr16.s6_addr16[4] = htons( ntohs(in6addr16.s6_addr16[4]) |~((~0)<<(80-(n0))));
+            in6addr16.s6_addr16[5] = (~0);
+            in6addr16.s6_addr16[6] = (~0);
+            in6addr16.s6_addr16[7] = (~0);
+        } else if ((unsigned short)n0 <= 96) {
+            in6addr16.s6_addr16[5] = htons( ntohs(in6addr16.s6_addr16[5]) |~((~0)<<(96-(n0))));
+            in6addr16.s6_addr16[6] = (~0);
+            in6addr16.s6_addr16[7] = (~0);
+        } else if ((unsigned short)n0 <= 112) {
+            in6addr16.s6_addr16[6] = htons( ntohs(in6addr16.s6_addr16[6]) |~((~0)<<(112-(n0))));
+            in6addr16.s6_addr16[7] = (~0);
+        } else {
+            in6addr16.s6_addr16[7] = htons( ntohs(in6addr16.s6_addr16[7]) |~((~0)<<(128-(n0))));
+        }
+        pV6TabPtr[prefixIndex].end[0] = in6addr16.s6_addr32[0];
+        pV6TabPtr[prefixIndex].end[1] = in6addr16.s6_addr32[1];
+        pV6TabPtr[prefixIndex].end[2] = in6addr16.s6_addr32[2];
+        pV6TabPtr[prefixIndex].end[3] = in6addr16.s6_addr32[3];
+        pV6TabPtr[prefixIndex].mask = n0;
+#if defined(MULTISAMPLING)
+        pV6TabPtr[prefixIndex].sampling = n1;
+#else
+        pV6TabPtr[prefixIndex].sampling = 0;
+#endif
+        prefixIndex++;
+      }
+    }
+  qsort(prefixStrTab, prefixIndex, sizeof(struct PrefixV6), prefixV6Cmp);
+  if( fclose(prefixFile) == 0) {
+    return (prefixIndex);
+  } else {
+    fprintf(stderr,"%s not closed, \n", filename);
+    exit(1);
+    return(prefixIndex);
+  }
+}

trunk/src/get_conf.h

@@ -54 +54 @@
 };
 
+struct PrefixV6{
+  unsigned long start[4];
+  unsigned long end[4];
+  unsigned short mask;    
+  unsigned short hasSubnet; 
+  unsigned long sampling; 
+  unsigned long long flowNbIN;  /* WARNING !!! */
+  unsigned long long bytesNbIN; /* Here, IN means "to the prefix" */
+  unsigned long long pktsNbIN; 
+  unsigned long long flowNbOUT;  /* WARNING !!! */
+  unsigned long long bytesNbOUT;  /* Here, OUT means "from the prefix" */
+  unsigned long long pktsNbOUT;
+  unsigned long long firstCoSIN; /* only the bytes for CoS */
+  unsigned long long secondCoSIN;
+  unsigned long long thirdCoSIN;
+  unsigned long long fourthCoSIN;
+  unsigned long long firstCoSOUT;
+  unsigned long long secondCoSOUT;
+  unsigned long long thirdCoSOUT;
+  unsigned long long fourthCoSOUT;
+};
+
 void initConf(char *);
 int longCmp(const void *, const void *);
@@ -59 +81 @@
 unsigned short getPrefixV4(char *, struct PrefixV4 *, struct PrefixV4 *,
                            unsigned short *);
+unsigned short getPrefixV6(char *, struct PrefixV6 *);
 unsigned short getAS(char *, struct AS *);
 

trunk/src/prefix_mgmt.c

@@ -59 +59 @@
 }
 
+/*
+ * prefV6Cmp()
+ */
+int
+prefV6Cmp(const void *elem1, const void *elem2){
+  struct PrefixV6 *el1 = (struct PrefixV6 *) elem1;
+  struct PrefixV6 *el2 = (struct PrefixV6 *) elem2;
+  int i;
+  int moreIsNecessary = 1;
+
+  for (i=0;i<4;i++) {
+    switch(i){
+    case 0:
+      if ( el2->mask <= 32 ) {
+        if ( el2->start[i] == el1->start[i] ) {
+          return 0;
+        }else{ 
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        }
+      } else { /* el2 > /32 */
+        if ( el2->start[i] != el1->start[i] ) {
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        } /* here we don't return, we'll continue in case */
+      }
+      break;
+    case 1:
+      if ( el2->mask <= 64 ) {
+        if ( el2->start[i] == el1->start[i] ) {
+          return 0;
+        }else{ 
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        }
+      } else { /* el2 > /64 */
+        if ( el2->start[i] != el1->start[i] ) {
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        } /* here we don't return, we'll continue in case */
+      }
+      break;
+    case 2:
+      if ( el2->mask <= 96 ) {
+        if ( el2->start[i] == el1->start[i] ) {
+          return 0;
+        }else{ 
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        }
+      } else { /* el2 > /96 */
+        if ( el2->start[i] != el1->start[i] ) {
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        } /* here we don't return, we'll continue in case */
+      }
+      break;
+    case 3:
+      if ( el2->mask <= 128 ) {
+        if ( el2->start[i] == el1->start[i] ) {
+          return 0;
+        }else{ 
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        }
+      } else { /* el2 > /128 */
+        if ( el2->start[i] != el1->start[i] ) {
+          if (el2->end[i] < el1->start[i]) {
+            return 1;
+          }else{
+            return 1;
+          }
+        } /* here we don't return, we'll continue in case */
+      }
+      break;
+    default:
+      syslog(LOG_ERR,"You have won !!! This IPv6 case doesn't exist !!!!");
+      exit(1);
+      return 0;
+      break;
+    }
+  }
+}

trunk/src/renetcol.c

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2005 2006 2007 GIP RENATER 
+ * Copyright (C) 2005 - 2009 GIP RENATER 
  */
 
@@ -106 +106 @@
   fprintf(stderr, "renetcol compilation and execution with IPv4 Aggregation feature enable based on SNMP ID in %s file.\n", INTERFACES_TYPE_LIST);
 #endif
+#if defined(IPV6AGGIDSNMP)
+  fprintf(stderr, "renetcol compilation and execution with IPv6 Aggregation feature enable based on SNMP ID in %s file.\n", INTERFACES_TYPE_LIST);
+#endif
   
   openlog(argv[0], LOG_PID, LOG_USER);
@@ -158 +161 @@
     exit(1);
   }
+#if defined(IPV6AGGIDSNMP)
+  if ( (shmForAgg->v6PrefixNb = 
+        getPrefixV6(SUBNETS_V6_LIST, 
+                    &(shmForAgg->prefixV6Tab[0][0])
+                    )) < 1){
+    fprintf(stderr, "renetcol: Error in %s\n", SUBNETS_V6_LIST);
+  } else {
+    fprintf(stderr, "We have found %hu IPv6 prefixes from %s\n", 
+            shmForAgg->v6PrefixNb,
+            SUBNETS_V6_LIST);
+  }
+  if ( (shmForAgg->v6PrefixNb = 
+        getPrefixV6(SUBNETS_V6_LIST, 
+                    &(shmForAgg->prefixV6Tab[1][0])
+                    )) < 1){
+    fprintf(stderr, "renetcol: Error in %s\n", SUBNETS_V6_LIST);
+    exit(1);
+  }
+#endif
+
 /*   for (i=0; i<shmForAgg->v4PrefixNb; i++){ */
 /*    fprintf(stderr, "SUPERNET : %lu, %hu\n",shmForAgg->prefixV4Tab[0][i].beginning, shmForAgg->prefixV4Tab[0][i].hasSubnet); */

trunk/src/renetcol.h

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2005 2006 2007 GIP RENATER 
+ * Copyright (C) 2005 - 2009 GIP RENATER 
  */
 
@@ -69 +69 @@
   unsigned short v4PrefixNb;
   unsigned short v4SubnetNb;
+  unsigned short v6PrefixNb;
 #ifdef ASACC
   unsigned short ASNb;
@@ -78 +79 @@
   struct POP matrixPOP[2][ROUTER_INDEX_MAX][ROUTER_INDEX_MAX];
 #endif
-  /*  struct PrefixV6 ; */
+  struct PrefixV6 prefixV6Tab[2][MAX_IPV6_PREFIX];
 };
 

trunk/src/renetcolAgg.h

@@ -50 +50 @@
   unsigned short v4PrefixNb;
   unsigned short v4SubnetNb;
+  unsigned short v6PrefixNb;
 #ifdef ASACC
   unsigned short ASNb;
@@ -59 +60 @@
   struct POP matrixPOP[2][ROUTER_INDEX_MAX][ROUTER_INDEX_MAX];
 #endif
-  /*  struct PrefixV6 ; */
+ struct PrefixV6 prefixV6Tab[2][MAX_IPV6_PREFIX];
 }; 

trunk/src/renetcolParam.h

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2007 GIP RENATER 
+ * Copyright (C) 2007-2009 GIP RENATER 
  */
 
@@ -33 +33 @@
 */
 #define RECEPTION_ADDRESS ""
+
 /* 
  * your collector port to recept netflow export 
  */ 
 #define RECEPTION_PORT 1111
+
 /* 
  * routers index max + 1 (index of the beginning of the lines, and not number of routers)
  */
 #define ROUTER_INDEX_MAX 55
+
 /* 
  * FILE with your routers IP address 
 */ 
 #define ROUTERS_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/routers.txt"
+
 /* 
  * FILE with your prefix/subnet 
  */
 #define SUBNETS_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/IPv4_Subnet_Aggregation_based_on_SNMP_index.txt"
+
+/* 
+ * FILE with your IPv6 prefixes list
+ */
+#define SUBNETS_V6_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/IPv6_Subnet_Aggregation_based_on_SNMP_index.txt"
+
 /* 
  * FILE with the list of AS with accounting
  */
 #define AS_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/AS.txt"
+
 /* 
  * constants, here a subnet is include in a prefix 
@@ -59 +70 @@
 #define MAX_IPV4_SUBNET 1000
 #define MAX_AS 3
+#define MAX_IPV6_PREFIX 500
+#define MAX_IPV6_SUBNET 100
+
 /* 
  * FILE for the rules 
  */
 #define RULES_FILE "<path to renetcol>/renetcol-0.0.14beta/conf/rules.txt"
+
 /* 
  * FILE with SNMP index of the interfaces
@@ -68 +83 @@
  */
 #define INTERFACES_TYPE_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/SNMP_INDEX.txt"
+
 /* 
- * maximum SNMP index 
+ * maximum SNMP index for one router
  */
 #define MAX_SNMP_INDEX 900
+
 /*
  * Path to the rrd file
@@ -92 +109 @@
 #define STEP 5
 #define FIELD_TYPE_NUMBER 216
-#define MAX_RULES_PER_FIELD 10
+#define MAX_RULES_PER_FIELD 100
 #define SHMSIZE 33554432
 #define SOCKET_BUFFER_SIZE 1500

trunk/src/renetcolSender.c

@@ -72 +72 @@
   char filters[249];
 /*  char operator[2]; */
-  char lines[256][256];
+  char lines[1024][256]; /* FIXME : here perhaps use a constante like MAX_FILTERS *3 */
   char line[256];
   char lineCopy[256];