Changeset 4e716180 in mainline for uspace/srv/net

Timestamp:

2013-05-03T21:14:39Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

716357f

Parents:

1c7ba2da (diff), 5d1cb8a (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 simple DNS resolver.

Location:

uspace/srv/net

Files:

• dnsrsrv/Makefile (added)
• dnsrsrv/dns_msg.c (added)
• dnsrsrv/dns_msg.h (added)
• dnsrsrv/dns_std.h (added)
• dnsrsrv/dns_type.h (added)
• dnsrsrv/dnsrsrv.c (added)
• dnsrsrv/query.c (added)
• dnsrsrv/query.h (added)
• dnsrsrv/transport.c (added)
• dnsrsrv/transport.h (added)
• inetsrv/addrobj.c (modified) (1 diff)
• inetsrv/inetsrv.c (modified) (1 diff)
• udp/assoc.c (modified) (2 diffs)
• udp/assoc.h (modified) (1 diff)
• udp/sock.c (modified) (2 diffs)
• udp/ucall.c (modified) (2 diffs)
• udp/ucall.h (modified) (1 diff)
• udp/udp_type.h (modified) (2 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -221 +221 @@
 
         lsrc_addr.ipv4 = addr->naddr.ipv4;
-        ldest_addr = &dgram->dest;
+        ldest_addr = ldest;
 
         return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest_addr, dgram,

uspace/srv/net/inetsrv/inetsrv.c

@@ -98 +98 @@
         }
         
-        rc = inet_link_discovery_start();
+        inet_sroute_t *sroute = inet_sroute_new();
+        if (sroute == NULL) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating default route (%d).", rc);
+                return ENOMEM;
+        }
+
+        sroute->dest.ipv4 = 0;
+        sroute->dest.bits = 0;
+        sroute->router.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 1;
+        sroute->name = str_dup("default");
+        inet_sroute_add(sroute);
+
+        rc = inet_link_discovery_start();
         if (rc != EOK)
                 return EEXIST;

uspace/srv/net/udp/assoc.c

@@ -279 +279 @@
 
         fibril_mutex_lock(&assoc->lock);
-        while (list_empty(&assoc->rcv_queue)) {
+        while (list_empty(&assoc->rcv_queue) && !assoc->reset) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - waiting");
                 fibril_condvar_wait(&assoc->rcv_queue_cv, &assoc->lock);
+        }
+
+        if (assoc->reset) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - association was reset");
+                fibril_mutex_unlock(&assoc->lock);
+                return ECONNABORTED;
         }
 
@@ -323 +329 @@
 }
 
+/** Reset association.
+ *
+ * This causes any pendingreceive operations to return immediately with
+ * UDP_ERESET.
+ */
+void udp_assoc_reset(udp_assoc_t *assoc)
+{
+        fibril_mutex_lock(&assoc->lock);
+        assoc->reset = true;
+        fibril_condvar_broadcast(&assoc->rcv_queue_cv);
+        fibril_mutex_unlock(&assoc->lock);
+}
+
 static int udp_assoc_queue_msg(udp_assoc_t *assoc, udp_sockpair_t *sp,
     udp_msg_t *msg)

uspace/srv/net/udp/assoc.h

@@ -51 +51 @@
 extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, udp_sock_t *);
 extern void udp_assoc_received(udp_sockpair_t *, udp_msg_t *);
-
+extern void udp_assoc_reset(udp_assoc_t *);
 
 #endif

uspace/srv/net/udp/sock.c

@@ -537 +537 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()");
         int socket_id = SOCKET_GET_SOCKET_ID(call);
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - find core");
         socket_core_t *sock_core =
             socket_cores_find(&client->sockets, socket_id);
         if (sock_core == NULL) {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - core not found");
                 async_answer_0(callid, ENOTSOCK);
                 return;
         }
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - spec data");
         udp_sockdata_t *socket =
             (udp_sockdata_t *) sock_core->specific_data;
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - lock socket");
         fibril_mutex_lock(&socket->lock);
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close() - lock socket buffer");
+        fibril_mutex_lock(&socket->recv_buffer_lock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_close - set socket->sock_core = NULL");
+        socket->sock_core = NULL;
+        fibril_mutex_unlock(&socket->recv_buffer_lock);
+
+        udp_uc_reset(socket->assoc);
+
         int rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             udp_free_sock_data);
         if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_close - socket_destroy failed");
                 fibril_mutex_unlock(&socket->lock);
                 async_answer_0(callid, rc);
                 return;
         }
