michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: net: echo_client/_server: Fix bug in socket close

Browse source 
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 <magne.varnes@nordicsemi.no>
This commit is contained in:
Magne Værnes 2020-01-29 15:51:46 +01:00 • committed by Jukka Rissanen
commit e02eb4e511
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
samples/net/sockets/echo_client/src/udp.c
View file

@ -252,7 +252,7 @@ void stop_udp(void)
k_delayed_work_cancel(&conf.ipv6.udp.recv); k_delayed_work_cancel(&conf.ipv6.udp.recv);
k_delayed_work_cancel(&conf.ipv6.udp.transmit); 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); (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.recv);
k_delayed_work_cancel(&conf.ipv4.udp.transmit); 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); (void)close(conf.ipv4.udp.sock);
} }
} }

4
samples/net/sockets/echo_server/src/udp.c
View file

@ -202,14 +202,14 @@ void stop_udp(void)
*/ */
if (IS_ENABLED(CONFIG_NET_IPV6)) { if (IS_ENABLED(CONFIG_NET_IPV6)) {
k_thread_abort(udp6_thread_id); k_thread_abort(udp6_thread_id);
if (conf.ipv6.udp.sock > 0) { if (conf.ipv6.udp.sock >= 0) {
(void)close(conf.ipv6.udp.sock); (void)close(conf.ipv6.udp.sock);
} }
} }
if (IS_ENABLED(CONFIG_NET_IPV4)) { if (IS_ENABLED(CONFIG_NET_IPV4)) {
k_thread_abort(udp4_thread_id); k_thread_abort(udp4_thread_id);
if (conf.ipv4.udp.sock > 0) { if (conf.ipv4.udp.sock >= 0) {
(void)close(conf.ipv4.udp.sock); (void)close(conf.ipv4.udp.sock);
} }
} }