aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/tftp/tftp_engine.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-10 09:15:10 +0200
committerIngela Anderton Andin <[email protected]>2015-09-10 09:15:10 +0200
commit9c349c08c72928da28af199e80ef37730e2f1917 (patch)
tree792ef382289845e8cccd912cdb47303a9ab3fa45 /lib/inets/src/tftp/tftp_engine.erl
parent962797287a5e7a93713a0ce9d60cdc92098ff772 (diff)
parent45f29845fea2fa036e03f0faf451ca98813b3112 (diff)
downloadotp-9c349c08c72928da28af199e80ef37730e2f1917.tar.gz
otp-9c349c08c72928da28af199e80ef37730e2f1917.tar.bz2
otp-9c349c08c72928da28af199e80ef37730e2f1917.zip
Merge branch 'maint'
Diffstat (limited to 'lib/inets/src/tftp/tftp_engine.erl')
-rw-r--r--lib/inets/src/tftp/tftp_engine.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/inets/src/tftp/tftp_engine.erl b/lib/inets/src/tftp/tftp_engine.erl
index fa44cd61ce..d0510e795b 100644
--- a/lib/inets/src/tftp/tftp_engine.erl
+++ b/lib/inets/src/tftp/tftp_engine.erl
@@ -128,8 +128,8 @@ daemon_start(Options) when is_list(Options) ->
daemon_init(Config) when is_record(Config, config),
is_pid(Config#config.parent_pid) ->
process_flag(trap_exit, true),
- UdpOptions = prepare_daemon_udp(Config),
- case catch gen_udp:open(Config#config.udp_port, UdpOptions) of
+ {Port, UdpOptions} = prepare_daemon_udp(Config),
+ case catch gen_udp:open(Port, UdpOptions) of
{ok, Socket} ->
{ok, ActualPort} = inet:port(Socket),
proc_lib:init_ack({ok, self()}),
@@ -157,7 +157,7 @@ prepare_daemon_udp(#config{udp_port = Port, udp_options = UdpOptions} = Config)
case lists:keymember(fd, 1, UdpOptions) of
true ->
%% Use explicit fd
- UdpOptions;
+ {Port, UdpOptions};
false ->
%% Use fd from setuid_socket_wrap, such as -tftpd_69
InitArg = list_to_atom("tftpd_" ++ integer_to_list(Port)),
@@ -165,7 +165,7 @@ prepare_daemon_udp(#config{udp_port = Port, udp_options = UdpOptions} = Config)
{ok, [[FdStr]] = Badarg} when is_list(FdStr) ->
case catch list_to_integer(FdStr) of
Fd when is_integer(Fd) ->
- [{fd, Fd} | UdpOptions];
+ {0, [{fd, Fd} | lists:keydelete(ip, 1, UdpOptions)]};
{'EXIT', _} ->
Text = lists:flatten(io_lib:format("Illegal prebound fd ~p: ~p", [InitArg, Badarg])),
print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
@@ -176,7 +176,7 @@ prepare_daemon_udp(#config{udp_port = Port, udp_options = UdpOptions} = Config)
print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
exit({badarg, {prebound_fd, InitArg, Badarg}});
error ->
- UdpOptions
+ {Port, UdpOptions}
end
end.