Changeset 15 for trunk/src

Timestamp:

03/16/06 17:45:26 (17 years ago)

Author:

andreu

Message:

?

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (6 diffs)
• dataFlowSet.h (modified) (1 diff)
• prefix_mgmt.c (added)
• renetcol.c (modified) (3 diffs)
• template.c (modified) (10 diffs)

trunk/src/dataFlowSet.c

@@ -2 +2 @@
  * File: dataFlowSet.c
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2005 GIP RENATER 
@@ -132 +132 @@
               buffer4[1]= *(buf+(*offV9)); (*offV9)++;
               buffer4[0]= *(buf+(*offV9)); (*offV9)++;
-              /* here , add a check on the field type */
+              /* FIXME : here , add a check on the field type */
               if ((((RuleDefPtr)(*(rulesCache+pos)))->value->stor.lvalue) 
                   == (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask) )
@@ -145 +145 @@
                 buffer4[1]= *(buf+(*offV9)); (*offV9)++;
                 buffer4[0]= *(buf+(*offV9)); (*offV9)++;
-                /* here check a new var : moreIsNecessary */
                 if (1==moreIsNecessary){
                   switch(i){
                   case 0:
-/*                  fprintf(stderr, "i:%d case0, N:%lu V:%lu TC:%lu, %hu\n", */
-/*                          i, */
-/*                          ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]), */
-/*                          (*((unsigned long*)&buffer4)), */
-/*                          (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask), */
-/*                          ((RuleDefPtr)(*(rulesCache+pos)))->value->mask */
-/*                          ); */
                     if (((RuleDefPtr)(*(rulesCache+pos)))->value->mask <= 32){
                       if (ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]) 
@@ -182 +174 @@
                     break;
                   case 1:
-/*                  fprintf(stderr, "i:%d case1, N:%lu V:%lu TC:%lu\n", */
-/*                          i, */
-/*                          ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]), */
-/*                          (*((unsigned long*)&buffer4)), */
-/*                          (*((unsigned long*)&buffer4))>>(64-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(64-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)); */
                     if (((RuleDefPtr)(*(rulesCache+pos)))->value->mask <= 64){
                       if (ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]) 
@@ -274 +261 @@
                 } /* end of if moreIsNecessary */
               }
-/*            fprintf(stderr,"GOOD %d\n", */
-/*                    ((RuleDefPtr)(*(rulesCache+pos)))->check); */
               moreIsNecessary = 1;
               break;
@@ -409 +394 @@
   return (data_length+shift);
 }
-
-/*     for (i=0; i<(90); i++){ */
-/*       int k=0; */
-/*       pos = i*10+k; */
-/*       if (((RuleDefPtr)(*(rulesCache+pos))) != NULL){ */
-/*      fprintf(stderr," type: %d ",i); */
-/*      while ( ((RuleDefPtr)(*(rulesCache+pos))) != NULL){ */
-/*        fprintf(stderr, "\n op:%hu, pos: %d",  */
-/*                ((RuleDefPtr)(*(rulesCache+pos)))->operator, */
-/*                pos); */
-/*        k++; */
-/*        pos = i*10+k; */
-/*      } */
-/*      fprintf(stderr,"\n"); */
-/*       } */
-/*     }  */

trunk/src/dataFlowSet.h

@@ -2 +2 @@
  * File: dataFlowSet.h
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2005 GIP RENATER 

trunk/src/renetcol.c

@@ -131 +131 @@
   }
 
+  /* handler, SIGUSR1 from renetcolSender */
   myAction.sa_handler = sigusr1Mgmt;
   myAction.sa_flags = SA_RESTART;
@@ -167 +168 @@
   initStream();
 
-  datagramNumber =0;
-
-  /* TIME */
+  datagramNumber =0; /* FIXME : ???? */
+
   now = time((time_t *)NULL);
   tmPtr = localtime(&now);
-  socketLoop();
+  socketLoop(); /* all work on datagram is made here */
   closelog();
   fprintf(stderr, "END\n");
