From e02eb4e511a097ced01cb70f1762d9489d05bb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magne=20V=C3=A6rnes?= Date: Wed, 29 Jan 2020 15:51:46 +0100 Subject: [PATCH] samples: net: echo_client/_server: Fix bug in socket close MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed bug in udp.c in echo_client and echo_server samples. The bug causes UDP sockets to not close if socket id is 0. Signed-off-by: Magne Værnes --- samples/net/sockets/echo_client/src/udp.c | 4 ++-- samples/net/sockets/echo_server/src/udp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c index 3fb5b2bdd83..6daed428013 100644 --- a/samples/net/sockets/echo_client/src/udp.c +++ b/samples/net/sockets/echo_client/src/udp.c @@ -252,7 +252,7 @@ void stop_udp(void) k_delayed_work_cancel(&conf.ipv6.udp.recv); k_delayed_work_cancel(&conf.ipv6.udp.transmit); - if (conf.ipv6.udp.sock > 0) { + if (conf.ipv6.udp.sock >= 0) { (void)close(conf.ipv6.udp.sock); } } @@ -261,7 +261,7 @@ void stop_udp(void) k_delayed_work_cancel(&conf.ipv4.udp.recv); k_delayed_work_cancel(&conf.ipv4.udp.transmit); - if (conf.ipv4.udp.sock > 0) { + if (conf.ipv4.udp.sock >= 0) { (void)close(conf.ipv4.udp.sock); } } diff --git a/samples/net/sockets/echo_server/src/udp.c b/samples/net/sockets/echo_server/src/udp.c index 723673cab60..9e8e13d3325 100644 --- a/samples/net/sockets/echo_server/src/udp.c +++ b/samples/net/sockets/echo_server/src/udp.c @@ -202,14 +202,14 @@ void stop_udp(void) */ if (IS_ENABLED(CONFIG_NET_IPV6)) { k_thread_abort(udp6_thread_id); - if (conf.ipv6.udp.sock > 0) { + if (conf.ipv6.udp.sock >= 0) { (void)close(conf.ipv6.udp.sock); } } if (IS_ENABLED(CONFIG_NET_IPV4)) { k_thread_abort(udp4_thread_id); - if (conf.ipv4.udp.sock > 0) { + if (conf.ipv4.udp.sock >= 0) { (void)close(conf.ipv4.udp.sock); } }