Changeset 17 for trunk/src

Timestamp:

05/22/06 16:25:24 (17 years ago)

Author:

andreu

Message:

*** empty log message ***

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (9 diffs)
• dataFlowSet.h (modified) (1 diff)
• get_conf.c (modified) (2 diffs)
• get_conf.h (modified) (1 diff)
• prefix_mgmt.c (modified) (1 diff)
• renetcol.c (modified) (6 diffs)
• rrdwrap.c (added)
• rrdwrap.h (added)
• rules_mgmt.c (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -63 +63 @@
   struct PrefixV4 prefixKey, *res; /* for bsearch */
   struct AggCache agCache;
+  int bool = 0;
 
   buffer2[1] = *(buf+(*offV9));(*offV9)++;
@@ -86 +87 @@
       return (data_length+shift);
     }
+    /* aggreg */
+    agCache.routerAd = pcktPtr->ipH->srcAdd;
+    /* end aggreg */
     pftmp = tmp->lastField;
     secondPftmp = tmp->lastField;    
@@ -118 +122 @@
             case 1:
               buffer1 = *(buf+(*offV9)); (*offV9)++;
+              /* rule check */
               if (((RuleDefPtr)(*(rulesCache+pos)))->value->stor.cvalue 
                   == *((unsigned char*)&buffer1)) {
                 ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
               }
+              /* 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 */
               break;
@@ -133 +156 @@
                 ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
               /* aggregation */
-
+              if (pftmp->fieldType==10){
+                agCache.idSnmp = *((unsigned short*)&buffer2);
+              }
+              /* end aggregation */
+              break;
+            case 3:
+              buffer4[3]= 0;
+              buffer4[2]= *(buf+(*offV9)); (*offV9)++;
+              buffer4[1]= *(buf+(*offV9)); (*offV9)++;
+              buffer4[0]= *(buf+(*offV9)); (*offV9)++;
+              if (((RuleDefPtr)(*(rulesCache+pos)))->value->stor.lvalue 
+                  == *((unsigned long*)&buffer4))
+                ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
+              /* aggregation */
               /* end aggregation */
               break;
@@ -148 +184 @@
                     ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
                   }
-                prefixKey.beginning = *((unsigned long*)&buffer4);
-                res = bsearch(&prefixKey, V4PTab, nbPV4, 
-                              sizeof(struct PrefixV4), prefCmp);
-                if (res == NULL)
-                  fprintf(stderr,"!");
-                else
-                  fprintf(stderr,".");
               }       
               /* 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 */
               break;
@@ -311 +351 @@
           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 */
           break;
@@ -318 +375 @@
           buffer2[0]= *(buf+(*offV9)); (*offV9)++;
           /* aggregation */
-          
+          if (pftmp->fieldType==10){
+            agCache.idSnmp = *((unsigned short*)&buffer2);
+          }       
+          /* end aggregation */
+          break;
+        case 3:
+          buffer4[3]= 0;
+          buffer4[2]= *(buf+(*offV9)); (*offV9)++;
+          buffer4[1]= *(buf+(*offV9)); (*offV9)++;
+          buffer4[0]= *(buf+(*offV9)); (*offV9)++;
+/*        fprintf(stderr,"L: %lu\n",(*((unsigned long*)&buffer4))); */
+/*        fprintf(stderr,"L>>4: %lu\n",(*((unsigned long*)&buffer4))>>4); */
+/*        fprintf(stderr,"L>>1<<29>>29: %lu\n",(*((unsigned long*)&buffer4))>>1<<29>>29); */
+/*        fprintf(stderr,"L<<31>>31: %lu\n",(*((unsigned long*)&buffer4))<<31>>31); */
+          /* aggregation */
           /* end aggregation */
           break;
@@ -327 +398 @@
           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 */
           break;
@@ -353 +433 @@
          */
         /* 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 */
         /* 

trunk/src/dataFlowSet.h

@@ -39 +39 @@
 struct AggCache {
   unsigned short mode;
-  unsigned long v4Ad;
-  uint32_t tabAdd6[4];
-  unsigned short mask;
-  unsigned short sens; /* In/out */
+  unsigned char dscp;
+  unsigned char maskS;
+  unsigned char maskD;
+  unsigned char tProt;
+  unsigned char ipProt;
+  unsigned char sens; /* In/out */
+  unsigned short idSnmp;
   unsigned long bytes;
   unsigned long pkts;
-  unsigned short tProt;
-  unsigned short netProt;
   unsigned long routerAd;
-  unsigned short idSnmp;
-  unsigned short dscp;
+  unsigned long v4AdS;
+  unsigned long v4AdD;
+  uint32_t tabAdd6S[4];
+  uint32_t tabAdd6D[4];
   /*  unsigned short mplsLabel1;
-      unsigned long intAdd; */
+      unsigned long ifAdd; */
 };
 

trunk/src/get_conf.c

@@ -133 +133 @@
  * read IPv4 prefix file and sort the list
  */
-short getPrefixV4(char *filename, struct PrefixV4 *pV4TabPtr)
+unsigned short getPrefixV4(char *filename, struct PrefixV4 *pV4TabPtr)
 {
   FILE *prefixFile;
   char line[200];
-  int counter = 0;
+  unsigned short counter = 0;
   unsigned short n0, n1, n2, n3, n4, n5;
   unsigned char buffer4[4];
@@ -174 +174 @@
     }
   if( fclose(prefixFile) == 0) {
-    return (1);
+    return (counter);
   } else {
     fprintf(stderr,"%s not closed, \n", filename);
     exit(1);
-    return(0);
+    return(counter);
   }
 }

