[or-cvs] r14679: 0.2.* routers do not incorporate bytes sent and received in (blossom/trunk)

[goodell at seul.org]

Author: goodell
Date: 2008-05-20 08:59:22 -0400 (Tue, 20 May 2008)
New Revision: 14679

Modified:
   blossom/trunk/exit.py
Log:
0.2.* routers do not incorporate bytes sent and received in their descriptors


Modified: blossom/trunk/exit.py
===================================================================
--- blossom/trunk/exit.py	2008-05-20 07:27:22 UTC (rev 14678)
+++ blossom/trunk/exit.py	2008-05-20 12:59:22 UTC (rev 14679)
@@ -329,7 +329,8 @@
             else:
                 extended_content += "<td><tt></tt></td>\n"
     else:
-        b = int(rtr[r]["bytes"]/86400)
+        # b = int(rtr[r]["bytes"]/86400)
+        b = rtr[r]["bandwidth"]
         bytes = b
         suffix = "&nbsp;"
         if bytes >= 4096:
@@ -428,7 +429,7 @@
 if prompts.has_key("s") and prompts["s"] == "bytes":
     router_set = {}
     names = rtr.keys()
-    names.sort(lambda x, y: cmp(rtr[x]["bytes"], rtr[y]["bytes"]))
+    names.sort(lambda x, y: cmp(rtr[x]["bandwidth"], rtr[y]["bandwidth"]))
     size = len(rtr.keys())
     c = 0
     for r in names: