Changeset 111 for trunk

Timestamp:

06/17/09 14:44:04 (14 years ago)

Author:

andreu

Message:

ticket #41 Pcap file integration

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• src/dataFlowSet.c (modified) (11 diffs)
• src/renetcol.c (modified) (20 diffs)
• src/renetcol.h (modified) (2 diffs)
• src/template.c (modified) (4 diffs)

trunk/configure.in

@@ -21 +21 @@
 CFLAGS_PRINTUNKNOWNSUBNET="-DPRINTUNKNOWNSUBNET"
 CFLAGS_MULTISAMPLING="-DMULTISAMPLING"
+CFLAGS_READFROMFILE="-DREADFROMFILE -lpcap"
 
 # Checks for programs.
@@ -51 +52 @@
 if test $multisampling = yes ; then
 CFLAGS="$CFLAGS $CFLAGS_MULTISAMPLING"
+fi
+
+AC_ARG_ENABLE(readfromfile,[  --enable-readfromfile Read NDE from pcap FILE mode=no],
+readfromfile=$enableval,readfromfile=no)
+if test $readfromfile = yes ; then
+CFLAGS="$CFLAGS $CFLAGS_READFROMFILE"
 fi
 

trunk/src/dataFlowSet.c

@@ -81 +81 @@
   int paddingCounter = 0;
   int crazyCounter = 0;
+#ifdef DEBUG
+  int flowCpt = 0;
+#endif
 
   buffer2[1] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));
