Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							2296dc4acc 
							
						 
					 
					
						
						
							
							bug CS-15942: Fixes port forwarding issue for redundant routers  
						
						 
						
						
						
						
					 
					
						2012-08-28 12:11:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4a1a39c1 
							
						 
					 
					
						
						
							
							Bug CS-15970: Fixes Redundant router status when host is XenServer  
						
						 
						
						
						
						
					 
					
						2012-08-28 12:07:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							b42a813ff1 
							
						 
					 
					
						
						
							
							bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh  
						
						 
						
						... 
						
						
						
						status CS-16112: resolved fixed
Conflicts:
	patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh 
						
						
					 
					
						2012-08-22 12:00:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							20ccb6c1cb 
							
						 
					 
					
						
						
							
							S2S VPN: CS-16092: Add ESP rule to iptables  
						
						 
						
						... 
						
						
						
						Otherwise the other end cannot initiate connection. 
						
						
					 
					
						2012-08-20 17:28:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							691be5c60e 
							
						 
					 
					
						
						
							
							bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic  
						
						 
						
						... 
						
						
						
						status CS-15577: resolved fixed 
						
						
					 
					
						2012-08-17 17:07:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Kinsella 
							
						 
					 
					
						
						
						
						
							
						
						
							6a41965b70 
							
						 
					 
					
						
						
							
							[ASFCS40] Updated version number to reflect 4.0.0  
						
						 
						
						
						
						
					 
					
						2012-08-14 22:54:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e7efd0d95b 
							
						 
					 
					
						
						
							
							S2S VPN: Don't consider VPN is down if IPsec SA still existed  
						
						 
						
						... 
						
						
						
						Because ISAKMP SA wouldn't be updated after expiration if IPsec SA is still in
affect. 
						
						
					 
					
						2012-08-10 16:20:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							435480cb5a 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15641: Enable UDP port 4500 for NAT-T  
						
						 
						
						
						
						
					 
					
						2012-08-06 17:15:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4908adb3a1 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15852: Add vpninmask for VPN network usage  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:32:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e7b4bc07b 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java 
						
						
					 
					
						2012-08-06 15:32:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							84a1a311f9 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15511: Add PFS support for VPN connection  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:27:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b5103c501 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:19:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9b43753399 
							
						 
					 
					
						
						
							
							VPC : handle Revoke rules for staticroute  
						
						 
						
						
						
						
					 
					
						2012-08-02 18:59:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0c9d5f5eb1 
							
						 
					 
					
						
						
							
							VPC : typo  
						
						 
						
						
						
						
					 
					
						2012-08-02 18:59:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7706a9c32f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-31 13:37:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f763f53c2d 
							
						 
					 
					
						
						
							
							CS-15680 : set broadcast IP  
						
						 
						
						
						
						
					 
					
						2012-07-30 13:24:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							3aae979967 
							
						 
					 
					
						
						
							
							CS-15708 : fix network cleanup  
						
						 
						
						
						
						
					 
					
						2012-07-30 13:24:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5d31b58c1b 
							
						 
					 
					
						
						
							
							Disable IPv6 in the systemvm  
						
						 
						
						
						
						
					 
					
						2012-07-30 15:17:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							dd50bdf38e 
							
						 
					 
					
						
						
							
							CS-15731: Make S2S VPN no-nat rule the top of POSTROUTING  
						
						 
						
						
						
						
					 
					
						2012-07-27 18:49:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8eee8f342e 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15650: Add connection status update to s2s vpn  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:28:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d5d6c9f5f4 
							
						 
					 
					
						
						
							
							VPC : this is default iptables for vpc route  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0369fa3101 
							
						 
					 
					
						
						
							
							VCP : for each network,  there will be a seperate config file deriving from this one  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							59937838e5 
							
						 
					 
					
						
						
							
							VPC : create/destroy static nat  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							ae579c4cdd 
							
						 
					 
					
						
						
							
							VPC : create/destroy static route  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0d52ac205b 
							
						 
					 
					
						
						
							
							VPC : create/destroy source NAT  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9910176d76 
							
						 
					 
					
						
						
							
							VPC : create/destroy private Gateway  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f7da1772b0 
							
						 
					 
					
						
						
							
							VPC : portforwarding script  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							952da87e19 
							
						 
					 
					
						
						
							
							VPC : basic network usage per guest network  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							744bfdce5f 
							
						 
					 
					
						
						
							
							VPC : vpc loadbalancer script  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc4231ea6 
							
						 
					 
					
						
						
							
							VPC : vpc ip assocate fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							165a21c62a 
							
						 
					 
					
						
						
							
							VPC : vpc_acl.sh is for VPC access control list  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							05dc92c02c 
							
						 
					 
					
						
						
							
							VPC : remove all rules for a plugged nic device  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							599dcb49d5 
							
						 
					 
					
						
						
							
							VPC : add vpc_func.sh  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5edb646be2 
							
						 
					 
					
						
						
							
							VPC : ipassoc.sh typo fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7fd73fc5ab 
							
						 
					 
					
						
						
							
							VPC : add vpc_guestnw.sh  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4d42845853 
							
						 
					 
					
						
						
							
							S2S VPN: Add back pfs=no for ipsec.conf  
						
						 
						
						... 
						
						
						
						According to ipsec.conf manual:
