Changeset 85 for trunk/src

Timestamp:

11/19/08 12:07:14 (14 years ago)

Author:

andreu

Message:

#ticket 24

Files:

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

trunk/src/dataFlowSet.c

@@ -293 +293 @@
               }
               if ((pftmp->fieldType==10)||(pftmp->fieldType==14)){
-                if ((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue) 
-                    == (*((unsigned long*)&buffer4)))
+                if ((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) 
+                    == ((unsigned short)*((unsigned long*)&buffer4)))
                   {
                     ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
@@ -313 +313 @@
               }
 #if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
+              if (pftmp->fieldType==10){
+                agCache.inputSnmp = (unsigned short)*((unsigned long*)&buffer4);
+              }
+              if (pftmp->fieldType==14){
+                agCache.outputSnmp = (unsigned short)*((unsigned long*)&buffer4);
+              } 
               if ((pftmp->fieldType==8)){
                 bool = 1; /* very important, test if we have an IPv4 flow for Agg */
@@ -550 +556 @@
           (*myPtrs->offsetV9Ptr)++;
 #if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
+          if (pftmp->fieldType==10){
+            agCache.inputSnmp = (unsigned short)*((unsigned long*)&buffer4);
+          }
+          if (pftmp->fieldType==14){
+            agCache.outputSnmp = (unsigned short)*((unsigned long*)&buffer4);
+          } 
           if ((pftmp->fieldType==8)){
             bool = 1;
@@ -668 +680 @@
             }
 #ifdef DEBUG
-            fprintf(stderr,"S %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu\n",
+            fprintf(stderr,"S %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu SNMPin(hu) %hu\n",
                     (agCache.v4AdS>>24),
                     (agCache.v4AdS<<8>>24), 
@@ -680 +692 @@
                     (agCache.maskD),
                     myPtrs->currentRouterPtr->sampled,
-                    res->sampling);
+                    res->sampling,
+                    agCache.inputSnmp);
 #endif
 #if defined(IPV4AGGIDR)
@@ -725 +738 @@
                   }
 #ifdef DEBUG
-            fprintf(stderr,"S&D %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu\n",
+            fprintf(stderr,"S&D %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu SNMPin %hu\n",
                     (agCache.v4AdS>>24),
                     (agCache.v4AdS<<8>>24), 
@@ -737 +750 @@
                     (agCache.maskD),
                     myPtrs->currentRouterPtr->sampled,
-                    res3->sampling);
+                    res3->sampling,
+                    agCache.inputSnmp);
 #endif
 #if defined(MULTISAMPLING)
@@ -817 +831 @@
               }
 #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",
+            fprintf(stderr,"D %lu.%lu.%lu.%lu/%hu %lu.%lu.%lu.%lu/%hu Rs %lu Ps %lu R@ %lu.%lu.%lu.%lu SNMPin %hu\n",
                     (agCache.v4AdS>>24),
                     (agCache.v4AdS<<8>>24), 
@@ -833 +847 @@
                     (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
                     (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
-                    (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+                    (myPtrs->pcktPtr->ipH->srcAdd<<24>>24),
+                    agCache.inputSnmp);
 #endif
 #if defined(IPV4AGGIDSNMP)