Changeset 0773396 in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/udp/sock.c (modified) (5 diffs)

uspace/srv/net/udp/sock.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Lukas Mejdrech
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -349 +349 @@
         fibril_mutex_lock(&socket->lock);
         
-        if (inet_addr_is_any(&socket->assoc->ident.local.addr)) {
+        if (inet_addr_is_any(&socket->assoc->ident.local.addr) &&
+                socket->assoc->ident.iplink == 0) {
                 /* Determine local IP address */
                 inet_addr_t loc_addr;
@@ -665 +666 @@
 static void udp_sock_setsockopt(udp_client_t *client, ipc_callid_t callid, ipc_call_t call)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_setsockopt()");
-        async_answer_0(callid, ENOTSUP);
-}
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_setsockopt)");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, " - async_data_write_accept");
+        
+        void *data = NULL;
+        size_t data_len;
+        int rc = async_data_write_accept(&data, false, 0, 0, 0, &data_len);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - failed accepting data");
+                async_answer_0(callid, rc);
+                return;
+        }
+        
+        sysarg_t opt_level = SOL_SOCKET;
+        sysarg_t opt_name = SOCKET_GET_OPT_NAME(call);
+        
+        if (opt_level != SOL_SOCKET || opt_name != SO_IPLINK ||
+            data_len != sizeof(service_id_t)) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - failed opt_level/name/len");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - failed opt_level=%d, "
+                    "opt_name=%d, data_len=%zu", (int)opt_level, (int)opt_name,
+                    data_len);
+                async_answer_0(callid, EINVAL);
+                return;
+        }
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find");
+        
+        socket_core_t *sock_core = socket_cores_find(&client->sockets,
+            SOCKET_GET_SOCKET_ID(call));
+        if (sock_core == NULL) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - failed getting sock_core");
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        udp_sockdata_t *socket =
+            (udp_sockdata_t *) sock_core->specific_data;
+        
+        service_id_t iplink = *(service_id_t *)data;
+        udp_uc_set_iplink(socket->assoc, iplink);
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG, " - success");
+        async_answer_0(callid, EOK);
+}
+
 
 static int udp_sock_recv_fibril(void *arg)
@@ -714 +757 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril() exited loop");
-        fibril_mutex_unlock(&sock->recv_buffer_lock);
         udp_uc_destroy(sock->assoc);
 
@@ -730 +772 @@
         /* Accept the connection */
         async_answer_0(iid, EOK);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_connection: begin");
 
         client.sess = async_callback_receive(EXCHANGE_SERIALIZE);