pfs
whether Perfect Forward Secrecy of keys is desired on the connection's keying
channel (with PFS, penetration of the key-exchange protocol does not compromise
keys negotiated earlier); Since there is no reason to ever refuse PFS, Openswan
will allow a connection defined with pfs=no to use PFS anyway. Acceptable values
are yes (the default) and no.
Found removing the option would make it impossible to work with no PFS setting
router. It may related to CS-15511. 
						
						
					 
					
						2012-07-23 19:35:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							27d82f683b 
							
						 
					 
					
						
						
							
							S2S VPN: Support for multiply VPN connections per VPC/VPN gateway  
						
						 
						
						
						
						
					 
					
						2012-07-23 19:03:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e2be7157 
							
						 
					 
					
						
						
							
							CS-15511: Fix parameter transfer in bash  
						
						 
						
						... 
						
						
						
						[Dropped Vmware support in this commit, due to lack of VMware support in VPC now]
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
						
						
					 
					
						2012-07-23 14:51:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d68e33323 
							
						 
					 
					
						
						
							
							S2S VPN: Use source NAT ip address for VPN gateway  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-07-23 14:44:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d855dff7c2 
							
						 
					 
					
						
						
							
							CS-6840: Fix wrong path of check s2s vpn script  
						
						 
						
						
						
						
					 
					
						2012-07-23 14:35:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f72c9198 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-07-23 10:36:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							67bc9c819a 
							
						 
					 
					
						
						
							
							fixing some more license headers  
						
						 
						
						
						
						
					 
					
						2012-07-20 15:59:31 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a1333649db 
							
						 
					 
					
						
						
							
							CS-15536: Insert VPN mangle policy to FORWARD and OUTPUT  
						
						 
						
						... 
						
						
						
						In order to get traffic tagged while ACL chain involved in PREROUTING chain.
Also using more generic tag checking in nat table. 
						
						
					 
					
						2012-07-17 17:23:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							353423acec 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-07-06 12:04:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							ecf2cd57f9 
							
						 
					 
					
						
						
							
							fixing license headers in marvin  
						
						 
						
						
						
						
					 
					
						2012-07-04 18:45:08 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d97af3abf 
							
						 
					 
					
						
						
							
							CS-6840: Add status checking for site 2 site VPN  
						
						 
						
						
						
						
					 
					
						2012-07-02 16:29:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9854336a 
							
						 
					 
					
						
						
							
							CS-6840: Update ipsectunnel.sh  
						
						 
						
						
						
						
					 
					
						2012-07-02 16:27:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Weise 
							
						 
					 
					
						
						
						
						
							
						
						
							df062f1fe8 
							
						 
					 
					
						
						
							
							CS-6840: Add ipsectunnel script  
						
						 
						
						
						
						
					 
					
						2012-07-02 16:27:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4707888363 
							
						 
					 
					
						
						
							
							VPC : revert dnsmasq.conf  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2deba9bd86 
							
						 
					 
					
						
						
							
							VPC : add vpc_vpn_l2tp.sh  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:32:56 -07:00