merge changes from head

diff --git a/python/bwlimit.py b/python/bwlimit.py
index 5c1716e..7892b58 100644 (file)
--- a/python/bwlimit.py
+++ b/python/bwlimit.py
@@ -46,7 +46,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: bwlimit.py,v 1.13 2006/11/27 22:32:59 mlhuang Exp $
+# $Id: bwlimit.py,v 1.15 2007/02/07 04:21:11 mlhuang Exp $
 #
 
 import sys, os, re, getopt
@@ -516,8 +516,12 @@ def on(xid, dev = dev, share = None, minrate = None, maxrate = None, minexemptra
         minrate = bwmin
     if minrate > maxrate:
         minrate = maxrate
+    if maxexemptrate < bwmin:
+        maxexemptrate = bwmin
     if maxexemptrate > bwmax:
         maxexemptrate = bwmax
+    if minexemptrate < bwmin:
+        minexemptrate = bwmin
     if minexemptrate > maxexemptrate:
         minexemptrate = maxexemptrate
 

diff --git a/python/vserver.py b/python/vserver.py
index c6d07b6..1c85a94 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -212,11 +212,11 @@ class VServer:
                     exempt_min = None, exempt_max = None,
                     share = None, dev = "eth0"):
 
-        if minrate:
+        if minrate is None:
+            bwlimit.off(self.ctx, dev)
+        else:
             bwlimit.on(self.ctx, dev, share,
                        minrate, maxrate, exempt_min, exempt_max)
-        else:
-            bwlimit.off(self.ctx, dev)
 
     def get_bwlimit(self, dev = "eth0"):