Merge pull request atomvm#589 from pguyot/w21/fix-gen_udp-packet-format

Fix format of gen_udp active packet on esp32 (fix atomvm#589)

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later

Author: bettio

src/platforms/esp32/components/avm_builtins/socket_driver.c

@@ -688,10 +688,16 @@ static NativeHandlerResult do_receive_data(Context *ctx)
 
 
     if (socket_data->active) {
-        term active_tuple = term_alloc_tuple(3, &ctx->heap);
+        term active_tuple = term_alloc_tuple(socket_data->type == TCPClientSocket ? 3 : 5, &ctx->heap);
         term_put_tuple_element(active_tuple, 0, socket_data->type == TCPClientSocket ? TCP_ATOM : UDP_ATOM);
         term_put_tuple_element(active_tuple, 1, term_from_local_process_id(ctx->process_id));
-        term_put_tuple_element(active_tuple, 2, recv_term);
+        if (socket_data->type == TCPClientSocket) {
+            term_put_tuple_element(active_tuple, 2, recv_term);
+        } else {
+            term_put_tuple_element(active_tuple, 2, term_get_tuple_element(recv_term, 0));
+            term_put_tuple_element(active_tuple, 3, term_get_tuple_element(recv_term, 1));
+            term_put_tuple_element(active_tuple, 4, recv_data);
+        }
         globalcontext_send_message(ctx->global, socket_data->controlling_process_pid, active_tuple);
         TRACE("sent received to active process (pid=%d): ", socket_data->controlling_process_pid);
         #ifdef ENABLE_TRACE

src/platforms/esp32/test/main/test_erl_sources/test_socket.erl

@@ -155,12 +155,12 @@ test_udp(Active, QueryID) ->
                 ok =
                     receive
                         %               {udp, Socket, {{1,1,1,1}, 53, <<QueryID:16, 1:1, _:7, _/binary>>}} -> ok;    % not supported yet
-                        {udp, Socket, {{1, 1, 1, 1}, 53, <<QueryID:16, B, _/binary>>}} when
+                        {udp, Socket, {1, 1, 1, 1}, 53, <<QueryID:16, B, _/binary>>} when
                             B band 16#80 =:= 16#80
                         ->
                             ok;
-                        {udp, Socket, Packet} ->
-                            {unexpected_packet, Packet};
+                        {udp, Socket, Addr, Port, Packet} ->
+                            {unexpected_packet, Addr, Port, Packet};
                         UnexpectedAfterSend ->
                             {unexpected_message_after_send, UnexpectedAfterSend}
                     after 10000 ->