Changes in uspace/app/ping/ping.c [a62ceaf:0aa70f4] in mainline

File:

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

uspace/app/ping/ping.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <net/socket_codes.h>
+#include <inet/dnsr.h>
 #include <inet/addr.h>
-#include <inet/host.h>
 #include <inet/inetping.h>
 #include <io/console.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
-#include <str_error.h>
 #include <sys/types.h>
 
@@ -56 +54 @@
 #define PING_TIMEOUT (1000 * 1000)
 
-typedef enum {
-        RECEIVED_NONE,
-        RECEIVED_SUCCESS,
-        RECEIVED_INTERRUPT
-} received_t;
-
-static received_t received;
-static FIBRIL_CONDVAR_INITIALIZE(received_cv);
-static FIBRIL_MUTEX_INITIALIZE(received_lock);
-
-static bool quit = false;
-static FIBRIL_CONDVAR_INITIALIZE(quit_cv);
-static FIBRIL_MUTEX_INITIALIZE(quit_lock);
-
 static int ping_ev_recv(inetping_sdu_t *);
+
+static bool done = false;
+static FIBRIL_CONDVAR_INITIALIZE(done_cv);
+static FIBRIL_MUTEX_INITIALIZE(done_lock);
 
 static inetping_ev_ops_t ev_ops = {
@@ -76 +64 @@
 };
 
-static inet_addr_t src_addr;
-static inet_addr_t dest_addr;
-
-static bool repeat_forever = false;
-static size_t repeat_count = 1;
-
-static const char *short_options = "46rn:";
+static addr32_t src;
+static addr32_t dest;
+
+static bool ping_repeat = false;
 
 static void print_syntax(void)
 {
-        printf("Syntax: %s [<options>] <host>\n", NAME);
-        printf("\t-n <count> Repeat the specified number of times\n");
-        printf("\t-r         Repeat forever\n");
-        printf("\t-4|-6      Use IPv4 or IPv6 destination host address\n");
-}
-
-static void ping_signal_received(received_t value)
-{
-        fibril_mutex_lock(&received_lock);
-        received = value;
-        fibril_mutex_unlock(&received_lock);
-        fibril_condvar_broadcast(&received_cv);
-}
-
-static void ping_signal_quit(void)
-{
-        fibril_mutex_lock(&quit_lock);
-        quit = true;
-        fibril_mutex_unlock(&quit_lock);
-        fibril_condvar_broadcast(&quit_cv);
+        printf("syntax: " NAME " [-r] <host>\n");
+}
+
+static void ping_signal_done(void)
+{
+        fibril_mutex_lock(&done_lock);
+        done = true;
+        fibril_mutex_unlock(&done_lock);
+        fibril_condvar_broadcast(&done_cv);
 }
 
 static int ping_ev_recv(inetping_sdu_t *sdu)
 {
+        inet_addr_t src_addr;
+        inet_addr_set(sdu->src, &src_addr);
+        
+        inet_addr_t dest_addr;
+        inet_addr_set(sdu->dest, &dest_addr);
+        
         char *asrc;
         int rc = inet_addr_format(&src_addr, &asrc);
@@ -125 +105 @@
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         
-        ping_signal_received(RECEIVED_SUCCESS);
+        if (!ping_repeat)
+                ping_signal_done();
         
         free(asrc);
@@ -135 +116 @@
 {
         inetping_sdu_t sdu;
-        
-        sdu.src = src_addr;
-        sdu.dest = dest_addr;
+        int rc;
+
+        sdu.src = src;
+        sdu.dest = dest;
         sdu.seq_no = seq_no;
         sdu.data = (void *) "foo";
         sdu.size = 3;
-        
-        int rc = inetping_send(&sdu);
-        if (rc != EOK)
-                printf("Failed sending echo request: %s (%d).\n",
-                    str_error(rc), rc);
-        
-        return rc;
+
+        rc = inetping_send(&sdu);
+        if (rc != EOK) {
+                printf(NAME ": Failed sending echo request (%d).\n", rc);
+                return rc;
+        }
+
+        return EOK;
 }
 
@@ -153 +136 @@
 {
         uint16_t seq_no = 0;
-        
-        while ((repeat_count--) || (repeat_forever)) {
-                fibril_mutex_lock(&received_lock);
-                received = RECEIVED_NONE;
-                fibril_mutex_unlock(&received_lock);
-                
+
+        while (true) {
+                fibril_mutex_lock(&done_lock);
+                if (done) {
+                        fibril_mutex_unlock(&done_lock);
+                        return 0;
+                }
+                fibril_mutex_unlock(&done_lock);
+
                 (void) ping_send(++seq_no);
-                
-                fibril_mutex_lock(&received_lock);
-                int rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
-                    PING_TIMEOUT);
-                received_t recv = received;
-                fibril_mutex_unlock(&received_lock);
-                
-                if ((rc == ETIMEOUT) || (recv == RECEIVED_NONE))
-                        printf("Echo request timed out (seq. no %u)\n", seq_no);
-                
-                if (recv == RECEIVED_INTERRUPT)
-                        break;
-                
-                if ((repeat_count > 0) || (repeat_forever)) {
-                        fibril_mutex_lock(&received_lock);
-                        rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
-                            PING_DELAY);
-                        recv = received;
-                        fibril_mutex_unlock(&received_lock);
-                        
-                        if (recv == RECEIVED_INTERRUPT)
-                                break;
-                }
-        }
-        
-        ping_signal_quit();
+                async_usleep(PING_DELAY);
+        }
+
         return 0;
 }
