aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2010-07-07 11:47:07 +0200
committerRaimo Niskanen <[email protected]>2010-07-07 11:47:07 +0200
commit8af186a816f67077e637c6b78415221e7cc05bbe (patch)
treec1be04c64c46b45adb1acb99df94411b53156236 /erts
parent69764c865db61c0351be215f7f36947a71ef82f1 (diff)
parent2128fcef45951e159f05e5667841a7442acfa1be (diff)
downloadotp-8af186a816f67077e637c6b78415221e7cc05bbe.tar.gz
otp-8af186a816f67077e637c6b78415221e7cc05bbe.tar.bz2
otp-8af186a816f67077e637c6b78415221e7cc05bbe.zip
Merge branch 'rani/sctp-udp-recv-error' into dev
* rani/sctp-udp-recv-error: Fix inet_drv to detect passive mode UDP errors for SCTP builds
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 87691fc1bc..0ea54930ba 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -9333,11 +9333,13 @@ static int packet_inet_input(udp_descriptor* udesc, HANDLE event)
if (err != ERRNO_BLOCK) {
if (!desc->active) {
#ifdef HAVE_SCTP
- if (short_recv)
+ if (short_recv) {
async_error_am(desc, am_short_recv);
- else
-#else
+ } else {
async_error(desc, err);
+ }
+#else
+ async_error(desc, err);
#endif
driver_cancel_timer(desc->port);
sock_select(desc,FD_READ,0);