aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/prim_inet.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-07-24 16:47:09 +0200
committerHenrik Nord <[email protected]>2014-07-24 17:01:04 +0200
commit1b9383a8dbc03473860dfaacc7a02fbc8b1b1185 (patch)
tree56644c102684173987031696796a66292836eaab /erts/preloaded/src/prim_inet.erl
parentb97b17d3e5355d503df5ed2f553767b73ac66903 (diff)
parent65e335e255cb76d979f605ed34700e4e02041139 (diff)
downloadotp-1b9383a8dbc03473860dfaacc7a02fbc8b1b1185.tar.gz
otp-1b9383a8dbc03473860dfaacc7a02fbc8b1b1185.tar.bz2
otp-1b9383a8dbc03473860dfaacc7a02fbc8b1b1185.zip
Merge branch 'maint-r16' into maint
Conflicts: erts/doc/src/notes.xml erts/preloaded/ebin/prim_inet.beam erts/vsn.mk lib/kernel/doc/src/notes.xml lib/kernel/vsn.mk
Diffstat (limited to 'erts/preloaded/src/prim_inet.erl')
-rw-r--r--erts/preloaded/src/prim_inet.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl
index 143c718130..79ff013c77 100644
--- a/erts/preloaded/src/prim_inet.erl
+++ b/erts/preloaded/src/prim_inet.erl
@@ -25,7 +25,7 @@
%% Primitive inet_drv interface
--export([open/3, open/4, fdopen/4, close/1]).
+-export([open/3, open/4, fdopen/4, fdopen/5, close/1]).
-export([bind/3, listen/1, listen/2, peeloff/2]).
-export([connect/3, connect/4, async_connect/4]).
-export([accept/1, accept/2, async_accept/2]).
@@ -70,7 +70,12 @@ open(Protocol, Family, Type, Opts) ->
open(Protocol, Family, Type, Opts, ?INET_REQ_OPEN, []).
fdopen(Protocol, Family, Type, Fd) when is_integer(Fd) ->
- open(Protocol, Family, Type, [], ?INET_REQ_FDOPEN, ?int32(Fd)).
+ fdopen(Protocol, Family, Type, Fd, true).
+
+fdopen(Protocol, Family, Type, Fd, Bound)
+ when is_integer(Fd), Bound == true orelse Bound == false ->
+ open(Protocol, Family, Type, [], ?INET_REQ_FDOPEN,
+ [?int32(Fd), enc_value_2(bool, Bound)]).
open(Protocol, Family, Type, Opts, Req, Data) ->
Drv = protocol2drv(Protocol),