Changeset 20 for trunk/src

Timestamp:

11/22/06 14:04:22 (16 years ago)

Author:

andreu

Message:

new release 0.0.6, with CRIHAN compilation feature

Location:

trunk/src

Files:

• .deps (added)
• .deps/V9Header_mgmt.Po (added)
• .deps/dataFlowSet.Po (added)
• .deps/fields_mgmt.Po (added)
• .deps/get_conf.Po (added)
• .deps/headers_mgmt.Po (added)
• .deps/msg_mgmt.Po (added)
• .deps/output_file.Po (added)
• .deps/remote_output.Po (added)
• .deps/renetcol.Po (added)
• .deps/renetcolMsgCtl.Po (added)
• .deps/renetcolSender.Po (added)
• .deps/routers_mgmt.Po (added)
• .deps/rules_mgmt.Po (added)
• .deps/template.Po (added)
• .deps/tplflset_mgmt.Po (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• dataFlowSet.c (modified) (20 diffs)
• dataFlowSet.h (modified) (1 diff)
• renetcol.c (modified) (5 diffs)
• renetcol.h (modified) (2 diffs)
• renetcolSender.c (modified) (4 diffs)

trunk/src/Makefile.am

@@ -14 +14 @@
 renetcolSender_LDADD = -ldl -lc_p
 $(PACKAGE)-$(VERSION).tar.gz: dist
-AM_CFLAGS = -I/usr/local/include -ansi -Wall -D _SVID_SOURCE \
-        -DSIGSETJMP_IS_BROKEN -fno-strict-aliasing \
-        -D _XOPEN_SOURCE \
-        -pedantic \
-        -pg
 .PHONY: clean
 clean:

trunk/src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
@@ -14 +14 @@
 
 @SET_MAKE@
-
-SOURCES = $(renetcol_SOURCES) $(renetcolMsgCtl_SOURCES) $(renetcolSender_SOURCES)
 
 srcdir = @srcdir@
@@ -102 +100 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -124 +123 @@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -135 +133 @@
 build_alias = @build_alias@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -142 +144 @@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@

trunk/src/dataFlowSet.c

@@ -65 +65 @@
   struct PrefixV4 prefixKey, *res; /* for bsearch */
   struct AggCache agCache;
+#ifdef CRIHAN
   struct IPFLowCache ipFirstCache; /* CRI */
   struct MPLSFlowCache mplsFirstCache; /* CRI */
   unsigned long firstTime = 0; /* CRI */
   unsigned long lastTime = 0; /* CRI */
+#endif /* CRIHAN */
   int bool = 0;
 
-  /* CRI */
+#ifdef CRIHAN
   ipFirstCache.ipProt = 0;
   ipFirstCache.bytes = 0;
@@ -89 +91 @@
   mplsFirstCache.v4AdS = 0;
   mplsFirstCache.v4AdD = 0;
-  mplsFirstCache.outSnmp = 0;
-  mplsFirstCache.inSnmp = 0;
   mplsFirstCache.routerAd = 0;
   mplsFirstCache.mplsLabel1 = 0;
-
-  /* CRI */
+#endif /* CRIHAN */
 
   buffer2[1] = *(buf+(*offV9));(*offV9)++;
@@ -122 +121 @@
     /* end aggreg */
 
-    /* CRI */
+#ifdef CRIHAN
     ipFirstCache.routerAd = pcktPtr->ipH->srcAdd;
     mplsFirstCache.routerAd = pcktPtr->ipH->srcAdd;
-    /* end CRI */
+#endif /* CRIHAN */
 
     pftmp = tmp->lastField;
@@ -185 +184 @@
 /*            } */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
                 ipFirstCache.maskS = *((unsigned char*)&buffer1);
@@ -199 +198 @@
                 ipFirstCache.tProt = *((unsigned char*)&buffer1); 
               }
-/*            if (pftmp->fieldType==46){  */
-/*              mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
-/*            } */
-              /* end CRI */
+#endif /* CRIHAN */
               break;
             case 2:
@@ -215 +211 @@
 /*            } */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if (pftmp->fieldType==10){
                 ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
-                mplsFirstCache.inSnmp = *((unsigned short*)&buffer2);
               }
               if (pftmp->fieldType==14){
                 ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
-                mplsFirstCache.outSnmp = *((unsigned short*)&buffer2);
               }
               if (pftmp->fieldType==7){
@@ -230 +224 @@
                 ipFirstCache.dPort = *((unsigned short*)&buffer2);
               }
