From 6aa9e71dbb279a172b5a2c86f28cbfada1b68080 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Tue, 29 Jan 2013 19:04:22 +0100 Subject: A stab at fixing bug with {exit_on_close,false} not working when invalid packets are received. --- erts/emulator/drivers/common/inet_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'erts/emulator/drivers/common/inet_drv.c') diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 8f4fff0f40..b9341b168d 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -8789,7 +8789,7 @@ static int tcp_recv_error(tcp_descriptor* desc, int err) if (desc->inet.exitf) driver_exit(desc->inet.port, err); else - desc_close(INETP(desc)); + desc_close_read(INETP(desc)); } return -1; } -- cgit v1.2.3 From a3c0a422f66b2e08f02333aa2dd441eebab56e2d Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Thu, 7 Feb 2013 15:22:11 +0100 Subject: inet_drv: Fix condition to reject INET_REQ_IGNOREFD for UDP and SCTP --- erts/emulator/drivers/common/inet_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'erts/emulator/drivers/common/inet_drv.c') diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index b9341b168d..f1211128bf 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -7833,7 +7833,7 @@ static ErlDrvSSizeT inet_ctl(inet_descriptor* desc, int cmd, char* buf, if (!IS_CONNECTED(desc)) return ctl_error(ENOTCONN, rbuf, rsize); - if (!desc->stype == SOCK_STREAM) + if (desc->stype != SOCK_STREAM) return ctl_error(EINVAL, rbuf, rsize); if (*buf == 1 && !desc->is_ignored) { -- cgit v1.2.3