Changeset 58e8646 in mainline for uspace/srv/net/udp

Timestamp:

2017-08-23T18:37:21Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

258d77e

Parents:

853802e

Message:

Fix DNS resolution not working due to missing local address.

Location:

uspace/srv/net/udp

Files:

• assoc.c (modified) (2 diffs)
• service.c (modified) (3 diffs)
• udp_type.h (modified) (2 diffs)

uspace/srv/net/udp/assoc.c

@@ -40 +40 @@
 #include <fibril_synch.h>
 #include <inet/endpoint.h>
+#include <inet/inet.h>
 #include <io/log.h>
 #include <nettl/amap.h>
@@ -261 +262 @@
                 return EINVAL;
 
+        /* This association has no local address set. Need to determine one. */
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send - check no local addr");
+        if (inet_addr_is_any(&epp.local.addr) && !assoc->nolocal) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Determine local address.");
+                rc = inet_get_srcaddr(&epp.remote.addr, 0, &epp.local.addr);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Cannot determine "
+                            "local address.");
+                        return EINVAL;
+                }
+        }
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send - check version");
 
-        if (epp.remote.addr.version != epp.local.addr.version)
+        if (!inet_addr_is_any(&epp.local.addr) &&
+            epp.remote.addr.version != epp.local.addr.version)
                 return EINVAL;
 

uspace/srv/net/udp/service.c

@@ -270 +270 @@
 }
 
+/** Set association sending messages with no local address.
+ *
+ * Handle client request to set nolocal flag (with parameters unmarshalled).
+ *
+ * @param client   UDP client
+ * @param assoc_id Association ID
+ * @return EOK on success, ENOENT if no such association is found
+ */
+static int udp_assoc_set_nolocal_impl(udp_client_t *client, sysarg_t assoc_id)
+{
+        udp_cassoc_t *cassoc;
+        int rc;
+
+        rc = udp_cassoc_get(client, assoc_id, &cassoc);
+        if (rc != EOK) {
+                assert(rc == ENOENT);
+                return ENOENT;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Setting nolocal to true");
+        cassoc->assoc->nolocal = true;
+        return EOK;
+}
+
 /** Send message via association.
  *
@@ -391 +415 @@
         assoc_id = IPC_GET_ARG1(*icall);
         rc = udp_assoc_destroy_impl(client, assoc_id);
+        async_answer_0(iid, rc);
+}
+
+/** Set association with no local address.
+ *
+ * Handle client request to set no local address flag.
+ *
+ * @param client   UDP client
+ * @param iid      Async request ID
+ * @param icall    Async request data
+ */
+static void udp_assoc_set_nolocal_srv(udp_client_t *client, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        sysarg_t assoc_id;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_set_nolocal_srv()");
+
+        assoc_id = IPC_GET_ARG1(*icall);
+        rc = udp_assoc_set_nolocal_impl(client, assoc_id);
         async_answer_0(iid, rc);
 }
@@ -662 +707 @@
                         udp_assoc_destroy_srv(&client, callid, &call);
                         break;
+                case UDP_ASSOC_SET_NOLOCAL:
+                        udp_assoc_set_nolocal_srv(&client, callid, &call);
+                        break;
                 case UDP_ASSOC_SEND_MSG:
                         udp_assoc_send_msg_srv(&client, callid, &call);

uspace/srv/net/udp/udp_type.h

@@ -41 +41 @@
 #include <inet/endpoint.h>
 #include <ipc/loc.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <inet/addr.h>
@@ -119 +120 @@
         /** Receive queue CV. Broadcast when new datagram is inserted */
         fibril_condvar_t rcv_queue_cv;
+        /** Allow sending messages with no local address */
+        bool nolocal;
 
         udp_assoc_cb_t *cb;