trunk/src/get_conf.h

@@ -36 +36 @@
 int longCmp(const void *, const void *);
 int getRegisteredRouters(char *, unsigned long *, unsigned long *);
-short getPrefixV4(char *, struct PrefixV4 *);
+unsigned short getPrefixV4(char *, struct PrefixV4 *);
 
 #endif /* GET_CONF_H */

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"

trunk/src/renetcol.c

@@ -52 +52 @@
 unsigned long indexedRouterList[ROUTER_INDEX_MAX];
 int routerNb = 0;
+unsigned short v4PrefixNb = 0;
 struct PrefixV4 prefixV4Tab[PREFIX_V4_MAX];
 RulesPtr rulesListPtr;
@@ -68 +69 @@
 static int inputSock;
 static int sockNamelg;
+static int inputSock2;
 static int sockNameFromlg;
 static int rcv;
@@ -76 +78 @@
 static char *receptAddress = RECEPTION_ADDRESS;
 static struct sockaddr_in name;
+static struct sockaddr_in name2;
 static struct sockaddr_in fromName;
 
@@ -108 +111 @@
                                   &indexedRouterList[0]);
   fprintf(stderr, "reading the IPv4 prefix\n");
-  if ( getPrefixV4(prefixV4FileName, &prefixV4Tab[0]) < 1){
+  if ( (v4PrefixNb = getPrefixV4(prefixV4FileName, &prefixV4Tab[0])) < 1){
     fprintf(stderr, "Error during prefix v4 reading\n");
     exit(1);
@@ -365 +368 @@
                                    rulesAddressPtr, rulesListPtr,
                                    myQueue, prefixV4Tab,
-                                   (size_t) PREFIX_V4_MAX);
+                                   (size_t) v4PrefixNb);
         }
       }
       break;
     default:
-      syslog(LOG_INFO, 
-             "NetFlow exp. version unknown: %hu, from router: %lu.%lu.%lu.%lu",
-             (unsigned short) version,
-             (pcktPtr->ipH->srcAdd>>24),
-             (pcktPtr->ipH->srcAdd<<8>>24),
-             (pcktPtr->ipH->srcAdd<<16>>24),
-             (pcktPtr->ipH->srcAdd<<24>>24));
+/*        syslog(LOG_INFO,  */
+/*           "NetFlow exp. version unknown: %hu, from router: %lu.%lu.%lu.%lu", */
+/*           (unsigned short) version, */
+/*           (pcktPtr->ipH->srcAdd>>24), */
+/*           (pcktPtr->ipH->srcAdd<<8>>24), */
+/*           (pcktPtr->ipH->srcAdd<<16>>24), */
+/*           (pcktPtr->ipH->srcAdd<<24>>24));  */
       break;
     }
@@ -409 +412 @@
   sockNamelg = sizeof(name);
   if (getsockname(inputSock, (struct sockaddr *) (&name), 
+                  (socklen_t *)&sockNamelg) < 0)
+    {
+      syslog(LOG_ERR, "getsockname: %s", strerror(errno)); 
+      exit(1);
+    }
+  /* Here socket DGRAM creation, only to not have a unreachable service */
+  inputSock2 = socket(AF_INET, SOCK_DGRAM, 0); 
+  if (inputSock2 < 0)
+    {
+      syslog(LOG_ERR,"socket : %s", strerror(errno));
+      exit(1);
+    }
+  memset((void*)&name, 0, sizeof(name));
+  name2.sin_family = AF_INET;
+  name2.sin_addr.s_addr = htonl(INADDR_ANY);
+  if (name2.sin_addr.s_addr == INADDR_NONE){
+    syslog(LOG_ERR, " INADDR_NONE ");
+    exit(1);
+  }
+  name2.sin_port = htons(receptPort);
+  if (bind(inputSock2,(struct sockaddr *)(&name2), sizeof(name2)) < 0) 
+    {
+      syslog(LOG_ERR, "bind : %s", strerror(errno));
+      exit(1);
+    }                                                           
+  sockNamelg = sizeof(name2);
+  if (getsockname(inputSock2, (struct sockaddr *) (&name2), 
                   (socklen_t *)&sockNamelg) < 0)
     {

trunk/src/rules_mgmt.c

@@ -469 +469 @@
       if ((ft==1) || (ft==25)){
           tmp->value = addValue(tmp->value, operatorToNumber, value);
-      } else if ((ft==8) || (ft==12) || (ft==15) || (ft==18) ){
+      } else if ( (ft==8) || (ft==12) || (ft==15) || (ft==18) ){
           tmp->value = addAddress(tmp->value, operatorToNumber, value);
-      } else if ((ft==27) || (ft==28) || (ft==62) || (ft==63) ){
+      } else if ( (ft==27) || (ft==28) || (ft==62) || (ft==63) ){
           tmp->value = addV6Address(tmp->value, operatorToNumber, value);
-      } else if ((ft==60)){
+      } else if ( (ft==60) || (ft==46) ){
           tmp->value = addCValue(tmp->value, operatorToNumber, value);
       } else {