From 96166ec16526e8cbb3a18df478da68fe5d8208ee Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Apr 2017 00:30:17 +0300 Subject: [PATCH] zephyr/modusocket: socket_bind: Don't set recv callback on STREAM sockets. For stream sockets, next exected operation is listen(). --- zephyr/modusocket.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zephyr/modusocket.c b/zephyr/modusocket.c index 6dd257266a..7898f55766 100644 --- a/zephyr/modusocket.c +++ b/zephyr/modusocket.c @@ -224,8 +224,13 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) { parse_inet_addr(socket, addr_in, &sockaddr); RAISE_ERRNO(net_context_bind(socket->ctx, &sockaddr, sizeof(sockaddr))); - DEBUG_printf("Setting recv cb after bind\n"); - RAISE_ERRNO(net_context_recv(socket->ctx, sock_received_cb, K_NO_WAIT, socket)); + // For DGRAM socket, we expect to receive packets after call to bind(), + // but for STREAM socket, next expected operation is listen(), which + // doesn't work if recv callback is set. + if (net_context_get_type(socket->ctx) == SOCK_DGRAM) { + DEBUG_printf("Setting recv cb after bind\n"); + RAISE_ERRNO(net_context_recv(socket->ctx, sock_received_cb, K_NO_WAIT, socket)); + } return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);