X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=exec%2Fvif_down;h=8c270ebb77078eb74547444ee1dc477a305249a4;hb=03b83ab79f6238a030047c76079eba403548d475;hp=af4be1639f08fc493ba99edd6509932f543ffbd9;hpb=ff35284423a071786b6ae47544ddac43d0b253b0;p=vsys-scripts.git

diff --git a/exec/vif_down b/exec/vif_down
index af4be16..8c270eb 100755
--- a/exec/vif_down
+++ b/exec/vif_down
@@ -36,15 +36,20 @@ 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)
+os.system(cmd_gre_del)