@@ -93 +96 @@
   data_length = *((unsigned short*)&buffer2);
   if (data_length == 0) {
-    syslog(LOG_INFO, "data flowset length null; all next informations of this data flowset are not considered! flowset ID: %hu, from router: %lu.%lu.%lu.%lu",
-           (*myPtrs->currentFlowsetIdPtr),
-           (myPtrs->pcktPtr->ipH->srcAdd>>24),
-           (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
-           (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
-           (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+#ifdef DEBUG    
+    fprintf (stderr, " dlg==0 <--| ");
+#endif
+/*     syslog(LOG_INFO, "data flowset length null; all next informations of this data flowset are not considered! flowset ID: %hu, from router: %lu.%lu.%lu.%lu", */
+/*         (*myPtrs->currentFlowsetIdPtr), */
+/*         (myPtrs->pcktPtr->ipH->srcAdd>>24), */
+/*         (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
+/*         (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
+/*         (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)); */
     return (-1);
 
@@ -112 +118 @@
             data_length);
     if ( (*myPtrs->currentFlowsetIdPtr) > TRESHOLD_TEMPLATE_ID ) {
-      /*        fprintf(stderr,"Bad TID from router: %lu.%lu.%lu.%lu\n", */
-      /*                (*myPtrs->currentFlowsetIdPtr), */
-      /*                (myPtrs->pcktPtr->ipH->srcAdd>>24), */
-      /*                (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
-      /*                (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
-      /*                (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)); */
-      /*        fprintf(stderr," Bytes : \n"); */
-      /*        while ( ( myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr) ) > (myPtrs->ptr_buffer+1416) ){ */
-      /*          buffer1= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++; */
-      /*          tmp = *((unsigned char*)&buffer1); */
-      /*          fprintf (stderr, " %s ", tmp); */
-      /*        } */
-      /*        exit(-1); */
+        fprintf(stderr,"Bad TID from router: %lu.%lu.%lu.%lu\n",
+                (*myPtrs->currentFlowsetIdPtr),
+                (myPtrs->pcktPtr->ipH->srcAdd>>24),
+                (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+        fprintf(stderr," Bytes : \n");
+        while ( ( myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr) ) > (myPtrs->ptr_buffer+1416) ){
+          buffer1= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++;
+          tmp = *((unsigned char*)&buffer1);
+          fprintf (stderr, " %s ", tmp);
+        }
+        exit(-1);
       return (data_length+shift);
     }
@@ -134 +140 @@
     if ( data_length%flow_size >= 9 ) {
       (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
-      syslog(LOG_INFO, "data flowset length not match with length from template definition, wrong template definition suspected; all next informations of this data flowset are not considered! flowset ID: %hu, from router: %lu.%lu.%lu.%lu",
+      syslog(LOG_INFO, "data flowset length not match with length from template definition, wrong template definition suspected; all next informations of this data flowset are not considered! sourceID: %lu flowset ID: %hu, from router: %lu.%lu.%lu.%lu",
+             myPtrs->currentHeaderV9Ptr->sourceId,
              (*myPtrs->currentFlowsetIdPtr),
              (myPtrs->pcktPtr->ipH->srcAdd>>24),
@@ -140 +147 @@
              (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
              (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+#ifdef DEBUG    
+    fprintf (stderr, " dlg%flsz >=9 skip data ");
+#endif
       return (data_length+shift);
     }
@@ -149 +159 @@
              (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
              (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+#ifdef DEBUG    
+    fprintf (stderr, " dlg >= 1452 skip pckt ");
+#endif
       return (-1);
     }
@@ -641 +654 @@
          * end of one flow (not the flowset) 
          */
-
+#ifdef DEBUG
+        flowCpt++;
+        fprintf(stderr," F%d ", flowCpt);
+#endif 
         /* put aggregation cache information to IPv4 Prefixes table */
         /* Aggregation mode must be enable in ./configure options   */
@@ -1212 +1228 @@
         /* not the flow end, progress in field list */
         pftmp = pftmp->prev;
-      }
+      }    
     } /* end of the while on one flow record */
-      
+       
     while ( ((*myPtrs->offsetV9Ptr)-48-shift) < data_length ) {
       (*myPtrs->offsetV9Ptr)++; /* if padding */
       paddingCounter++;
+#ifdef DEBUG
+      fprintf(stderr,", pC: %d ", paddingCounter);
       if ( paddingCounter > 8 ) {
-#ifdef DEBUG
-        fprintf(stderr," padding too high: %d ", paddingCounter);
-#endif
         syslog(LOG_INFO,"padding too high: %d ", paddingCounter);
+        fprintf(stderr,", pC: %d <--| ", paddingCounter);
         return (-1);
+#endif
       }
+      return (-1);
     }
     while ( (*myPtrs->offsetV9Ptr)-48-shift > data_length ) { 
@@ -1232 +1250 @@
 #ifdef DEBUG
     if (crazyCounter != 0){ fprintf(stderr," crazyCounter: %d ", crazyCounter); }
-#endif
     if (crazyCounter!=0) { syslog(LOG_INFO,"crazyCounter: %d ", crazyCounter);}
-      
-#ifdef DEBUG
-    fprintf(stderr,"}");
+    fprintf(stderr,"(%hu,%hu)}", data_length, data_length+shift);
 #endif
       
@@ -1326 +1341 @@
     } else {
       /* 
-       * template unknown, we skip this all the data 
+       * template unknown, we skip the data 
        */
       (*myPtrs->offsetV9Ptr)+=(data_length-4);
-      (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
+      (*myPtrs->currentFlowsetNumberPtr)+= 1 ;
+      /*      (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;*/
 #ifdef DEBUG
-      fprintf(stderr, " U, r: %lu.%lu.%lu.%lu, sourceId: %lu, TID: %hu",
+      fprintf(stderr, " U, r: %lu.%lu.%lu.%lu, sourceId: %lu, TID: %hu ",
               (myPtrs->pcktPtr->ipH->srcAdd>>24),
               (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
@@ -1339 +1355 @@
               (*myPtrs->currentFlowsetIdPtr)
               );
+      fprintf(stderr,"(%hu,%hu) ", data_length, data_length+shift);
 #endif
       return (data_length+shift);

trunk/src/renetcol.c

@@ -85 +85 @@
 static struct sockaddr_in name2;
 static struct sockaddr_in fromName;
+#ifdef READFROMFILE
+  char *myPcapFileName, errBuffer[PCAP_ERRBUF_SIZE];
+  pcap_t *myPcapHandle;
+#endif
 
 /* 
@@ -100 +104 @@
   unsigned short routerIndex = 0;
 
+#if defined(READFROMFILE)
+  if ( argc != 2) {
+    fprintf (stderr,
+             "%s: Usage: %s <pcap file>\n exp: %s /tmp/my_pcap_file.pcap\n", 
+             argv[0], argv[0], argv[0]);
+    exit(1);
+  }
+  myPcapFileName = argv[1];
+  if ((myPcapHandle = pcap_open_offline(myPcapFileName, errBuffer)) == NULL) {
+    fprintf(stderr, "Couldn't open PCAP file %s: %s\n", myPcapFileName, errBuffer);
+    exit(1);
+  }
+#endif
+
 #if defined(IPV4AGGIDR)
   fprintf(stderr, "renetcol compilation and execution with IPv4 Prefixes Aggregation feature enable based on routers ID in %s file.\n", ROUTERS_LIST);
@@ -113 +131 @@
   fprintf(stderr, "renetcol compilation and execution with IPv6 Links Aggregation.\n");
 #endif
-  
+
   openlog(argv[0], LOG_PID, LOG_USER);
 
@@ -299 +317 @@
   for (i=0; i<ROUTER_INDEX_MAX; i++){
     for (j=0; j<MAX_INDEX_BY_ROUTER; j++) {
+      shmForAgg->indexV6Tab[0][i][j].routerIPAddress = 0;
+      shmForAgg->indexV6Tab[0][i][j].indexSNMP = 0;
       shmForAgg->indexV6Tab[0][i][j].hasStats = 0;
       shmForAgg->indexV6Tab[0][i][j].sampling = 0;
@@ -307 +327 @@
       shmForAgg->indexV6Tab[0][i][j].pktsNbOUT = 0;
       shmForAgg->indexV6Tab[0][i][j].flowNbOUT = 0;
+      shmForAgg->indexV6Tab[1][i][j].routerIPAddress = 0;
+      shmForAgg->indexV6Tab[1][i][j].indexSNMP = 0;
       shmForAgg->indexV6Tab[1][i][j].hasStats = 0;
       shmForAgg->indexV6Tab[1][i][j].sampling = 0;
@@ -454 +476 @@
 
 #ifdef DEBUG
-  fprintf(stderr,"Cache for Rules\n");
+  fprintf(stderr,"Cache for Rules: \n");
 #endif 
   while (tmp) {
@@ -464 +486 @@
       }
       rulesAddress[def->fieldType][i] = def;
+#ifdef DEBUG
+      fprintf(stderr,"%d: %d \n", def->fieldType, i);
+#endif     
       def = def->next;
-#ifdef DEBUG
-      fprintf(stderr,"%d: %d ", def->fieldType, i);
-#endif     
     }
 #ifdef DEBUG
@@ -474 +496 @@
     tmp = tmp->next;
   }
+#ifdef DEBUG
+  fprintf(stderr,"Cache for Rules: OK");
+#endif 
 }
 
 /* 
  * initStream()
+ *
+ * Stream can be a file (pcap format) or a socket
  */
 void 
@@ -484 +511 @@
   static unsigned short n0, n1, n2, n3;
 
+#ifdef READFROMFILE
+  initFile();
+#else
   initSocket();
   if (sscanf(receptAddress,"%hu.%hu.%hu.%hu",&n0,&n1,&n2,&n3)==0) {
@@ -492 +522 @@
   buffer4[2] = (unsigned char)n1;
   buffer4[3] = (unsigned char)n0;
+#endif
 }
 
@@ -572 +603 @@
       initRule();
     } 
+#ifdef READFROMFILE
+    fileReading();
+#else
     socketReading();
+#endif
     getIpHeader(myPtrs.pcktPtr, myPtrs.ptr_buffer);
     regRouter = checkIpHeader(myPtrs.pcktPtr, &sortedRouterList[0], routerNb);
@@ -584 +619 @@
                              myPtrs.currentHeaderV9Ptr, myPtrs.offsetV9Ptr)){
     case 9:
+#ifdef DEBUG
+      fprintf (stderr, ", %d %hu %lu ,", 
+               myPtrs.currentHeaderV9Ptr->version,
+               myPtrs.currentHeaderV9Ptr->count,
+               myPtrs.currentHeaderV9Ptr->package_sequence);
+#endif
       if ((myPtrs.currentRouterPtr=notExistRouter(routersListPtr, 
                                                   myPtrs.pcktPtr->ipH->srcAdd))==NULL) {
@@ -591 +632 @@
       shift = 0;
       gardeFou=0;
-      while ((currentFlowsetNumber < myPtrs.currentHeaderV9Ptr->count)) {
+      while ((currentFlowsetNumber < myPtrs.currentHeaderV9Ptr->count) && (shift <= 1456)) {
         gardeFou++;
         curTplFlSetPtr = NULL;
@@ -605 +646 @@
                                              myQueue)) < 0 ) {
 #ifdef DEBUG
-            fprintf (stderr, "w>\n");
+            fprintf (stderr, "w> ");
 #endif
             currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
@@ -618 +659 @@
                                             myPtrs.currentFlowsetNumberPtr) ) < 0 ) {
 #ifdef DEBUG
-            fprintf (stderr, "wo>\n");
+            fprintf (stderr, "wo> ");
 #endif 
             currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
@@ -631 +672 @@
                                          (size_t) shmForAgg->v4SubnetNb) ) < 0 ) {
 #ifdef DEBUG    
-            fprintf (stderr, "wd>\n");
+            fprintf (stderr, "wd> ");
 #endif
             currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
@@ -637 +678 @@
         } else {
 #ifdef DEBUG    
-          fprintf (stderr, "1<<255\n");
+          fprintf (stderr, " 1<<255 ");
 #endif
           currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
@@ -643 +684 @@
         if ( gardeFou > 200) { exit(-1); }
       } /* end while flowset exist */
+#ifdef DEBUG
+      if (shift > 1456) {
+        fprintf(stderr," SHIT SHIFT > 1456 : %d \n", shift);
+      }
+#endif
       break;
     default:
@@ -735 +781 @@
 }
 
+/*
+ * initFile
+ */
+short initFile()
+{
+  
+}
 
 /* 
- * init socket
+ * socketReading
  */
 short 
@@ -758 +811 @@
   }
   return(0);
+}
+
+/*
+ * fileReading
+ */
+short fileReading()
+{
+#ifdef READFROMFILE
+  struct pcap_pkthdr myPcapHeader;  
+  const u_char *ethernetPacket;
+
+  if ((ethernetPacket = pcap_next(myPcapHandle, &myPcapHeader)) == NULL) {
+    pcap_close(myPcapHandle);
+    exit(0);
+  }
+  myPtrs.ptr_buffer = (DatagramPtr) (ethernetPacket + 14);
+#ifdef DEBUG
+  fprintf(stderr,"P");
+#endif
+#endif
 }
  

trunk/src/renetcol.h

@@ -46 +46 @@
 #include <signal.h>
 #include <setjmp.h>
+
+#ifdef READFROMFILE
+#include <pcap.h>
+#endif
 
 #include "routers_mgmt.h"
@@ -96 +100 @@
 int socketLoop();
 short initSocket();
+short initFile();
 short socketReading();
+short fileReading();
 short getFlow(short);
 short checkFlow(short);

trunk/src/template.c

@@ -212 +212 @@
 #endif
           }
+#ifdef DEBUG  
           syslog (LOG_INFO, 
-                  "in new template: field nb gt 216, field lg gt 16 or too many fields, bad template definition possibility");
+                  "New template: field nb, field lg or too many fields, bad template def possibility SId: %lu",
+                  v9Ptr->sourceId);
+#endif
           ptpltmp = cTFSPtr;
           if (ptpltmp->prev == NULL) {
@@ -309 +312 @@
 #endif
           }
+#ifdef DEBUG
           syslog (LOG_INFO, 
                   "in update template function: too many fields, bug collector or wrong template def in template update");
-#ifdef DEBUG
           fprintf(stderr, 
                   "\nin update template function: too many fields, bug collector or wrong template def in template update\n"); 
@@ -469 +472 @@
                   cr->IpAddress<<16>>24,
                   cr->IpAddress<<24>>24);
-#endif
           syslog (LOG_INFO, 
                   "in option template function: too many fields, bug collector or wrong template def in template update");
-#ifdef DEBUG
           fprintf(stderr,
                   "\nin option template function: too many fields, bug collector or wrong template def in template update\n");
@@ -566 +567 @@
                   cr->IpAddress<<16>>24,
                   cr->IpAddress<<24>>24);
-#endif
           syslog (LOG_INFO, 
                   "in update option tpl function: too many fields, bug collector or wrong template def in template update");
-#ifdef DEBUG
           fprintf(stderr,
                   "\nin update option tpl function: too many fields, bug collector or wrong template def in template update\n");