@@ -191 +154 @@
 static int input_fibril(void *arg)
 {
-        console_ctrl_t *con = console_init(stdin, stdout);
-        
+        console_ctrl_t *con;
+        cons_event_t ev;
+
+        con = console_init(stdin, stdout);
+        printf("[Press Ctrl-Q to quit]\n");
+
         while (true) {
-                cons_event_t ev;
                 if (!console_get_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 == 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.ev.key.key == KC_Q) {
-                                ping_signal_received(RECEIVED_INTERRUPT);
-                                break;
+                                ping_signal_done();
+                                return 0;
                         }
                 }
         }
-        
+
         return 0;
 }
@@ -214 +180 @@
 int main(int argc, char *argv[])
 {
+        dnsr_hostinfo_t *hinfo = NULL;
         char *asrc = NULL;
         char *adest = NULL;
         char *sdest = NULL;
-        char *host;
-        const char *errmsg;
-        ip_ver_t ip_ver = ip_any;
-        
-        int rc = inetping_init(&ev_ops);
-        if (rc != EOK) {
-                printf("Failed connecting to internet ping service: "
-                    "%s (%d).\n", str_error(rc), rc);
-                goto error;
-        }
-        
-        int c;
-        while ((c = getopt(argc, argv, short_options)) != -1) {
-                switch (c) {
-                case 'r':
-                        repeat_forever = true;
-                        break;
-                case 'n':
-                        rc = str_size_t(optarg, NULL, 10, true, &repeat_count);
-                        if (rc != EOK) {
-                                printf("Invalid repeat count.\n");
-                                print_syntax();
-                                goto error;
-                        }
-                        break;
-                case '4':
-                        ip_ver = ip_v4;
-                        break;
-                case '6':
-                        ip_ver = ip_v6;
-                        break;
-                default:
-                        printf("Unknown option passed.\n");
-                        print_syntax();
+        int rc;
+        int argi;
+
+        rc = inetping_init(&ev_ops);
+        if (rc != EOK) {
+                printf(NAME ": Failed connecting to internet ping service "
+                    "(%d).\n", rc);
+                goto error;
+        }
+
+        argi = 1;
+        if (argi < argc && str_cmp(argv[argi], "-r") == 0) {
+                ping_repeat = true;
+                ++argi;
+        } else {
+                ping_repeat = false;
+        }
+
+        if (argc - argi != 1) {
+                print_syntax();
+                goto error;
+        }
+
+        /* Parse destination address */
+        inet_addr_t dest_addr;
+        rc = inet_addr_parse(argv[argi], &dest_addr);
+        if (rc != EOK) {
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argi], &hinfo, AF_INET);
+                if (rc != EOK) {
+                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
                         goto error;
                 }
-        }
-        
-        if (optind >= argc) {
-                printf("IP address or host name not supplied.\n");
-                print_syntax();
-                goto error;
-        }
-        
-        host = argv[optind];
-        
-        /* Look up host */
-        rc = inet_host_plookup_one(host, ip_ver, &dest_addr, NULL, &errmsg);
-        if (rc != EOK) {
-                printf("Error resolving host '%s' (%s).\n", host, errmsg);
+                
+                dest_addr = hinfo->addr;
+        }
+        
+        uint16_t af = inet_addr_get(&dest_addr, &dest, NULL);
+        if (af != AF_INET) {
+                printf(NAME ": Destination '%s' is not an IPv4 address.\n",
+                    argv[argi]);
                 goto error;
         }
         
         /* Determine source address */
-        rc = inetping_get_srcaddr(&dest_addr, &src_addr);
-        if (rc != EOK) {
-                printf("Failed determining source address.\n");
-                goto error;
-        }
+        rc = inetping_get_srcaddr(dest, &src);
+        if (rc != EOK) {
+                printf(NAME ": Failed determining source address.\n");
+                goto error;
+        }
+        
+        inet_addr_t src_addr;
+        inet_addr_set(src, &src_addr);
         
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
-                printf("Out of memory.\n");
+                printf(NAME ": Out of memory.\n");
                 goto error;
         }
