cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject git commit: updated refs/heads/master to 26858c1
Date Thu, 19 Dec 2013 05:29:17 GMT
Updated Branches:
  refs/heads/master 33fb241fd -> 26858c16e


CLOUDSTACK-4535 Fixed issue in PF in connecting from private nw when public and private ports
are different


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26858c16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26858c16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26858c16

Branch: refs/heads/master
Commit: 26858c16eebce4e3a600a61d61208a96ec7318c4
Parents: 33fb241
Author: Jayapal <jayapal@apache.org>
Authored: Thu Dec 19 10:46:49 2013 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Thu Dec 19 10:57:18 2013 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/root/firewall.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26858c16/systemvm/patches/debian/config/root/firewall.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/firewall.sh b/systemvm/patches/debian/config/root/firewall.sh
index 5615360..8c0e0fc 100755
--- a/systemvm/patches/debian/config/root/firewall.sh
+++ b/systemvm/patches/debian/config/root/firewall.sh
@@ -61,6 +61,7 @@ doHairpinNat () {
   local guestVmIp=$4
   local guestPort=$(echo $5 | sed 's/:/-/')
   local op=$6
+  local destPort=$5
   logger -t cloud "$(basename $0): create HairPin entry : public ip=$publicIp \
   instance ip=$guestVmIp proto=$proto portRange=$guestPort op=$op"
 
@@ -71,7 +72,7 @@ doHairpinNat () {
   		(sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -d $guestVmIp -j SNAT -o eth0
--to-source $vrGuestIP &>> $OUTFILE || [ "$op" == "-D" ])
 	else
   		(sudo iptables -t nat $op PREROUTING -d $publicIp -i eth0 -p $prot --dport $port -j DNAT
--to-destination $guestVmIp:$guestPort &>> $OUTFILE || [ "$op" == "-D" ]) &&
-  		(sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -p $prot --dport $port -d
$guestVmIp -j SNAT -o eth0 --to-source $vrGuestIP &>> $OUTFILE || [ "$op" == "-D"
])
+  		(sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -p $prot --dport $destPort
-d $guestVmIp -j SNAT -o eth0 --to-source $vrGuestIP &>> $OUTFILE || [ "$op" ==
"-D" ])
 	fi
 }
 


Mime
View raw message