aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/inet.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-03-19 16:25:39 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-03-19 16:25:39 +0100
commit68ba8d70deb1549dd37a8325eea686c9908f926b (patch)
tree50fbabbf3cb2a52b10fc9a629195baf22b8d17ca /lib/kernel/src/inet.erl
parent662e3ffeed74d9121315d86af46430dd71e01709 (diff)
parent65ba37d1371f36a1666a53c57ac42c73692b8096 (diff)
downloadotp-68ba8d70deb1549dd37a8325eea686c9908f926b.tar.gz
otp-68ba8d70deb1549dd37a8325eea686c9908f926b.tar.bz2
otp-68ba8d70deb1549dd37a8325eea686c9908f926b.zip
Merge branch 'ph/fix-enfile/OTP-9990' into maint
* ph/fix-enfile/OTP-9990: Update preloaded prim_inet.beam gen_tcp: Use correct specs for accept and listen prim_inet: Catch system_limit in open_port Fix returned error from gen_tcp:accept/1,2 when running out of ports
Diffstat (limited to 'lib/kernel/src/inet.erl')
-rw-r--r--lib/kernel/src/inet.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 49f64a9236..4de3c1c6b1 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1218,11 +1218,13 @@ port_list(Name) ->
%% utils
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec format_error(Posix) -> string() when
- Posix :: posix().
+-spec format_error(Reason) -> string() when
+ Reason :: posix() | system_limit.
format_error(exbadport) -> "invalid port state";
format_error(exbadseq) -> "bad command sequence";
+format_error(system_limit) ->
+ "a system limit was hit, probably not enough ports";
format_error(Tag) ->
erl_posix_msg:message(Tag).