You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/02/10 09:58:46 UTC

git commit: updated refs/heads/master to 37c4015

Updated Branches:
  refs/heads/master 899ad1739 -> 37c4015d4


CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding


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

Branch: refs/heads/master
Commit: 37c4015d4dd3786496331db44cf65b12df9d50f2
Parents: 899ad17
Author: Jayapal <ja...@apache.org>
Authored: Mon Feb 10 14:27:46 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Mon Feb 10 14:28:33 2014 +0530

----------------------------------------------------------------------
 .../api/command/user/firewall/CreatePortForwardingRuleCmd.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37c4015d/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
index 89dc077..de82377 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.user.firewall;
 
 import java.util.List;
 
+import com.cloud.utils.net.NetUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -334,7 +335,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
 
         Ip privateIp = getVmSecondaryIp();
         if (privateIp != null) {
-            if (!privateIp.isIp4()) {
+            if (!NetUtils.isValidIp(privateIp.toString())) {
                 throw new InvalidParameterValueException("Invalid vm ip address");
             }
         }