Changeset 10 for trunk/src

Timestamp:

02/09/06 18:15:36 (17 years ago)

Author:

andreu

Message:

prefix v6 ok

Location:

trunk/src

Files:

• rules_mgmt.c (modified) (8 diffs)
• rules_mgmt.h (modified) (1 diff)

trunk/src/rules_mgmt.c

@@ -292 +292 @@
     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",
@@ -352 +353 @@
       }
       cptLine++;
+      fprintf(stderr,"ligne : %d\n", cptLine);
     }
   }
@@ -441 +443 @@
     static unsigned short ft;
     char operator[2];
-    char value[30];
+    char value[42];
     tmp = (RuleDefPtr) malloc(sizeof(struct RuleDef));
     if (tmp==NULL) {
@@ -447 +449 @@
       exit(1);
     } else { 
-      if (sscanf(fields, " %hu %1s %s ", &ft, operator, value) == 0) {
+      if (sscanf(fields, " %hu %1s %s", &ft, operator, value)==0) {
         syslog(LOG_ERR, "Errors in Tests definition : wrong syntax");
         exit(1);
@@ -496 +498 @@
   unsigned short v0, v1, v2, v3;
   unsigned char buffer4[4];
-
+/*   static unsigned short mask; */
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
@@ -512 +514 @@
     tmp->valueLength = 4;
     tmp->stor.lvalue = *((unsigned long*)(&buffer4));
+    tmp->mask = 32;
     tmp->next = vPtr;
   }
@@ -524 +527 @@
   char netw_form[16];
   int result;
-
+  static char value[30];
+  static char mask[4];
+  static char *token;
+  int lg = 0;
+  int lgMask = 0;
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
@@ -530 +537 @@
     exit(1);
   } else {
-    result = inet_pton(AF_INET6, val, netw_form);
-    switch(result) {
-    case 0 : 
-      syslog(LOG_ERR," inet_pton : Invalid IPv6 Address");
-      exit(1);
-      break;
-    case -1: 
-      syslog(LOG_ERR," inet_pton : AF unknown");
-      exit(1);
-      break;
-    }
-    memcpy(&v6addr, netw_form, sizeof(netw_form));
-    tmp->valueLength = 16;
-    tmp->stor.tabAdd6[0] = v6addr.s6_addr32[0];
-    tmp->stor.tabAdd6[1] = v6addr.s6_addr32[1];
-    tmp->stor.tabAdd6[2] = v6addr.s6_addr32[2];
-    tmp->stor.tabAdd6[3] = v6addr.s6_addr32[3];
-    tmp->next = vPtr;
+    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) {
+      case 0 : 
+        syslog(LOG_ERR," inet_pton : Invalid IPv6 Address");
+        exit(1);
+        break;
+      case -1: 
+        syslog(LOG_ERR," inet_pton : AF unknown");
+        exit(1);
+        break;
+      }
+      memcpy(&v6addr, netw_form, sizeof(netw_form));
+      tmp->valueLength = 16;
+      tmp->mask = 128;
+      tmp->stor.tabAdd6[0] = v6addr.s6_addr32[0];
+      tmp->stor.tabAdd6[1] = v6addr.s6_addr32[1];
+      tmp->stor.tabAdd6[2] = v6addr.s6_addr32[2];
+      tmp->stor.tabAdd6[3] = v6addr.s6_addr32[3];
+      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) {
+      case 0 :
+        syslog(LOG_ERR," inet_pton : Invalid IPv6 Address");
+        exit(1);
+        break;
+      case -1:
+        syslog(LOG_ERR," inet_pton : AF unknown");
+        exit(1);
+        break;
+      }
+      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];
+      tmp->stor.tabAdd6[2] = v6addr.s6_addr32[2];
+      tmp->stor.tabAdd6[3] = v6addr.s6_addr32[3];
+      tmp->next = vPtr;
+      fprintf(stderr,"plus la\n");
+    }
   }
   return tmp;

trunk/src/rules_mgmt.h

@@ -51 +51 @@
     uint32_t tabAdd6[4];   /* 16 */
   } stor;
+  unsigned short mask;
   ValuesPtr next;
 } ValuesType;