-              /* end CRI */ 
+#endif /* CRIHAN */ 
               break;
             case 3:
@@ -242 +236 @@
               /* aggregation */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if (pftmp->fieldType==70){
                 mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
               }
-              /* end CRI */
+#endif /* CRIHAN */
               break;
             case 4:
@@ -275 +269 @@
 /*            } */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if (pftmp->fieldType==8){
                 ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
@@ -296 +290 @@
                 lastTime = *((unsigned long*)&buffer4);
               }
-              /* end CRI */
+#endif /* CRIHAN */
               break;
             case 16:
@@ -468 +462 @@
 /*        }        */
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
             ipFirstCache.maskS = *((unsigned char*)&buffer1);
@@ -482 +476 @@
             ipFirstCache.tProt = *((unsigned char*)&buffer1); 
           }
-/*        if (pftmp->fieldType==46){  */
-/*          mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
-/*        } */
+#endif /* CRIHAN */
           break;
         case 2:
@@ -494 +486 @@
           }       
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if (pftmp->fieldType==10){
             ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
-            mplsFirstCache.inSnmp = *((unsigned short*)&buffer2);
           }
           if (pftmp->fieldType==14){
             ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
-            mplsFirstCache.outSnmp = *((unsigned short*)&buffer2);
           }
           if (pftmp->fieldType==7){
@@ -509 +499 @@
             ipFirstCache.dPort = *((unsigned short*)&buffer2);
           }
-          /* end CRI */ 
+#endif /* CRIHAN */
           break;
         case 3:
@@ -518 +508 @@
           /* aggregation */
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if (pftmp->fieldType==70){
             mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
           }
-          /* end CRI */
+#endif /* CRIHAN */
           break;
         case 4:
@@ -541 +531 @@
 /*        } */
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if (pftmp->fieldType==8){
             ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
@@ -562 +552 @@
             lastTime = *((unsigned long*)&buffer4);
           }
-          /* end CRI */
+#endif /* CRIHAN */
           break;
         case 16:
@@ -585 +575 @@
          * end of one flow (not the flowset) 
          */
-        /* CRI */
+#ifdef CRIHAN
         if ( mplsFirstCache.mplsLabel1 == 0 ) {
           (ipCache+(*ipCounter))->ipProt = ipFirstCache.ipProt;
@@ -618 +608 @@
           (mplsCache+(*mplsCounter))->ipProt = mplsFirstCache.ipProt;
           mplsFirstCache.ipProt = 0;
-/*        (mplsCache+(*mplsCounter))->topLabelType = mplsFirstCache.topLabelType; */
-/*        mplsFirstCache.topLabelType = 0; */
           (mplsCache+(*mplsCounter))->v4AdS =  mplsFirstCache.v4AdS;
           mplsFirstCache.v4AdS = 0;
           (mplsCache+(*mplsCounter))->v4AdD =  mplsFirstCache.v4AdD; 
           mplsFirstCache.v4AdD = 0;
-          (mplsCache+(*mplsCounter))->inSnmp =  mplsFirstCache.inSnmp;
-          mplsFirstCache.inSnmp = 0;
-          (mplsCache+(*mplsCounter))->outSnmp =  mplsFirstCache.outSnmp; 
-          mplsFirstCache.outSnmp = 0;
           (mplsCache+(*mplsCounter))->routerAd =  mplsFirstCache.routerAd;
           (mplsCache+(*mplsCounter))->mplsLabel1 =  mplsFirstCache.mplsLabel1;
@@ -633 +617 @@
           (*mplsCounter)++;
         }
-        /* end CRI */
+#endif /* CRIHAN */
         /* 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);
-        }
+/*      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

@@ -62 +62 @@
   unsigned long v4AdS;
   unsigned long v4AdD;
-  unsigned short inSnmp;
-  unsigned short outSnmp;
   uint32_t tabAdd6S[4];
   uint32_t tabAdd6D[4];  

trunk/src/renetcol.c

@@ -26 +26 @@
 #include "renetcol.h"
 
-/* uptade for CRIHAN -> CRI */
+#ifdef CRIHAN
 struct IPFLowCache tabIP[MAX_IP_FLOW], *tabIPPtr = tabIP;
 struct MPLSFlowCache tabMPLS[MAX_MPLS_FLOW], *tabMPLSPtr = tabMPLS;
