Updated Branches: refs/heads/vpc c4eadf301 -> 2641b5d6b
S2S VPN: Fix multiply remote side guest networks Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2641b5d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2641b5d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2641b5d6 Branch: refs/heads/vpc Commit: 2641b5d6b83111a54f6ec2d28218267808b34125 Parents: c4eadf3 Author: Sheng Yang <[email protected]> Authored: Tue Aug 7 18:34:06 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Tue Aug 7 18:39:45 2012 -0700 ---------------------------------------------------------------------- .../VpcVirtualNetworkApplianceManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2641b5d6/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 23faa58..761b138 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -1092,7 +1092,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian String localGuestCidr = vpc.getCidr(); String localPublicGateway = _vlanDao.findById(ip.getVlanId()).getVlanGateway(); String peerGatewayIp = gw.getGatewayIp(); - String peerGuestCidrList = gw.getGuestCidrList(); + String peerGuestCidrList = gw.getGuestCidrList().replace(";", ","); String ipsecPsk = gw.getIpsecPsk(); String ikePolicy = gw.getIkePolicy(); String espPolicy = gw.getEspPolicy();
