Changeset 4e716180 in mainline

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:

1c7ba2d (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.

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/dnscfg/Makefile (added)
• uspace/app/dnscfg/dnscfg.c (added)
• uspace/app/dnsres/Makefile (added)
• uspace/app/dnsres/dnsres.c (added)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/app/nettest1/nettest1.c (modified) (5 diffs)
• uspace/app/nettest2/nettest2.c (modified) (5 diffs)
• uspace/app/nettest3/nettest3.c (modified) (3 diffs)
• uspace/app/nterm/conn.c (modified) (5 diffs)
• uspace/app/nterm/nterm.c (modified) (1 diff)
• uspace/app/ping/ping.c (modified) (10 diffs)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/dnsr.c (added)
• uspace/lib/c/include/inet/dnsr.h (added)
• uspace/lib/c/include/ipc/dnsr.h (added)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/srv/net/dnsrsrv/Makefile (added)
• uspace/srv/net/dnsrsrv/dns_msg.c (added)
• uspace/srv/net/dnsrsrv/dns_msg.h (added)
• uspace/srv/net/dnsrsrv/dns_std.h (added)
• uspace/srv/net/dnsrsrv/dns_type.h (added)
• uspace/srv/net/dnsrsrv/dnsrsrv.c (added)
• uspace/srv/net/dnsrsrv/query.c (added)
• uspace/srv/net/dnsrsrv/query.h (added)
• uspace/srv/net/dnsrsrv/transport.c (added)
• uspace/srv/net/dnsrsrv/transport.h (added)
• uspace/srv/net/inetsrv/addrobj.c (modified) (1 diff)
• uspace/srv/net/inetsrv/inetsrv.c (modified) (1 diff)
• uspace/srv/net/udp/assoc.c (modified) (2 diffs)
• uspace/srv/net/udp/assoc.h (modified) (1 diff)
• uspace/srv/net/udp/sock.c (modified) (2 diffs)
• uspace/srv/net/udp/ucall.c (modified) (2 diffs)
• uspace/srv/net/udp/ucall.h (modified) (1 diff)
• uspace/srv/net/udp/udp_type.h (modified) (2 diffs)

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
+        $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
@@ -165 +166 @@
         $(USPACE_PATH)/app/dltest2/dltest2 \
         $(USPACE_PATH)/app/dload/dload \
+        $(USPACE_PATH)/app/dnscfg/dnscfg \
+        $(USPACE_PATH)/app/dnsres/dnsres \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/inet/inet \

uspace/Makefile

@@ -39 +39 @@
         app/bnchmark \
         app/devctl \
+        app/dnscfg \
+        app/dnsres \
         app/edit \
         app/getterm \
@@ -82 +84 @@
         srv/devman \
         srv/loader \
+        srv/net/dnsrsrv \
         srv/net/ethip \
         srv/net/inetsrv \

uspace/app/init/init.c

@@ -359 +359 @@
         srv_start("/srv/tcp");
         srv_start("/srv/udp");
+        srv_start("/srv/dnsrsrv");
         
         srv_start("/srv/clipboard");

uspace/app/nettest1/nettest1.c

@@ -46 +46 @@
 #include <arg_parse.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -75 +76 @@
         printf(
             "Network Networking test 1 aplication - sockets\n"
-            "Usage: echo [options] numeric_address\n"
+            "Usage: nettest1 [options] host\n"
             "Where options are:\n"
             "-f protocol_family | --family=protocol_family\n"
@@ -290 +291 @@
         struct sockaddr_in address_in;
         struct sockaddr_in6 address_in6;
+        dnsr_hostinfo_t *hinfo;
         uint8_t *address_start;
 
@@ -319 +321 @@
         }
 
-        /* If not before the last argument containing the address */
+        /* If not before the last argument containing the host */
         if (index >= argc) {
-                printf("Command line error: missing address\n");
+                printf("Command line error: missing host name\n");
                 nettest1_print_help();
                 return EINVAL;
@@ -348 +350 @@
         }
 
-        /* Parse the last argument which should contain the address */
+        /* Parse the last argument which should contain the host/address */
         rc = inet_pton(family, argv[argc - 1], address_start);
         if (rc != EOK) {
-                fprintf(stderr, "Address parse error %d\n", rc);
-                return rc;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argc - 1], &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", argv[argc - 1]);
+                        return rc;
+                }
+
+                address_in.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 

uspace/app/nettest2/nettest2.c

@@ -47 +47 @@
 #include <stdbool.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -71 +72 @@
         printf(
             "Network Networking test 2 aplication - UDP transfer\n"
-            "Usage: echo [options] address\n"
+            "Usage: nettest2 [options] host\n"
             "Where options are:\n"
             "-f protocol_family | --family=protocol_family\n"
@@ -227 +228 @@
         struct sockaddr_in address_in;
         struct sockaddr_in6 address_in6;
+        dnsr_hostinfo_t *hinfo;
         socklen_t addrlen;
         uint8_t *address_start;
@@ -265 +267 @@
         }
 
-        /* If not before the last argument containing the address */
+        /* If not before the last argument containing the host */
         if (index >= argc) {
-                printf("Command line error: missing address\n");
+                printf("Command line error: missing host name\n");
                 nettest2_print_help();
                 return EINVAL;
@@ -294 +296 @@
         }
 
-        /* Parse the last argument which should contain the address. */
+        /* Parse the last argument which should contain the host/address */
         rc = inet_pton(family, argv[argc - 1], address_start);
         if (rc != EOK) {
-                fprintf(stderr, "Address parse error %d\n", rc);
-                return rc;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argc - 1], &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", argv[argc - 1]);
+                        return rc;
+                }
+
+                address_in.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 

