Changeset b9be9b0 in mainline

Timestamp:

2022-03-04T09:11:58Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

af259da

Parents:

917324b

git-author:

Jiri Svoboda <jiri@…> (2022-03-03 18:11:14)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-04 09:11:58)

Message:

Fix handling of UDP default destination in udp_assoc_send_msg()

Fixes netecho failing to send any message.

Location:

uspace

Files:

• app/netecho/comm.c (modified) (2 diffs)
• lib/inet/src/udp.c (modified) (1 diff)
• srv/net/udp/assoc.c (modified) (2 diffs)
• srv/net/udp/test/assoc.c (modified) (4 diffs)

uspace/app/netecho/comm.c

@@ -52 +52 @@
 static udp_t *udp;
 static udp_assoc_t *assoc;
-static inet_ep_t remote;
 
 #define RECV_BUF_SIZE 1024
@@ -185 +184 @@
 errno_t comm_send(void *data, size_t size)
 {
-        errno_t rc = udp_assoc_send_msg(assoc, &remote, data, size);
+        errno_t rc = udp_assoc_send_msg(assoc, NULL, data, size);
         if (rc != EOK)
                 return EIO;

uspace/lib/inet/src/udp.c

@@ -256 +256 @@
 {
         async_exch_t *exch;
+        inet_ep_t ddest;
 
         exch = async_exchange_begin(assoc->udp->sess);
         aid_t req = async_send_1(exch, UDP_ASSOC_SEND_MSG, assoc->id, NULL);
+
+        /* If dest is null, use default destination */
+        if (dest == NULL) {
+                inet_ep_init(&ddest);
+                dest = &ddest;
+        }
 
         errno_t rc = async_data_write_start(exch, (void *)dest,

uspace/srv/net/udp/assoc.c

@@ -243 +243 @@
  *
  * @param assoc         Association
- * @param remote        Remote endpoint or NULL not to override @a assoc
+ * @param remote        Remote endpoint or inet_addr_any/inet_port_any
+ *                      not to override association's remote endpoint
  * @param msg           Message
  *
@@ -261 +262 @@
         /* @a remote can be used to override the remote endpoint */
         epp = assoc->ident;
-        if (remote != NULL)
+        if (!inet_addr_is_any(&remote->addr) &&
+            remote->port != inet_port_any)
                 epp.remote = *remote;
 

uspace/srv/net/udp/test/assoc.c

@@ -250 +250 @@
 }
 
-/** Sending message with destination set in association and NULL destination
- * argument
+/** Sending message with destination set in association and inet_addr_any /
+ * inet_port_any destination argument
  */
-PCUT_TEST(send_assoc_null_dest)
-{
-        udp_assoc_t *assoc;
-        inet_ep2_t epp;
+PCUT_TEST(send_assoc_any_dest)
+{
+        udp_assoc_t *assoc;
+        inet_ep2_t epp;
+        inet_ep_t ep;
         errno_t rc;
         udp_msg_t *msg;
@@ -272 +273 @@
         epp.local.port = 1;
 
+        inet_ep_init(&ep);
+
         assoc = udp_assoc_new(&epp, &test_assoc_cb, NULL);
         PCUT_ASSERT_NOT_NULL(assoc);
@@ -281 +284 @@
         sent_msg = NULL;
 
-        rc = udp_assoc_send(assoc, NULL, msg);
+        rc = udp_assoc_send(assoc, &ep, msg);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_EQUALS(msg, sent_msg);
@@ -311 +314 @@
 
         inet_ep2_init(&epp);
-        inet_addr(&epp.remote.addr, 127, 0, 0, 1);
-        epp.remote.port = 42;
         inet_addr(&epp.local.addr, 127, 0, 0, 1);
         epp.local.port = 1;