Changes in uspace/app/ping/ping.c [959d2ec:3e6a98c5] in mainline

File:

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

uspace/app/ping/ping.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2012 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>
@@ -70 +68 @@
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <host>\n");
+        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;
 }
 
@@ -86 +125 @@
         int rc;
 
-        rc = inet_addr_format(&sdu->src, &asrc);
+        rc = addr_format(&sdu->src, &asrc);
         if (rc != EOK)
                 return ENOMEM;
 
-        rc = inet_addr_format(&sdu->dest, &adest);
+        rc = addr_format(&sdu->dest, &adest);
         if (rc != EOK) {
                 free(asrc);
@@ -149 +188 @@
 {
         console_ctrl_t *con;
-        cons_event_t ev;
+        kbd_event_t ev;
 
         con = console_init(stdin, stdout);
@@ -155 +194 @@
 
         while (true) {
-                if (!console_get_event(con, &ev))
+                if (!console_get_kbd_event(con, &ev))
                         break;
 
-                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) {
+                if (ev.type == KEY_PRESS && (ev.mods & (KM_ALT | KM_SHIFT)) ==
+                    0 && (ev.mods & KM_CTRL) != 0) {
                         /* Ctrl+key */
-                        if (ev.ev.key.key == KC_Q) {
+                        if (ev.key == KC_Q) {
                                 ping_signal_done();
                                 return 0;
@@ -174 +212 @@
 int main(int argc, char *argv[])
 {
-        dnsr_hostinfo_t *hinfo = NULL;
-        char *asrc = NULL;
-        char *adest = NULL;
-        char *sdest = NULL;
         int rc;
         int argi;
@@ -185 +219 @@
                 printf(NAME ": Failed connecting to internet ping service "
                     "(%d).\n", rc);
-                goto error;
+                return 1;
         }
 
@@ -198 +232 @@
         if (argc - argi != 1) {
                 print_syntax();
-                goto error;
+                return 1;
         }
 
         /* Parse destination address */
-        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;
+        rc = addr_parse(argv[argi], &dest_addr);
+        if (rc != EOK) {
+                printf(NAME ": Invalid address format.\n");
+                print_syntax();
+                return 1;
         }
 
@@ -218 +247 @@
         if (rc != EOK) {
                 printf(NAME ": Failed determining source address.\n");
-                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);
+                return 1;
+        }
 
         fid_t fid;
@@ -253 +256 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating transmit fibril.\n");
-                        goto error;
+                        return 1;
                 }
 
@@ -261 +264 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating input fibril.\n");
-                        goto error;
+                        return 1;
                 }
 
@@ -279 +282 @@
         if (rc == ETIMEOUT) {
                 printf(NAME ": Echo request timed out.\n");
-                goto error;
-        }
-
-        free(asrc);
-        free(adest);
-        free(sdest);
-        dnsr_hostinfo_destroy(hinfo);
+                return 1;
+        }
+
         return 0;
-error:
-        free(asrc);
-        free(adest);
-        free(sdest);
-        dnsr_hostinfo_destroy(hinfo);
-        return 1;
 }