Changeset 4e716180 in mainline for uspace/app

Timestamp:

2013-05-03T21:14:39Z (13 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/app

Files:

• dnscfg/Makefile (added)
• dnscfg/dnscfg.c (added)
• dnsres/Makefile (added)
• dnsres/dnsres.c (added)
• init/init.c (modified) (1 diff)
• nettest1/nettest1.c (modified) (5 diffs)
• nettest2/nettest2.c (modified) (5 diffs)
• nettest3/nettest3.c (modified) (3 diffs)
• nterm/conn.c (modified) (5 diffs)
• nterm/nterm.c (modified) (1 diff)
• ping/ping.c (modified) (10 diffs)

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;
 }