haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge pull request #4616 from crypt1d/master" 

This reverts commit aec69c4627, reversing
changes made to 88754d2904.
This commit is contained in:
Mitchell Hashimoto 2014-10-23 09:30:46 -07:00
parent aec69c4627
commit a6c0989bc6
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
View File

@ -92,7 +92,6 @@ module Vagrant
with_forwarded_ports(env) do |options| with_forwarded_ports(env) do |options|
guest_port = options[:guest] guest_port = options[:guest]
host_port = options[:host] host_port = options[:host]
host_ip = options[:host_ip]
if options[:protocol] && options[:protocol] != "tcp" if options[:protocol] && options[:protocol] != "tcp"
@logger.debug("Skipping #{host_port} because UDP protocol.") @logger.debug("Skipping #{host_port} because UDP protocol.")
@ -106,8 +105,8 @@ module Vagrant
end end
# If the port is open (listening for TCP connections) # If the port is open (listening for TCP connections)
in_use = extra_in_use.include?([host_ip,host_port]) || in_use = extra_in_use.include?(host_port) ||
port_checker[host_ip,host_port] || port_checker[host_port] ||
lease_check(host_port) lease_check(host_port)
if in_use if in_use
if !repair || !options[:auto_correct] if !repair || !options[:auto_correct]
@ -206,8 +205,8 @@ module Vagrant
end end
end end
def port_check(host="127.0.0.1",port) def port_check(port)
is_port_open?(host, port) is_port_open?("127.0.0.1", port)
end end
def with_forwarded_ports(env) def with_forwarded_ports(env)

2
plugins/providers/virtualbox/action/prepare_forwarded_port_collision_params.rb
View File

@ -14,7 +14,7 @@ module VagrantPlugins
# Build the remap for any existing collision detections # Build the remap for any existing collision detections
remap = {} remap = {}
env[:port_collision_remap] = remap env[:port_collision_remap] = remap
env[:machine].provider.driver.read_forwarded_ports.each do |_nic, name, hostaddr, hostport, _guestport| env[:machine].provider.driver.read_forwarded_ports.each do |_nic, name, hostport, _guestport|
env[:machine].config.vm.networks.each do |type, options| env[:machine].config.vm.networks.each do |type, options|
next if type != :forwarded_port next if type != :forwarded_port

13
plugins/providers/virtualbox/driver/version_4_3.rb
View File

@ -18,7 +18,7 @@ module VagrantPlugins
def clear_forwarded_ports def clear_forwarded_ports
args = [] args = []
read_forwarded_ports(@uuid).each do |nic, name, _, _, _| read_forwarded_ports(@uuid).each do |nic, name, _, _|
args.concat(["--natpf#{nic}", "delete", name]) args.concat(["--natpf#{nic}", "delete", name])
end end
@ -261,9 +261,8 @@ module VagrantPlugins
end end
# Parse out the forwarded port information # Parse out the forwarded port information
if line =~ /^Forwarding.+?="(.+?),.*?,.(.+?),(.+?),.*?,(.+?)"$/ if line =~ /^Forwarding.+?="(.+?),.+?,.*?,(.+?),.*?,(.+?)"$/
result = [current_nic, $1.to_s, $2.to_s, $3.to_i, $4.to_i] result = [current_nic, $1.to_s, $2.to_i, $3.to_i]
#[["nat", "ssh", "127.0.0.1", 2222, 22]]
@logger.debug(" - #{result.inspect}") @logger.debug(" - #{result.inspect}")
results << result results << result
end end
@ -456,8 +455,8 @@ module VagrantPlugins
# Ignore our own used ports # Ignore our own used ports
next if uuid == @uuid next if uuid == @uuid
read_forwarded_ports(uuid, true).each do |_, _, hostaddr, hostport, _| read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
ports << [hostaddr, hostport] ports << hostport
end end
end end
end end
@ -511,7 +510,7 @@ module VagrantPlugins
@logger.debug("Searching for SSH port: #{expected_port.inspect}") @logger.debug("Searching for SSH port: #{expected_port.inspect}")
# Look for the forwarded port only by comparing the guest port # Look for the forwarded port only by comparing the guest port
read_forwarded_ports.each do |_, _, _, hostport, guestport| read_forwarded_ports.each do |_, _, hostport, guestport|
return hostport if guestport == expected_port return hostport if guestport == expected_port
end end