@@ -332 +332 @@
             getNetFlowHeader(pcktPtr, ptr_buffer, 
                              currentHeaderV9Ptr, offsetV9Ptr)){
-    case 1:
-      checkNetFlowHeader(pcktPtr);
-      break;
-    case 5:
-/*       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:
       if ((currentRouterPtr=notExistRouter(routersListPtr, 

trunk/src/template.c

@@ -76 +76 @@
   unsigned short tplMsgType = 1;
 
+  fprintf (stderr, "NORMAL\n");
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
   getFlowsetId = *((unsigned short*)&buffer2);
+  fprintf(stderr,"FlowsetID: %hu \n", getFlowsetId);
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
   length = *((unsigned short*)&buffer2);
+  fprintf(stderr,"length: %hu \n", length);
   do {
     buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -88 +91 @@
          existTplId(cr, v9Ptr->sourceId,
                     *((unsigned short*)&buffer2)))==NULL) {
+      fprintf (stderr, "NEW\n");
       cTFSPtr = newRouterTplList();
       cTFSPtr->next = cr->tplList;
@@ -93 +97 @@
       cr->tplList = cTFSPtr;
       cTFSPtr->templateFlowSetId = *((unsigned short*)&buffer2);
+      fprintf(stderr,"templateFlowSetId: %hu \n", cTFSPtr->templateFlowSetId);
       cTFSPtr->sourceId = v9Ptr->sourceId;
       buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
       cTFSPtr->fieldCount = *((unsigned short*)&buffer2);
+      fprintf(stderr,"fieldCount: %hu \n", cTFSPtr->fieldCount);
       cpt_fields = 0;
       for ( i=0; i<cTFSPtr->fieldCount; i++) {
@@ -130 +136 @@
       }
     } else { /*update*/
+      fprintf (stderr, "UPDATE\n");
       ptpltmp = cTFSPtr;
       if (ptpltmp->prev == NULL) {
@@ -244 +251 @@
   TplOptionPtr ptplotmp;
 
+  fprintf (stderr, "\nOPTION\n");
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
   getFlowsetId = *((unsigned short*)&buffer2);
+  fprintf(stderr,"FlowsetID: %hu \n", getFlowsetId);
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
   length = *((unsigned short*)&buffer2);
+  fprintf(stderr,"length: %hu \n", length);
   do {
     buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -256 +266 @@
          existTplOptId(cr, v9Ptr->sourceId, 
                        *((unsigned short*)&buffer2)))==NULL) {
+      fprintf (stderr, "NEW\n");
       cTOPtr = newRouterTplOptList();
       cTOPtr->next = cr->tplOptList;
@@ -261 +272 @@
       cr->tplOptList = cTOPtr;
       cTOPtr->templateOptionId = *((unsigned short*)&buffer2);
+      fprintf(stderr,"templateOptionId: %hu \n", cTOPtr->templateOptionId);
       cTOPtr->sourceId = v9Ptr->sourceId;
       buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
       cTOPtr->optionScopeLg = *((unsigned short*)&buffer2);
+      fprintf(stderr,"optionScopeLg: %hu \n", cTOPtr->optionScopeLg);
       buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
       cTOPtr->optionLg = *((unsigned short*)&buffer2);
-      for ( i=0; i<((cTOPtr->optionScopeLg)+(cTOPtr->optionLg)); i++) {
+      fprintf(stderr,"optionLg: %hu \n", cTOPtr->optionLg);
+      for ( i=0; i<(((cTOPtr->optionScopeLg)+(cTOPtr->optionLg))/4); i++) {
         FieldPtr tmp = (FieldPtr) malloc(sizeof(struct Field));
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
         tmp->fieldType = *((unsigned short*)&buffer2);
+        fprintf (stderr, " (%hu,", tmp->fieldType);
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
         tmp->fieldLength = *((unsigned short*)&buffer2);
+        fprintf (stderr, "%hu)", tmp->fieldLength);
         tmp->next = cTOPtr->fieldSet;
         tmp->prev = NULL;
@@ -285 +301 @@
       }
       while ((*offV9)%4 != 0) {
+        fprintf (stderr, "padding\n");
         (*offV9)++; cpt++;
       } /*padding case*/
     } else { /*update */
+      fprintf (stderr, "UPDATE\n");
       ptplotmp = cTOPtr;
       if (ptplotmp->prev == NULL) {
@@ -314 +332 @@
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
       cTOPtr->optionLg = *((unsigned short*)&buffer2);
-      for ( i=0; i<((cTOPtr->optionScopeLg)+(cTOPtr->optionLg)); i++) {
+      for ( i=0; i<(((cTOPtr->optionScopeLg)+(cTOPtr->optionLg))/4); i++) {
         FieldPtr tmp = (FieldPtr) malloc(sizeof(struct Field));
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
         tmp->fieldType = *((unsigned short*)&buffer2);
+        fprintf (stderr, " (%hu,", tmp->fieldType);
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
         tmp->fieldLength = *((unsigned short*)&buffer2);
+        fprintf (stderr, "%hu) ", tmp->fieldLength);
         tmp->next = cTOPtr->fieldSet;
         tmp->prev = NULL;
@@ -331 +351 @@
       }
       while ((*offV9)%4 != 0) {
+        fprintf(stderr,"padding\n");
         (*offV9)++; cpt++;
       } /*padding case*/
     }
     (*cFNPtr)++;
-  } while ((cpt*2) < (length-3));
+  } while ((cpt) < (length-2));
 /*   show_all_tplFlSet(); */
   return length;