Changeset 84 for trunk/src

Timestamp:

11/07/08 16:20:00 (14 years ago)

Author:

andreu

Message:

multi-sampling implementation - phase 1

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (11 diffs)
• get_conf.c (modified) (1 diff)
• routers_mgmt.c (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -657 +657 @@
                         sizeof(struct PrefixV4), prefGlobalCmp);
           if (res!=NULL){
-            /* res is supernet or subnet ? */
+            /* WE HAVE FOUND SOURCE ADDRESS IN OUR LIST */
             if (res->hasSubnet == 1) {
               resSub = NULL;
@@ -667 +667 @@
               } 
             }
+#ifdef DEBUG
+            fprintf(stderr,"S %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu\n",
+                    (agCache.v4AdS>>24),
+                    (agCache.v4AdS<<8>>24), 
+                    (agCache.v4AdS<<16>>24), 
+                    (agCache.v4AdS<<24>>24), 
+                    (agCache.maskS),
+                    (agCache.v4AdD>>24), 
+                    (agCache.v4AdD<<8>>24), 
+                    (agCache.v4AdD<<16>>24), 
+                    (agCache.v4AdD<<24>>24), 
+                    (agCache.maskD),
+                    myPtrs->currentRouterPtr->sampled,
+                    res->sampling);
+#endif
 #if defined(IPV4AGGIDR)
             if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) { 
@@ -672 +687 @@
               if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
 #endif
-
                 /* OUT ("traffic from the prefix/subnet")  */
 #if defined(MULTISAMPLING)
@@ -710 +724 @@
                     }
                   }
+#ifdef DEBUG
+            fprintf(stderr,"S&D %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu\n",
+                    (agCache.v4AdS>>24),
+                    (agCache.v4AdS<<8>>24), 
+                    (agCache.v4AdS<<16>>24), 
+                    (agCache.v4AdS<<24>>24), 
+                    (agCache.maskS),
+                    (agCache.v4AdD>>24), 
+                    (agCache.v4AdD<<8>>24), 
+                    (agCache.v4AdD<<16>>24), 
+                    (agCache.v4AdD<<24>>24), 
+                    (agCache.maskD),
+                    myPtrs->currentRouterPtr->sampled,
+                    res3->sampling);
+#endif
 #if defined(MULTISAMPLING)
                   if (myPtrs->currentRouterPtr->sampled != res3->sampling ){
@@ -772 +801 @@
             }
 #endif
-          } else { /* res==NULL, the prefix in source don't exist in your prefix list */
+          } else { /* SOURCE ADDRESS DOESN'T IN OUR LIST */
             prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
                           sizeof(struct PrefixV4), prefGlobalCmp);
             if (res!=NULL){
-              /* res is supernet or subnet ? */
+              /* DESTINATION ADDRESS IS IN OUR LIST */
               if (res->hasSubnet == 1) {
                 resSub = NULL;
@@ -787 +816 @@
                 }
               }
+#ifdef DEBUG
+            fprintf(stderr,"D %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu R@ %lu.%lu.%lu.%lu\n",
+                    (agCache.v4AdS>>24),
+                    (agCache.v4AdS<<8>>24), 
+                    (agCache.v4AdS<<16>>24), 
+                    (agCache.v4AdS<<24>>24), 
+                    (agCache.maskS),
+                    (agCache.v4AdD>>24), 
+                    (agCache.v4AdD<<8>>24), 
+                    (agCache.v4AdD<<16>>24), 
+                    (agCache.v4AdD<<24>>24), 
+                    (agCache.maskD),
+                    myPtrs->currentRouterPtr->sampled,
+                    res->sampling,
+                    (myPtrs->pcktPtr->ipH->srcAdd>>24), 
+                    (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+                    (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+                    (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+#endif
 #if defined(IPV4AGGIDSNMP)
               if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {
+#if defined(MULTISAMPLING)
+                if (myPtrs->currentRouterPtr->sampled != res->sampling ){
+                  res->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  res->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/res->sampling;
+                }else{
+                  res->bytesNbIN += agCache.bytes;
+                  res->pktsNbIN += agCache.pkts;
+                  (res->flowNbIN)++;
+                }
+#else
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the prefix/subnet")  */
@@ -795 +853 @@
                   (res->flowNbIN)++;
                 }
+#endif
               }
 #endif
@@ -806 +865 @@
                 }
               }
-#endif
               if (res->sampling == 0 
                   && myPtrs->currentRouterPtr->sampled != 0 ){
                 res->sampling = myPtrs->currentRouterPtr->sampled;
               }
+#endif
             } else {
               /* UNKNOW SUBNET CASE                                        */
@@ -964 +1023 @@
 #ifdef DEBUG
       fprintf(stderr,"<d id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
-#endif      
+#endif
       for ( i=0; i<(tmpOpt->optionScopeLg/4); i++){
         /* FIXME : today we skip the scope fields, it's bad :( */ 
@@ -987 +1046 @@
           buffer4[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
           buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
-          if (pftmp->fieldType==34){
+          if (pftmp->fieldType==34||pftmp->fieldType==50){
             if ((*((unsigned long*)&buffer4)==1) 
                 || (*((unsigned long*)&buffer4)==10)
@@ -996 +1055 @@
                 fprintf(stderr,"\n SV (p) %lu != %lu (r)", *((unsigned long*)&buffer4),
                         myPtrs->currentRouterPtr->sampled);
-#endif                     
+#endif
                 syslog(LOG_INFO,"Sampling value change for router : %lu.%lu.%lu.%lu, old: %lu, new: %lu",
                        (myPtrs->pcktPtr->ipH->srcAdd>>24),

trunk/src/get_conf.c

@@ -335 +335 @@
         pV4SubTabPtr[subNetIndex].mask = n4;
 #if defined(MULTISAMPLING)
-        pV4TabPtr[subNetIndex].sampling = n6;
+        pV4SubTabPtr[subNetIndex].sampling = n6;
 #else
-        pV4TabPtr[subNetIndex].sampling = 0;
+        pV4SubTabPtr[subNetIndex].sampling = 0;
 #endif
 #ifdef IPV4AGGIDR      

trunk/src/routers_mgmt.c

@@ -49 +49 @@
     tmp->tplList = NULL;
     tmp->tplOptList = NULL;
+#if defined(MULTISAMPLING)
+    tmp->sampled = 1;
+#else
     tmp->sampled = 0;
+#endif
     tmp->next = routersList;
     if (routersList!=NULL) { routersList->prev = tmp;}