Changeset dff90fa7 in mainline for uspace/app/ping/ping.c

Timestamp:

2013-06-05T19:41:12Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

74dcc07

Parents:

f288d85 (diff), 6db5d4b (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:

mainline changes

File:

• uspace/app/ping/ping.c (modified) (13 diffs)

uspace/app/ping/ping.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dnsr.h>
+#include <inet/addr.h>
 #include <inet/inetping.h>
 #include <io/console.h>
@@ -68 +70 @@
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <addr>\n");
-}
-
-static int addr_parse(const char *text, inet_addr_t *addr)
-{
-        unsigned long a[4];
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        addr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                addr->ipv4 = (addr->ipv4 << 8) | a[i];
-        }
-
-        return EOK;
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
+        printf("syntax: " NAME " [-r] <host>\n");
 }
 
@@ -125 +86 @@
         int rc;
 
-        rc = addr_format(&sdu->src, &asrc);
+        rc = inet_addr_format(&sdu->src, &asrc);
         if (rc != EOK)
                 return ENOMEM;
 
-        rc = addr_format(&sdu->dest, &adest);
+        rc = inet_addr_format(&sdu->dest, &adest);
         if (rc != EOK) {
                 free(asrc);
@@ -188 +149 @@
 {
         console_ctrl_t *con;
-        kbd_event_t ev;
+        cons_event_t ev;
 
         con = console_init(stdin, stdout);
@@ -194 +155 @@
 
         while (true) {
-                if (!console_get_kbd_event(con, &ev))
+                if (!console_get_event(con, &ev))
                         break;
 
-                if (ev.type == KEY_PRESS && (ev.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.mods & KM_CTRL) != 0) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
+                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
                         /* Ctrl+key */
-                        if (ev.key == KC_Q) {
+                        if (ev.ev.key.key == KC_Q) {
                                 ping_signal_done();
                                 return 0;
@@ -212 +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;
@@ -219 +185 @@
                 printf(NAME ": Failed connecting to internet ping service "
                     "(%d).\n", rc);
-                return 1;
+                goto error;
         }
 
@@ -232 +198 @@
         if (argc - argi != 1) {
                 print_syntax();
-                return 1;
+                goto error;
         }
 
         /* Parse destination address */
-        rc = addr_parse(argv[argi], &dest_addr);
-        if (rc != EOK) {
-                printf(NAME ": Invalid address format.\n");
-                print_syntax();
-                return 1;
+        rc = inet_addr_parse(argv[argi], &dest_addr);
+        if (rc != EOK) {
+                /* 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;
         }
 
@@ -247 +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->cname, 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;
@@ -256 +253 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating transmit fibril.\n");
-                        return 1;
+                        goto error;
                 }
 
@@ -264 +261 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating input fibril.\n");
-                        return 1;
+                        goto error;
                 }
 
@@ -282 +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;
 }