etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

S2S VPN: Use coma instead of semicolon for separating cidr list

This commit is contained in:
Sheng Yang 2012-08-08 10:35:26 -07:00
parent deb7ffa031
commit 685af150bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
View File

@ -1144,7 +1144,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().replace(";", ",");
String peerGuestCidrList = gw.getGuestCidrList();
String ipsecPsk = gw.getIpsecPsk();
String ikePolicy = gw.getIkePolicy();
String espPolicy = gw.getEspPolicy();

2
utils/src/com/cloud/utils/net/NetUtils.java
View File

@ -1137,7 +1137,7 @@ public class NetUtils {
}
public static boolean validateGuestCidrList(String guestCidrList) {
for (String guestCidr : guestCidrList.split(";")) {
for (String guestCidr : guestCidrList.split(",")) {
if (!validateGuestCidr(guestCidr)) {
return false;
}