@@ -39 +39 @@
 FILE *fIP;
 FILE *fMPLS;
-/* end */
+#endif /* CRIHAN */
 
 char *rulesFileName;
@@ -410 +410 @@
     }
 
-    /* CRI */
+#ifdef CRIHAN
     now = time((time_t *)NULL);
     receptionTime = now;
@@ -475 +475 @@
         for ( iMPLS = 0; iMPLS < mplsNb; iMPLS++){
           if ( tabMPLS[iMPLS].ipProt == 0 ) {
-            fprintf(fMPLS, "%lu.%lu.%lu.%lu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu;%hu;%hu;%d\n",
+            fprintf(fMPLS, "%lu.%lu.%lu.%lu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu\n",
                     tabMPLS[iMPLS].routerAd>>24,tabMPLS[iMPLS].routerAd<<8>>24,
                     tabMPLS[iMPLS].routerAd<<16>>24,
                     tabMPLS[iMPLS].routerAd<<24>>24,
-                    tabMPLS[iMPLS].mplsLabel1,
-                    tabMPLS[iMPLS].v4AdS>>24,
+                    tabMPLS[iMPLS].mplsLabel1,tabMPLS[iMPLS].v4AdS>>24,
                     tabMPLS[iMPLS].v4AdS<<8>>24,tabMPLS[iMPLS].v4AdS<<16>>24,
                     tabMPLS[iMPLS].v4AdS<<24>>24,tabMPLS[iMPLS].v4AdD>>24,
                     tabMPLS[iMPLS].v4AdD<<8>>24,tabMPLS[iMPLS].v4AdD<<16>>24,
-                    tabMPLS[iMPLS].v4AdD<<24>>24,
-                    tabMPLS[iMPLS].inSnmp,tabMPLS[iMPLS].outSnmp,
-                    receptionTime
+                    tabMPLS[iMPLS].v4AdD<<24>>24 
                     );
           }
@@ -495 +492 @@
       lastMPLSOutput = now;
     }
-    /* end CRI */
+#endif /* CRIHAN */
   } while (1);
 }

trunk/src/renetcol.h

@@ -74 +74 @@
 #define MAX_RULES_PER_FIELD 10
 
- /* CRI */
+#ifdef CRIHAN
 #define OUTPUT_IP "/tmp/ipflow"
 #define EXTENSION ".txt" 
@@ -80 +80 @@
 #define MAX_IP_OUTPUT_FILES 3
 #define MAX_MPLS_OUTPUT_FILES 3
-#define MAX_IP_FLOW 1000
+#define MAX_IP_FLOW 10000
 #define MAX_MPLS_FLOW 200
 #define IP_TIME_THRESHOLD 60 /* in sec */
 #define MPLS_TIME_THRESHOLD 60 /* in sec */
-/* end CRI */
+#endif /* CRIHAN */
 
 void setCache(RulesPtr);

trunk/src/renetcolSender.c

@@ -76 +76 @@
     buffer[length] = '\0';
     if (strncmp("DELETE", buffer, 6)==0){
+      /* DELETE ALL RULES FROM A REMOTE CLIENT */
       if (!(ruleFile = fopen(rulesFileName, "r"))) {
         syslog (LOG_ERR, "error during %s opening\n", rulesFileName);
@@ -85 +86 @@
             ruleToDelete = 0;
             if (sscanf(lineCopy, "%1s %s\n",
-                       strTok,        
+                       strTok,
                        strName) != 0) {
-              if (strncmp(strName, host, strlen(host)) != 0){
-                strncpy(lines[cpt], lineCopy, strlen(lineCopy));
+              if (strncmp(strName, host, strlen(host)) == 0){
+                ruleToDelete = 1;
               } else {
-                ruleToDelete = 1;
+                strncpy(lines[cpt], line, strlen(line));
               }
             } else {
-              syslog (LOG_ERR, "error in file %s at line %d", 
-                      rulesFileName, cpt);
               return 1;
             }
@@ -103 +102 @@
           }
           cpt++;
-        }
+        } /* while end */
         fclose(ruleFile);
         if (!(tmpFile = fopen("rules.tmp", "w"))) {
@@ -124 +123 @@
       }
     } else {
+      /* NEW RULE */
       if (sscanf(buffer, "%s %s %1s %s\n",
                  port,