Changeset 13 for trunk/src

Timestamp:

02/14/06 17:58:08 (17 years ago)

Author:

andreu

Message:

prefix bug fixed in rules_mgmt.c

Location:

trunk/src

Files:

• renetcol.c (modified) (2 diffs)
• rules_mgmt.c (modified) (9 diffs)

trunk/src/renetcol.c

@@ -121 +121 @@
     }
   }
+/*   printRule(rulesListPtr); */
+/*   exit(1); */
 
   fprintf(stderr, "I become a deamon, next messages via syslogd.\n");
@@ -334 +336 @@
       break;
     case 5:
-/*       if ((currentRouterPtr=notExistRouter(routersListPtr,  */
-/*                                         pcktPtr->ipH->srcAdd))==NULL) { */
-/*      routersListPtr = addRouter(routersListPtr,  */
-/*                                 pcktPtr->ipH->srcAdd,  */
-/*                                 (unsigned long) 0); */
-/*      currentRouterPtr = routersListPtr; */
-/*       } */
-/*       currentFlowsetNumber = 0; */
-/*       shift = 0; */
-/*       while ((currentFlowsetNumber < currentHeaderV9Ptr->count)) { */
-/*      curTplFlSetPtr = NULL; */
-/*      currentFlowsetId=getFlowsetId(currentFlowsetNumber,  */
-/*                                    offsetV9Ptr, ptr_buffer); */
-        /* remplacer par creation du template v5 si pas deja fait */
-/*      shift = checkTemplateFlowSet(currentRouterPtr, offsetV9Ptr,  */
-/*                                   ptr_buffer, currentHeaderV9Ptr, */
-/*                                   curTplFlSetPtr, */
-/*                                   currentFlowsetNumberPtr, */
-/*                                   myQueue); */
-        /*        showAllTplFlSet();  */
-/*      shift = checkDataFlowSet(shift, currentRouterPtr, */
-/*                               currentHeaderV9Ptr, offsetV9Ptr, */
-/*                               ptr_buffer, currentFlowsetNumberPtr, */
-/*                               currentFlowsetIdPtr, pcktPtr, */
-/*                               rulesAddressPtr, rulesListPtr, */
-/*                               myQueue); */
-/*       } */
+/*       syslog(LOG_INFO,  */
+/*           "NetFlow export version 5 from router: %lu.%lu.%lu.%lu", */
+/*           (pcktPtr->ipH->srcAdd>>24), */
+/*           (pcktPtr->ipH->srcAdd<<8>>24), */
+/*           (pcktPtr->ipH->srcAdd<<16>>24), */
+/*           (pcktPtr->ipH->srcAdd<<24>>24)); */
       break;
     case 9:

trunk/src/rules_mgmt.c

@@ -35 +35 @@
     fprintf(stderr, "  operator: %hu\n", rdPtr->operator);
     if (rdPtr->value!=NULL) {
+      fprintf(stderr, "  mask: %hu\n", rdPtr->value->mask);
       switch (rdPtr->value->valueLength){
       case 1:
@@ -292 +293 @@
     if ( strspn(line, "#") == 0 ) {
       strcpy(lineCopy, line);
-      fprintf(stderr,"ligne en cours : %d\n", cptLine);
       if (strncmp("N", lineCopy, 1) == 0){
         if (sscanf(line, "%1s %s\n",
@@ -353 +353 @@
       }
       cptLine++;
-      fprintf(stderr,"ligne : %d\n", cptLine);
     }
   }
@@ -498 +497 @@
   unsigned short v0, v1, v2, v3;
   unsigned char buffer4[4];
-/*   static unsigned short mask; */
+  static char *token;
+  static char mask[4];
+  int lg = 0;
+  int lgMask = 0;
+  static char value[16];
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
@@ -504 +507 @@
     exit(1);
   } else {
-    if (sscanf(val, "%hu.%hu.%hu.%hu", &v0, &v1, &v2, &v3) == 0) {
-      syslog(LOG_ERR, "Errors in Tests definition : wrong IPv4 value");
-      exit(1);
-    }
-    buffer4[3] = (unsigned char)v0;
-    buffer4[2] = (unsigned char)v1;
-    buffer4[1] = (unsigned char)v2;
-    buffer4[0] = (unsigned char)v3;     
-    tmp->valueLength = 4;
-    tmp->stor.lvalue = *((unsigned long*)(&buffer4));
-    tmp->mask = 32;
-    tmp->next = vPtr;
+    if ( (token=memccpy(value, val, '/', strlen(val)))==NULL) {
+      /* address case */
+      if (sscanf(value, "%hu.%hu.%hu.%hu", &v0, &v1, &v2, &v3) == 0) {
+        syslog(LOG_ERR, "Errors in Tests definition : wrong IPv4 value");
+        exit(1);
+      }
+      buffer4[3] = (unsigned char)v0;
+      buffer4[2] = (unsigned char)v1;
+      buffer4[1] = (unsigned char)v2;
+      buffer4[0] = (unsigned char)v3;   
+      tmp->valueLength = 4;
+      tmp->mask = 32;
+      tmp->stor.lvalue = *((unsigned long*)(&buffer4));
+      tmp->mask = 32;
+      tmp->next = vPtr;
+    } else {
+      lg = strlen(value);
+      lgMask = strlen(token);
+      value[lg-1-lgMask] = '\0';
+      strcpy( mask, strchr(val,'/')+1);
+      if (sscanf(value, "%hu.%hu.%hu.%hu", &v0, &v1, &v2, &v3) == 0) {
+        syslog(LOG_ERR, "Errors in Tests definition : wrong IPv4 value");
+        exit(1);
+      }
+      buffer4[3] = (unsigned char)v0;
+      buffer4[2] = (unsigned char)v1;
+      buffer4[1] = (unsigned char)v2;
+      buffer4[0] = (unsigned char)v3;   
+      tmp->valueLength = 4;
+      tmp->mask = atoi(mask);
+      tmp->stor.lvalue = *((unsigned long*)(&buffer4));
+      tmp->next = vPtr;      
+    }
   }
   return tmp;
@@ -539 +563 @@
     if ( (token=memccpy(value, val, '/', strlen(val)))==NULL) {
       /* address case */
-      fprintf(stderr,"address case\n");
       result = inet_pton(AF_INET6, val, netw_form);
       switch(result) {
@@ -560 +583 @@
       tmp->next = vPtr;
     } else {
-      fprintf(stderr,"prefix case\n");
       lg = strlen(value);
       lgMask = strlen(token);
       value[lg-1-lgMask] = '\0';
       strcpy( mask, strchr(val,'/')+1);
-      fprintf(stderr,"apres strcpy: %s et %d\n", value, atoi(mask));
       result = inet_pton(AF_INET6, value, netw_form);
       switch(result) {
@@ -579 +600 @@
       memcpy(&v6addr, netw_form, sizeof(netw_form));
       tmp->valueLength = 16;
-      fprintf(stderr,"ici\n");
       tmp->mask = atoi(mask);
-      fprintf(stderr,"la %hu\n",  tmp->mask);
       tmp->stor.tabAdd6[0] = v6addr.s6_addr32[0];
       tmp->stor.tabAdd6[1] = v6addr.s6_addr32[1];
@@ -587 +606 @@
       tmp->stor.tabAdd6[3] = v6addr.s6_addr32[3];
       tmp->next = vPtr;
-      fprintf(stderr,"plus la\n");
     }
   }