Changeset 8fdb18e in mainline for uspace/app/ping/ping.c

Timestamp:

2013-05-03T14:51:30Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5d1cb8a

Parents:

ef904895 (diff), 1c7ba2d (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 mainline changes.

File:

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

uspace/app/ping/ping.c

@@ -38 +38 @@
 #include <fibril_synch.h>
 #include <inet/dnsr.h>
+#include <inet/addr.h>
 #include <inet/inetping.h>
 #include <io/console.h>
@@ -72 +73 @@
 }
 
-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;
-}
-
 static void ping_signal_done(void)
 {
@@ -126 +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);
@@ -242 +202 @@
 
         /* Parse destination address */
-        rc = addr_parse(argv[argi], &dest_addr);
+        rc = inet_addr_parse(argv[argi], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
@@ -261 +221 @@
         }
 
-        rc = addr_format(&src_addr, &asrc);
+        rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");
@@ -267 +227 @@
         }
 
-        rc = addr_format(&dest_addr, &adest);
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");