X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=exec%2Fvif_down;h=fe121c76083879b6be0b091f471cd7abe43e32d9;hb=bf6948cbaf9fd4e1bf94ced5c3dafa9e9d9a6dd0;hp=b36f1d677cda2f1eb0b2859b682f0463f74f564b;hpb=5615abbb4d9958913188f511c9edb78809756acc;p=vsys-scripts.git

diff --git a/exec/vif_down b/exec/vif_down
index b36f1d6..fe121c7 100755
--- a/exec/vif_down
+++ b/exec/vif_down
@@ -10,7 +10,7 @@ import sys
 import pwd
 import os
 import re
-
+import string
 
 if len(sys.argv) != 2: sys.exit(1)
 
@@ -19,9 +19,41 @@ slicename=sys.argv[1]
 sliceid = pwd.getpwnam(slicename).pw_uid
 
 
-# Read interface name
-vif = sys.stdin.readline().strip() # interface name
+arglines = map(string.strip, sys.stdin.readlines())
+
+if len(arglines)<1:
+    print >>sys.stderr, "Insufficient argument lines."
+    sys.exit(1)
+
+vif = arglines[0] # interface name
+
+# Create options list
+if len(arglines)>1:
+    options = arglines[1:]
+else:
+    options = []
+
+opt_delete = False
+
+for optionline in options:
+    if len(optionline)==0: continue
+    try:
+        opt, val = optionline.split('=')
+    except:
+        print >>sys.stderr, "Bad option line: \"%s\"" % (optionline)
+        sys.exit(1)
 
+    if opt=="delete":
+        if val=="0":
+            opt_delete=False
+        elif val=="1":
+            opt_delete=True
+        else:
+            print >>sys.stderr, "rp_filter value invalid: \"%s\"" % (val)
+            sys.exit(1)
+    else:
+        print >>sys.stderr, "Unknown option: \"%s\"" % (opt)
+        sys.exit(1)
 
 # Validate interface name
 if len(vif)>16:
@@ -36,15 +68,21 @@ if re.match(r'(tun|tap)%d-\d+' % sliceid, vif ) is None:
 
 # Remove iptables rules
 public_src = os.popen("ifconfig | grep $(ip route | grep default | awk '{print $3}' | awk -F. '{print $1\"[.]\"$2}') | head -1 | awk '{print $2}' | awk -F : '{print $2}'").read().rstrip()
-cmd_iptables_del_in = "/sbin/iptables -D INPUT -i %s -m mark ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
-cmd_iptables_del_out = "/sbin/iptables -D OUTPUT -o %s -m mark ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
-cmd_iptables_del_pr = "/sbin/iptables -t nat -D POSTROUTING -s $(ip ro | grep 'dev %s' | head -1 | awk '{print $1}') -j SNAT --to-source %s --random" % (vif, public_src,)
+cmd_iptables_del_in = "/sbin/iptables -D INPUT -i %s -m mark -m state --state NEW ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
+cmd_iptables_del_out = "/sbin/iptables -D OUTPUT -o %s -m mark -m state --state NEW ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
+cmd_iptables_del_pr = "/sbin/iptables -t nat -D POSTROUTING -s $(ip ro | grep 'dev %s' | head -1 | awk '{print $1}') -j SNAT --to-source %s --random 2>/dev/null" % (vif, public_src,)
+cmd_gre_del = "ip link del %s 2>/dev/null" % (vif,)
+cmd_iptables_del_gre_pr = "/sbin/iptables -t mangle -D INPUT -i %s -m mark --mark 0 -j MARK --set-mark %s 2>/dev/null" % (vif, sliceid)
 
 os.system(cmd_iptables_del_in)
 os.system(cmd_iptables_del_out)
 os.system(cmd_iptables_del_pr)
+os.system(cmd_iptables_del_gre_pr)
 
 # Bring interface down
 cmd_ifconfig = "/sbin/ifconfig %s down" % (vif)
 os.system(cmd_ifconfig)
 
+# Delete GRE tunnel (if any)
+if (opt_delete):
+    os.system(cmd_gre_del)