Changeset 124 for trunk

Timestamp:

09/20/10 09:43:01 (13 years ago)

Author:

andreu

Message:

ticket #44

Location:

trunk

Files:

• src/dataFlowSet.c (modified) (2 diffs)
• web/conf/opt.php (modified) (2 diffs)
• web/renetcol.css (modified) (2 diffs)

trunk/src/dataFlowSet.c

@@ -1062 +1062 @@
                 } else { 
                   /* here we'll make the choice that in multisampling mode,
-                   * the virtual POP that represent the reste of world is 
-                   * in 1:10 packets mode */
+                   * the virtual POP that represent the reste of world will be
+                   * recorded in 1:10 packets mode */
 #if defined(MULTISAMPLING)
                   (
@@ -1231 +1231 @@
                 }
 #endif
+              } else {
+#if defined(MULTISAMPLING)
+#if defined(MATRIX)
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((ROUTER_INDEX_MAX-1)*ROUTER_INDEX_MAX)
+                    +((res->routerNb))))->pktsNb += agCache.pkts*myPtrs->currentRouterPtr->sampled/10; 
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((ROUTER_INDEX_MAX-1)*ROUTER_INDEX_MAX)
+                    +((res->routerNb))))->bytesNb += agCache.bytes*myPtrs->currentRouterPtr->sampled/10; 
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((ROUTER_INDEX_MAX-1)*ROUTER_INDEX_MAX)
+                    +((res->routerNb))))->flowNb++;
+#endif
+#else
+#if defined(MATRIX)
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((ROUTER_INDEX_MAX-1)*ROUTER_INDEX_MAX)
+                    +((res->routerNb))))->pktsNb += agCache.pkts; 
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((ROUTER_INDEX_MAX-1)*ROUTER_INDEX_MAX)
+                    +((res->routerNb))))->bytesNb += agCache.bytes; 
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((ROUTER_INDEX_MAX-1)*ROUTER_INDEX_MAX)
+                    +((res->routerNb))))->flowNb++;
+#endif
+#endif  
               }
               if (res->sampling == 0 

trunk/web/conf/opt.php

@@ -6 +6 @@
 print "<div id=\"contenu\">\n";
 
-print "<p> Compilation options: </p>\n";
+print "<p> Compilation options: \n";
 
 while (!feof ($CONFfinputLOG)) {
@@ -22 +22 @@
  }
 
-print "</div>\n";
+print "</p> </div>\n";
 
 fclose($CONFfinputLOG);

trunk/web/renetcol.css

@@ -182 +182 @@
 {
         display: block;
-        margin-left: 130px;
-        padding-right: 10px;
+        margin-left: 140px;
+        padding-right: 15px;
 /*        border-style: dotted;*/
         background: url(./img_monitoring/renetcol_logo_vertical.jpg) no-repeat -100px bottom;
@@ -207 +207 @@
 }
 
+div#contenu li
+{ 
+}
+
 div#contenu p
 {