-        
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_close - broadcast recv_buffer_cv");
+        fibril_condvar_broadcast(&socket->recv_buffer_cv);
+
         fibril_mutex_unlock(&socket->lock);
         async_answer_0(callid, EOK);
@@ -582 +598 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril()");
 
+        fibril_mutex_lock(&sock->recv_buffer_lock);
+
         while (true) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] wait for rcv buffer empty()");
-                fibril_mutex_lock(&sock->recv_buffer_lock);
-                while (sock->recv_buffer_used != 0) {
+                while (sock->recv_buffer_used != 0 && sock->sock_core != NULL) {
                         fibril_condvar_wait(&sock->recv_buffer_cv,
                             &sock->recv_buffer_lock);
                 }
-                
+
+                fibril_mutex_unlock(&sock->recv_buffer_lock);
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] call udp_uc_receive()");
                 urc = udp_uc_receive(sock->assoc, sock->recv_buffer,
                     UDP_FRAGMENT_SIZE, &rcvd, &xflags, &sock->recv_fsock);
+                fibril_mutex_lock(&sock->recv_buffer_lock);
                 sock->recv_error = urc;
-                
-                udp_sock_notify_data(sock->sock_core);
-                
+
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "[] udp_uc_receive -> %d", urc);
+
+                if (sock->sock_core != NULL)
+                        udp_sock_notify_data(sock->sock_core);
+
                 if (urc != UDP_EOK) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "[] urc != UDP_EOK, break");
                         fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                        fibril_mutex_unlock(&sock->recv_buffer_lock);
-                        break;
-                }
-                
+                        break;
+                }
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] got data - broadcast recv_buffer_cv");
-                
+
                 sock->recv_buffer_used = rcvd;
-                fibril_mutex_unlock(&sock->recv_buffer_lock);
                 fibril_condvar_broadcast(&sock->recv_buffer_cv);
         }
 
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril() exited loop");
+        fibril_mutex_unlock(&sock->recv_buffer_lock);
         udp_uc_destroy(sock->assoc);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril() terminated");
 
         return 0;

uspace/srv/net/udp/ucall.c

@@ -113 +113 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_receive()", assoc->name);
         rc = udp_assoc_recv(assoc, &msg, fsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv -> %d", rc);
         switch (rc) {
+        case EOK:
+                break;
+        case ECONNABORTED:
+                return UDP_ERESET;
+        default:
+                assert(false);
         }
 
@@ -133 +140 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_destroy()");
+        udp_assoc_reset(assoc);
         udp_assoc_remove(assoc);
         udp_assoc_delete(assoc);
+}
+
+void udp_uc_reset(udp_assoc_t *assoc)
+{
+        udp_assoc_reset(assoc);
 }
 

uspace/srv/net/udp/ucall.h

@@ -49 +49 @@
 extern void udp_uc_status(udp_assoc_t *, udp_assoc_status_t *);
 extern void udp_uc_destroy(udp_assoc_t *);
+extern void udp_uc_reset(udp_assoc_t *);
 
 #endif

uspace/srv/net/udp/udp_type.h

@@ -51 +51 @@
         UDP_EUNSPEC,
         /* No route to destination */
-        UDP_ENOROUTE
+        UDP_ENOROUTE,
+        /** Association reset by user */
+        UDP_ERESET
 } udp_error_t;
 
@@ -119 +121 @@
         udp_sockpair_t ident;
 
+        /** True if association was reset by user */
+        bool reset;
+
         /** True if association was deleted by user */
         bool deleted;