deprecating vnet.

[util-vserver.git] / python / bwlimit.py

diff --git a/python/bwlimit.py b/python/bwlimit.py
index 5c1716e..8221e7b 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
@@ -348,8 +348,11 @@ def init(dev = dev, bwcap = bwmax):
     # Set up the root class (and tell VNET what it is). Packets sent
     # by root end up here and are capped at the node bandwidth
     # cap.
-    on(root_xid, dev, share = root_share)
-    file("/proc/sys/vnet/root_class", "w").write("%d" % ((1 << 16) | default_minor | root_xid))
+    #on(root_xid, dev, share = root_share)
+    #try:
+    #    file("/proc/sys/vnet/root_class", "w").write("%d" % ((1 << 16) | default_minor | root_xid))
+    #except:
+    #    pass
 
     # Set up the default class. Packets that fail classification end
     # up here.
@@ -516,8 +519,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
 
@@ -567,7 +574,7 @@ def exempt_init(group_name, node_ips):
     """
 
     # Clean up
-    iptables = "/sbin/iptables -t vnet %s POSTROUTING" 
+    iptables = "/sbin/iptables -t MANGLE %s POSTROUTING" 
     run(iptables % "-F")
     run("/sbin/ipset -X " + group_name)