diff options
author | Raimo Niskanen <raimo@erlang.org> | 2011-10-04 10:53:16 +0200 |
---|---|---|
committer | Raimo Niskanen <raimo@erlang.org> | 2011-10-04 10:53:16 +0200 |
commit | fe70b621ae06e79549b448ddbd6a6b3d866a58f4 (patch) | |
tree | f8ebeb8b10dbc9bf03ae71cc4c01872a9138c4f0 /erts | |
parent | e46c9a0c949b9961f3d6942537c800e486e101e9 (diff) | |
parent | f8b20b4a995727f0339074d23a0fae50712683d2 (diff) | |
download | otp-fe70b621ae06e79549b448ddbd6a6b3d866a58f4.tar.gz otp-fe70b621ae06e79549b448ddbd6a6b3d866a58f4.tar.bz2 otp-fe70b621ae06e79549b448ddbd6a6b3d866a58f4.zip |
Merge branch 'maint-r13' into maint-r14
Conflicts:
erts/doc/src/notes.xml
erts/emulator/drivers/common/inet_drv.c
erts/vsn.mk
lib/kernel/test/gen_sctp_SUITE.erl
Diffstat (limited to 'erts')
-rw-r--r-- | erts/doc/src/notes.xml | 18 | ||||
-rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 9 |
2 files changed, 22 insertions, 5 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 2e6aca2951..8637fedf09 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -1996,6 +1996,24 @@ </section> +<section><title>Erts 5.7.5.2</title> + + <section><title>Known Bugs and Problems</title> + <list> + <item> + <p> + Two bugs in gen_sctp has been corrected: getopts/setopts + hence also send could only be called from socket owner, + and options 'linger', 'rcvbuf' and 'sndbuf' was read from + wrong protocol layer hence read wrong values by getopts.</p> + <p> + Own Id: OTP-9544</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 5.7.5.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 40c4a0df08..a75cb6655c 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -6537,7 +6537,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen, struct linger lg; unsigned int sz = sizeof(lg); - if (sock_getopt(desc->s, IPPROTO_SCTP, SO_LINGER, + if (sock_getopt(desc->s, SOL_SOCKET, SO_LINGER, &lg, &sz) < 0) continue; /* Fill in the response: */ PLACE_FOR(spec, i, @@ -6573,7 +6573,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen, { case INET_OPT_RCVBUF : { - proto = IPPROTO_SCTP; + proto = SOL_SOCKET; type = SO_RCVBUF; is_int = 1; tag = am_recbuf; @@ -6581,7 +6581,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen, } case INET_OPT_SNDBUF : { - proto = IPPROTO_SCTP; + proto = SOL_SOCKET; type = SO_SNDBUF; is_int = 1; tag = am_sndbuf; @@ -7027,8 +7027,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen, i = LOAD_TUPLE(spec, i, 3); /* Now, convert "spec" into the returnable term: */ - /* desc->caller = 0; What does it mean? */ - driver_output_term(desc->port, spec, i); + driver_send_term(desc->port, driver_caller(desc->port), spec, i); FREE(spec); (*dest)[0] = INET_REP_SCTP; |