uspace/app/nettest3/nettest3.c

@@ -39 +39 @@
 #include <str.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -60 +61 @@
         int fd;
         char *endptr;
+        dnsr_hostinfo_t *hinfo;
 
         port = 7;
@@ -75 +77 @@
                 rc = inet_pton(AF_INET, argv[1], (uint8_t *)&addr.sin_addr.s_addr);
                 if (rc != EOK) {
-                        fprintf(stderr, "Error parsing address\n");
-                        return 1;
+                        /* Try interpreting as a host name */
+                        rc = dnsr_name2host(argv[1], &hinfo);
+                        if (rc != EOK) {
+                                printf("Error resolving host '%s'.\n", argv[1]);
+                                return rc;
+                        }
+
+                        addr.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
+                        addr.sin_family = AF_INET;
                 }
                 printf("result: rc=%d, family=%d, addr=%x\n", rc,

uspace/app/nterm/conn.c

@@ -33 +33 @@
  */
 
+#include <byteorder.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <fibril.h>
+#include <inet/dnsr.h>
 #include <net/socket.h>
 #include <stdio.h>
@@ -74 +76 @@
 {
         struct sockaddr_in addr;
+        dnsr_hostinfo_t *hinfo = NULL;
         int rc;
         char *endptr;
@@ -81 +84 @@
         rc = inet_pton(addr.sin_family, addr_s, (uint8_t *)&addr.sin_addr);
         if (rc != EOK) {
-                printf("Invalid addres %s\n", addr_s);
-                return EINVAL;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(addr_s, &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", addr_s);
+                        goto error;
+                }
+
+                addr.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 
@@ -88 +97 @@
         if (*endptr != '\0') {
                 printf("Invalid port number %s\n", port_s);
-                return EINVAL;
+                goto error;
         }
 
@@ -95 +104 @@
                 goto error;
 
-        printf("Connecting to address %s port %u\n", addr_s, ntohs(addr.sin_port));
+        printf("Connecting to host %s port %u\n", addr_s, ntohs(addr.sin_port));
 
         rc = connect(conn_fd, (struct sockaddr *)&addr, sizeof(addr));

uspace/app/nterm/nterm.c

@@ -104 +104 @@
 static void print_syntax(void)
 {
-        printf("syntax: nterm <ip-address> <port>\n");
+        printf("syntax: nterm <host> <port>\n");
 }
 

uspace/app/ping/ping.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dnsr.h>
 #include <inet/addr.h>
 #include <inet/inetping.h>
@@ -69 +70 @@
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <addr>\n");
+        printf("syntax: " NAME " [-r] <host>\n");
 }
 
@@ -173 +174 @@
 int main(int argc, char *argv[])
 {
+        dnsr_hostinfo_t *hinfo = NULL;
+        char *asrc = NULL;
+        char *adest = NULL;
+        char *sdest = NULL;
         int rc;
         int argi;
@@ -180 +185 @@
                 printf(NAME ": Failed connecting to internet ping service "
                     "(%d).\n", rc);
-                return 1;
+                goto error;
         }
 
@@ -193 +198 @@
         if (argc - argi != 1) {
                 print_syntax();
-                return 1;
+                goto error;
         }
 
@@ -199 +204 @@
         rc = inet_addr_parse(argv[argi], &dest_addr);
         if (rc != EOK) {
-                printf(NAME ": Invalid address format.\n");
-                print_syntax();
-                return 1;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argi], &hinfo);
+                if (rc != EOK) {
+                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
+                        goto error;
+                }
+
+                dest_addr = hinfo->addr;
         }
 
@@ -208 +218 @@
         if (rc != EOK) {
                 printf(NAME ": Failed determining source address.\n");
-                return 1;
-        }
+                goto error;
+        }
+
+        rc = inet_addr_format(&src_addr, &asrc);
+        if (rc != EOK) {
+                printf(NAME ": Out of memory.\n");
+                goto error;
+        }
+
+        rc = inet_addr_format(&dest_addr, &adest);
+        if (rc != EOK) {
+                printf(NAME ": Out of memory.\n");
+                goto error;
+        }
+
+        if (hinfo != NULL) {
+                rc = asprintf(&sdest, "%s (%s)", hinfo->name, adest);
+                if (rc < 0) {
+                        printf(NAME ": Out of memory.\n");
+                        goto error;
+                }
+        } else {
+                sdest = adest;
+                adest = NULL;
+        }
+
+        printf("Sending ICMP echo request from %s to %s.\n",
+            asrc, sdest);
 
         fid_t fid;
@@ -217 +253 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating transmit fibril.\n");
-                        return 1;
+                        goto error;
                 }
 
@@ -225 +261 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating input fibril.\n");
-                        return 1;
+                        goto error;
                 }
 
@@ -243 +279 @@
         if (rc == ETIMEOUT) {
                 printf(NAME ": Echo request timed out.\n");
-                return 1;
-        }
-
+                goto error;
+        }
+
+        free(asrc);
+        free(adest);
+        free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
         return 0;
+error:
+        free(asrc);
+        free(adest);
+        free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
+        return 1;
 }
 

uspace/lib/c/Makefile

@@ -74 +74 @@
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dnsr.c \
         generic/dlfcn.c \
         generic/elf/elf_load.c \

uspace/lib/c/include/ipc/services.h

@@ -53 +53 @@
 } services_t;
 
+#define SERVICE_NAME_DNSR     "net/dnsr"
 #define SERVICE_NAME_INET     "net/inet"
 #define SERVICE_NAME_INETCFG  "net/inetcfg"

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;