@@ -285 +246 @@
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
-                printf("Out of memory.\n");
-                goto error;
-        }
-        
-        rc = asprintf(&sdest, "%s (%s)", host, adest);
-        if (rc < 0) {
-                printf("Out of memory.\n");
-                goto error;
-        }
-        
-        printf("Sending ICMP echo request from %s to %s (Ctrl+Q to quit)\n",
+                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 = fibril_create(transmit_fibril, NULL);
-        if (fid == 0) {
-                printf("Failed creating transmit fibril.\n");
-                goto error;
-        }
-        
-        fibril_add_ready(fid);
-        
-        fid = fibril_create(input_fibril, NULL);
-        if (fid == 0) {
-                printf("Failed creating input fibril.\n");
-                goto error;
-        }
-        
-        fibril_add_ready(fid);
-        
-        fibril_mutex_lock(&quit_lock);
-        while (!quit)
-                fibril_condvar_wait(&quit_cv, &quit_lock);
-        fibril_mutex_unlock(&quit_lock);
-        
+
+        fid_t fid;
+
+        if (ping_repeat) {
+                fid = fibril_create(transmit_fibril, NULL);
+                if (fid == 0) {
+                        printf(NAME ": Failed creating transmit fibril.\n");
+                        goto error;
+                }
+
+                fibril_add_ready(fid);
+
+                fid = fibril_create(input_fibril, NULL);
+                if (fid == 0) {
+                        printf(NAME ": Failed creating input fibril.\n");
+                        goto error;
+                }
+
+                fibril_add_ready(fid);
+        } else {
+                ping_send(1);
+        }
+
+        fibril_mutex_lock(&done_lock);
+        rc = EOK;
+        while (!done && rc != ETIMEOUT) {
+                rc = fibril_condvar_wait_timeout(&done_cv, &done_lock,
+                        ping_repeat ? 0 : PING_TIMEOUT);
+        }
+        fibril_mutex_unlock(&done_lock);
+
+        if (rc == ETIMEOUT) {
+                printf(NAME ": Echo request timed out.\n");
+                goto error;
+        }
+
         free(asrc);
         free(adest);
         free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
         return 0;
         
@@ -328 +309 @@
         free(adest);
         free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
         return 1;
 }