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

Merge pull request #2059 from mlex/forward-tcp-and-udp-with-on-same-port-number 

core: allow port-forwarding of the same port number but with different protocols [GH-1108]
This commit is contained in:
Mitchell Hashimoto 2013-08-28 16:27:51 -07:00
parent f8610418f4 172a5dac5a
commit 44d65de076
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/kernel_v2/config/vm.rb
View File

@ -163,7 +163,7 @@ module VagrantPlugins
if type == :forwarded_port if type == :forwarded_port
# For forwarded ports, set the default ID to the # For forwarded ports, set the default ID to the
# host port so that host ports overwrite each other. # host port so that host ports overwrite each other.
default_id = options[:host] default_id = options[:host].to_s + (options[:protocol] || "tcp").to_s
end end
options[:id] = default_id || SecureRandom.uuid options[:id] = default_id || SecureRandom.uuid
@ -383,7 +383,7 @@ module VagrantPlugins
# Validate networks # Validate networks
has_fp_port_error = false has_fp_port_error = false
fp_host_ports = Set.new fp_host_ports_and_protocol = Set.new
valid_network_types = [:forwarded_port, :private_network, :public_network] valid_network_types = [:forwarded_port, :private_network, :public_network]
networks.each do |type, options| networks.each do |type, options|
@ -399,12 +399,12 @@ module VagrantPlugins
end end
if options[:host] if options[:host]
if fp_host_ports.include?(options[:host]) if fp_host_ports_and_protocol.include?(options[:host].to_s + (options[:protocol] || "tcp").to_s)
errors << I18n.t("vagrant.config.vm.network_fp_host_not_unique", errors << I18n.t("vagrant.config.vm.network_fp_host_not_unique",
:host => options[:host].to_s) :host => options[:host].to_s + (options[:protocol] || "tcp").to_s)
end end
fp_host_ports.add(options[:host]) fp_host_ports_and_protocol.add(options[:host].to_s + (options[:protocol] || "tcp").to_s)
end end
end end

3
plugins/providers/virtualbox/util/compile_forwarded_ports.rb
View File

@ -15,10 +15,11 @@ module VagrantPlugins
if type == :forwarded_port if type == :forwarded_port
guest_port = options[:guest] guest_port = options[:guest]
host_port = options[:host] host_port = options[:host]
protocol = options[:protocol] || "tcp"
options = scoped_hash_override(options, :virtualbox) options = scoped_hash_override(options, :virtualbox)
id = options[:id] id = options[:id]
mappings[host_port] = mappings[host_port.to_s + protocol.to_s] =
Model::ForwardedPort.new(id, host_port, guest_port, options) Model::ForwardedPort.new(id, host_port, guest_port, options)
end end
end end