Changeset 36 for trunk/src/dataFlowSet.c

Timestamp:

05/19/07 11:57:44 (16 years ago)

Author:

andreu

Message:

ticket #1 #2 #7 closed - release 0.0.9beta

Files:

• trunk/src/dataFlowSet.c (modified) (7 diffs)

trunk/src/dataFlowSet.c

@@ -60 +60 @@
   unsigned char buffer4[4];
   RulesPtr tmpRuleList = myPtrs->rulesListPtr;
+  RulesPtr tmpRL = myPtrs->rulesListPtr;
   msgType myMsg;
   char *msgTextIndex;
+  char *msgToSend;
   unsigned short tplMsgType = 11;
-  struct PrefixV4 prefixKey, *res; /* for bsearch */
+  struct PrefixV4 prefixKey, *res, *res2; /* for bsearch */
   struct AggCache agCache;
   int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
@@ -674 +676 @@
         /* Aggregation mode must be enable in ./configure options   */
         /* first we must know if the address belong to our prefix   */
+        myPtrs->nbFluxTT++;
 #ifdef IPV4AGG
         if ( (bool == 1) && (isMplsFlow == 0) ){
@@ -681 +684 @@
           if (res!=NULL){
             if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+              myPtrs->nbFluxSR4++;
               /* OUT ("traffic from the prefix/subnet")  */
               res->bytesNbOUT += agCache.bytes;
               res->pktsNbOUT += agCache.pkts;
               (res->flowNbOUT)++;
+              /* inter-pop matrix Accounting */
+              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
+              res2 = bsearch(&prefixKey, V4PTab, nbPV4, 
+                            sizeof(struct PrefixV4), prefGlobalCmp);
+              if (res2!=NULL){
+                myPtrs->nbFluxIR4++;
+                ((struct POP *)((myPtrs->matrixPOP)
+                                +((res->routerNb)*ROUTER_INDEX_MAX)
+                                +((res2->routerNb))))->pktsNb += agCache.pkts;
+                ((struct POP *)((myPtrs->matrixPOP)
+                                +((res->routerNb)*ROUTER_INDEX_MAX)
+                                +((res2->routerNb))))->bytesNb += agCache.bytes; 
+                ((struct POP *)((myPtrs->matrixPOP)
+                                +((res->routerNb)*ROUTER_INDEX_MAX)
+                                +((res2->routerNb))))->flowNb++; 
+              } else {
+                myPtrs->nbFluxSE++;
+                (
+                 ((struct POP *)(myPtrs->matrixPOP)
+                 +((res->routerNb)*ROUTER_INDEX_MAX)
+                 +((ROUTER_INDEX_MAX-1))))->pktsNb += agCache.pkts; 
+                (
+                 ((struct POP *)(myPtrs->matrixPOP)
+                 +((res->routerNb)*ROUTER_INDEX_MAX)
+                 +((ROUTER_INDEX_MAX-1))))->bytesNb += agCache.bytes; 
+                (
+                 ((struct POP *)(myPtrs->matrixPOP)
+                 +((res->routerNb)*ROUTER_INDEX_MAX)
+                 +((ROUTER_INDEX_MAX-1))))->flowNb++; 
+              }
+              /* end interpop matrix accounting */
             } else {
               /* doublon or bad reference in prefix list */
@@ -725 +760 @@
               /*     -  prefix not referenced but not allowed to be routed */
               /*     -  spoofing                                           */
+              myPtrs->nbFluxUK++;
 #ifdef PRINTUNKNOWNSUBNET 
               fprintf(stderr, "%lu.%lu.%lu.%lu/%hu -> %lu.%lu.%lu.%lu/%hu (R:%lu.%lu.%lu.%lu) \n",
@@ -759 +795 @@
          */
         tmpRuleList = myPtrs->rulesListPtr;
+        tmpRL = myPtrs->rulesListPtr;
         while (tmpRuleList){
-/*        RulesPtr tmpRuleList_for_to = myPtrs->rulesListPtr; */
           RuleDefPtr tmpRuleDefList = tmpRuleList->def;
           unsigned short check = 1;
-/*        int s=0; */
+          int s=0;
           secondOffset = secondOldOffset;
           while (tmpRuleDefList){
@@ -773 +809 @@
             /* msg building */
             secondPftmp = tmp->lastField;
-            msgTextIndex = mempcpy(mempcpy(mempcpy(myMsg.text, 
+            msgTextIndex = mempcpy(mempcpy(mempcpy(myMsg.text,   
                                                    &tplMsgType, 
                                                    sizeof(unsigned short) 
@@ -795 +831 @@
             myMsg.type = 1;
             /* OLD transfert type */
-            msgSend( myQueue, myMsg);
+/*          msgSend( myQueue, myMsg); */
             /* NEW transfert type */
-/*          for ( ; tmpRuleList_for_to; tmpRuleList_for_to=tmpRuleList_for_to->next){ */
-/*            fprintf(stderr, "?\n"); */
-/*            if (tmpRuleList_for_to->id == tmpRuleList->id){ */
-/*              fprintf(stderr, "y\n"); */
-/*              s = sendMessage(tmpRuleList_for_to->host->sockId, &(myMsg.text), sizeof(myMsg.text), */
-/*                              tmpRuleList_for_to->host->hostAddressPtr); */
-/*              fprintf(stderr, "o\n"); */
-/*            } */
-/*          } */
+            for ( ; tmpRL; tmpRL=tmpRL->next){
+              if (tmpRL->id == tmpRuleList->id){
+                s = sendMessage(tmpRL->host->sockId, myMsg.text, sizeof(myMsg.text),
+                                tmpRL->host->hostAddressPtr);
+              }
+            }
             /* FIXME : perhaps check "s" */
             noEnd = 1;