oping: Improve parsing of the "-z" argument.
[liboping.git] / src / oping.c
index 4946bf7..78f053f 100644 (file)
@@ -25,6 +25,8 @@
 # include <stdlib.h>
 # include <stdio.h>
 # include <string.h>
+# include <stdint.h>
+# include <inttypes.h>
 # include <errno.h>
 # include <assert.h>
 #else
 # endif
 #endif
 
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_NETINET_IP_H
+# include <netinet/ip.h>
+#endif
+
 #if HAVE_NETDB_H
 # include <netdb.h> /* NI_MAXHOST */
 #endif
 #endif
 
 #if USE_NCURSES
+# define NCURSES_OPAQUE 1
 # include <ncurses.h>
+
+# define OPING_GREEN 1
+# define OPING_YELLOW 2
+# define OPING_RED 3
 #endif
 
 #include "oping.h"
@@ -77,6 +94,7 @@ typedef struct ping_context
        char host[NI_MAXHOST];
        char addr[NI_MAXHOST];
 
+       int index;
        int req_sent;
        int req_rcvd;
 
@@ -97,20 +115,23 @@ static char   *opt_device     = NULL;
 static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
 static int     opt_send_ttl   = 64;
+static uint8_t opt_send_tos   = 0;
+
+static int host_num = 0;
 
 #if USE_NCURSES
 static WINDOW *main_win = NULL;
 #endif
 
-static void sigint_handler (int signal)
+static void sigint_handler (int signal) /* {{{ */
 {
        /* Make compiler happy */
        signal = 0;
        /* Exit the loop */
        opt_count = 0;
-}
+} /* }}} void sigint_handler */
 
-static ping_context_t *context_create (void)
+static ping_context_t *context_create (void) /* {{{ */
 {
        ping_context_t *ret;
 
@@ -129,9 +150,9 @@ static ping_context_t *context_create (void)
 #endif
 
        return (ret);
-}
+} /* }}} ping_context_t *context_create */
 
-static void context_destroy (ping_context_t *context)
+static void context_destroy (ping_context_t *context) /* {{{ */
 {
        if (context == NULL)
                return;
@@ -145,7 +166,7 @@ static void context_destroy (ping_context_t *context)
 #endif
 
        free (context);
-}
+} /* }}} void context_destroy */
 
 static double context_get_average (ping_context_t *ctx) /* {{{ */
 {
@@ -179,7 +200,52 @@ static double context_get_stddev (ping_context_t *ctx) /* {{{ */
                                / (num_total * (num_total - 1.0))));
 } /* }}} double context_get_stddev */
 
-static void usage_exit (const char *name, int status)
+static double context_get_packet_loss (const ping_context_t *ctx) /* {{{ */
+{
+       if (ctx == NULL)
+               return (-1.0);
+
+       if (ctx->req_sent < 1)
+               return (0.0);
+
+       return (100.0 * (ctx->req_sent - ctx->req_rcvd)
+                       / ((double) ctx->req_sent));
+} /* }}} double context_get_packet_loss */
+
+static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
+{
+       pingobj_iter_t *iter;
+       int index;
+
+       if (ping == NULL)
+               return (EINVAL);
+
+       index = 0;
+       for (iter = ping_iterator_get (ping);
+                       iter != NULL;
+                       iter = ping_iterator_next (iter))
+       {
+               ping_context_t *context;
+               size_t buffer_size;
+
+               context = context_create ();
+               context->index = index;
+
+               buffer_size = sizeof (context->host);
+               ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
+
+               buffer_size = sizeof (context->addr);
+               ping_iterator_get_info (iter, PING_INFO_ADDRESS, context->addr, &buffer_size);
+
+               ping_iterator_set_context (iter, (void *) context);
+
+               index++;
+       }
+
+       return (0);
+} /* }}} int ping_initialize_contexts */
+
+static void usage_exit (const char *name, int status) /* {{{ */
 {
        int name_length;
 
@@ -193,6 +259,7 @@ static void usage_exit (const char *name, int status)
                        "  -c count     number of ICMP packets to send\n"
                        "  -i interval  interval with which to send ICMP packets\n"
                        "  -t ttl       time to live for each ICMP packet\n"
+                       "  -z tos       Type-of-service/class-of-service for each ICMP packet\n"
                        "  -I srcaddr   source address\n"
                        "  -D device    outgoing interface name\n"
                        "  -f filename  filename to read hosts from\n"
@@ -202,15 +269,70 @@ static void usage_exit (const char *name, int status)
                        "for contributions see `AUTHORS'\n",
                        name);
        exit (status);
-}
+} /* }}} void usage_exit */
+
+static void usage_tos_exit (const char *arg, int status) /* {{{ */
+{
+       if (arg != 0)
+               fprintf (stderr, "Invalid ToS argument: \"%s\"\n\n", arg);
+
+       fprintf (stderr, "Valid ToS arguments (option \"-z\") are:\n"
+                       "\n"
+                       "    lowdelay     (%#04x)    minimize delays\n"
+                       "    throughput   (%#04x)    optimize throughput\n"
+                       "    reliability  (%#04x)    optimize reliability\n"
+                       "    mincost      (%#04x)    minimize cost\n"
+                       "    0x00 - 0xff            specify manually\n"
+                       "\n",
+                       (unsigned int) IPTOS_LOWDELAY,
+                       (unsigned int) IPTOS_THROUGHPUT,
+                       (unsigned int) IPTOS_RELIABILITY,
+                       (unsigned int) IPTOS_MINCOST);
+
+       exit (status);
+} /* }}} void usage_tos_exit */
+
+static int set_opt_send_tos (const char *opt) /* {{{ */
+{
+       if (opt == NULL)
+               return (EINVAL);
+
+       if (strcasecmp ("lowdelay", opt) == 0)
+               opt_send_tos = IPTOS_LOWDELAY;
+       else if (strcasecmp ("throughput", opt) == 0)
+               opt_send_tos = IPTOS_THROUGHPUT;
+       else if (strcasecmp ("reliability", opt) == 0)
+               opt_send_tos = IPTOS_RELIABILITY;
+       else if (strcasecmp ("mincost", opt) == 0)
+               opt_send_tos = IPTOS_MINCOST;
+       else if (strcasecmp ("help", opt) == 0)
+               usage_tos_exit (/* arg = */ NULL, /* status = */ EXIT_SUCCESS);
+       else
+       {
+               unsigned long value;
+               char *endptr;
+
+               errno = 0;
+               endptr = NULL;
+               value = strtoul (opt, &endptr, /* base = */ 0);
+               if ((errno != 0) || (endptr == opt)
+                               || (endptr == NULL) || (*endptr != 0)
+                               || (value >= 0xff))
+                       usage_tos_exit (/* arg = */ opt, /* status = */ EXIT_FAILURE);
+               
+               opt_send_tos = (uint8_t) value;
+       }
+
+       return (0);
+} /* }}} int set_opt_send_tos */
 
-static int read_options (int argc, char **argv)
+static int read_options (int argc, char **argv) /* {{{ */
 {
        int optchar;
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:t:f:D:");
+               optchar = getopt (argc, argv, "46c:hi:I:t:z:f:D:");
 
                if (optchar == -1)
                        break;
@@ -277,6 +399,10 @@ static int read_options (int argc, char **argv)
                                break;
                        }
 
+                       case 'z':
+                               set_opt_send_tos (optarg);
+                               break;
+
                        case 'h':
                                usage_exit (argv[0], 0);
                                break;
@@ -286,102 +412,9 @@ static int read_options (int argc, char **argv)
        }
 
        return (optind);
-}
+} /* }}} read_options */
 
-static void print_host (pingobj_iter_t *iter)
-{
-       double          latency;
-       unsigned int    sequence;
-       int             recv_ttl;
-       size_t          buffer_len;
-       size_t          data_len;
-       ping_context_t *context;
-
-       latency = -1.0;
-       buffer_len = sizeof (latency);
-       ping_iterator_get_info (iter, PING_INFO_LATENCY,
-                       &latency, &buffer_len);
-
-       sequence = 0;
-       buffer_len = sizeof (sequence);
-       ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
-                       &sequence, &buffer_len);
-
-       recv_ttl = -1;
-       buffer_len = sizeof (recv_ttl);
-       ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
-                       &recv_ttl, &buffer_len);
-
-       data_len = 0;
-       ping_iterator_get_info (iter, PING_INFO_DATA,
-                       NULL, &data_len);
-
-       context = (ping_context_t *) ping_iterator_get_context (iter);
-
-#if USE_NCURSES
-# define HOST_PRINTF(...) wprintw(main_win, __VA_ARGS__)
-#else
-# define HOST_PRINTF(...) printf(__VA_ARGS__)
-#endif
-
-       context->req_sent++;
-       if (latency > 0.0)
-       {
-               context->req_rcvd++;
-               context->latency_total += latency;
-               context->latency_total_square += (latency * latency);
-
-               if ((context->latency_max < 0.0) || (context->latency_max < latency))
-                       context->latency_max = latency;
-               if ((context->latency_min < 0.0) || (context->latency_min > latency))
-                       context->latency_min = latency;
-
-               HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i "
-                               "time=%.2f ms\n",
-                               data_len,
-                               context->host, context->addr,
-                               sequence, recv_ttl, latency);
-       }
-       else
-       {
-               HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u timeout\n",
-                               context->host, context->addr,
-                               sequence);
-       }
-
-#if USE_NCURSES
-       wrefresh (main_win);
-       werase (context->window);
-       box (context->window, 0, 0);
-       mvwprintw (context->window, /* y = */ 0, /* x = */ 5,
-                       " %s ping statistics ",
-                       context->host);
-       mvwprintw (context->window, /* y = */ 1, /* x = */ 2,
-                       "%i packets transmitted, %i received, %.2f%% packet "
-                       "loss, time %.1fms",
-                       context->req_sent, context->req_rcvd,
-                       100.0 * (context->req_sent - context->req_rcvd) / ((double) context->req_sent),
-                       context->latency_total);
-       if (context->req_rcvd != 0)
-       {
-               double average;
-               double deviation;
-
-               average = context_get_average (context);
-               deviation = context_get_stddev (context);
-                       
-               mvwprintw (context->window, /* y = */ 2, /* x = */ 2,
-                               "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
-                               context->latency_min,
-                               average,
-                               context->latency_max,
-                               deviation);
-       }
-       wrefresh (context->window);
-#endif
-}
-
-static void time_normalize (struct timespec *ts)
+static void time_normalize (struct timespec *ts) /* {{{ */
 {
        while (ts->tv_nsec < 0)
        {
@@ -400,7 +433,7 @@ static void time_normalize (struct timespec *ts)
                ts->tv_sec  += 1;
                ts->tv_nsec -= 1000000000;
        }
-}
+} /* }}} void time_normalize */
 
 static void time_calc (struct timespec *ts_dest, /* {{{ */
                const struct timespec *ts_int,
@@ -428,64 +461,350 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */
        time_normalize (ts_dest);
 } /* }}} void time_calc */
 
-static int print_header (pingobj_t *ping) /* {{{ */
+#if USE_NCURSES
+static int update_stats_from_context (ping_context_t *ctx) /* {{{ */
+{
+       if ((ctx == NULL) || (ctx->window == NULL))
+               return (EINVAL);
+
+       werase (ctx->window);
+
+       box (ctx->window, 0, 0);
+       wattron (ctx->window, A_BOLD);
+       mvwprintw (ctx->window, /* y = */ 0, /* x = */ 5,
+                       " %s ", ctx->host);
+       wattroff (ctx->window, A_BOLD);
+       wprintw (ctx->window, "ping statistics ");
+       mvwprintw (ctx->window, /* y = */ 1, /* x = */ 2,
+                       "%i packets transmitted, %i received, %.2f%% packet "
+                       "loss, time %.1fms",
+                       ctx->req_sent, ctx->req_rcvd,
+                       context_get_packet_loss (ctx),
+                       ctx->latency_total);
+       if (ctx->req_rcvd != 0)
+       {
+               double average;
+               double deviation;
+
+               average = context_get_average (ctx);
+               deviation = context_get_stddev (ctx);
+                       
+               mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
+                               "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
+                               ctx->latency_min,
+                               average,
+                               ctx->latency_max,
+                               deviation);
+       }
+
+       wrefresh (ctx->window);
+
+       return (0);
+} /* }}} int update_stats_from_context */
+
+static int on_resize (pingobj_t *ping) /* {{{ */
 {
        pingobj_iter_t *iter;
-       int i;
+       int width = 0;
+       int height = 0;
+       int main_win_height;
+
+       getmaxyx (stdscr, height, width);
+       if ((height < 1) || (width < 1))
+               return (EINVAL);
+
+       main_win_height = height - (4 * host_num);
+       wresize (main_win, main_win_height, /* width = */ width);
+       /* Allow scrolling */
+       scrollok (main_win, TRUE);
+       /* wsetscrreg (main_win, 0, main_win_height - 1); */
+       /* Allow hardware accelerated scrolling. */
+       idlok (main_win, TRUE);
+       wrefresh (main_win);
+
+       for (iter = ping_iterator_get (ping);
+                       iter != NULL;
+                       iter = ping_iterator_next (iter))
+       {
+               ping_context_t *context;
+
+               context = ping_iterator_get_context (iter);
+               if (context == NULL)
+                       continue;
+
+               if (context->window != NULL)
+               {
+                       delwin (context->window);
+                       context->window = NULL;
+               }
+               context->window = newwin (/* height = */ 4,
+                               /* width = */ 0,
+                               /* y = */ main_win_height + (4 * context->index),
+                               /* x = */ 0);
+       }
+
+       return (0);
+} /* }}} */
+
+static int check_resize (pingobj_t *ping) /* {{{ */
+{
+       int need_resize = 0;
+
+       while (42)
+       {
+               int key = wgetch (stdscr);
+               if (key == ERR)
+                       break;
+               else if (key == KEY_RESIZE)
+                       need_resize = 1;
+       }
+
+       if (need_resize)
+               return (on_resize (ping));
+       else
+               return (0);
+} /* }}} int check_resize */
+
+static int pre_loop_hook (pingobj_t *ping) /* {{{ */
+{
+       pingobj_iter_t *iter;
+       int width = 0;
+       int height = 0;
+       int main_win_height;
 
-#if USE_NCURSES
        initscr ();
        cbreak ();
        noecho ();
-#endif
+       nodelay (stdscr, TRUE);
+
+       getmaxyx (stdscr, height, width);
+       if ((height < 1) || (width < 1))
+               return (EINVAL);
+
+       if (has_colors () == TRUE)
+       {
+               start_color ();
+               init_pair (OPING_GREEN,  COLOR_GREEN,  /* default = */ 0);
+               init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ 0);
+               init_pair (OPING_RED,    COLOR_RED,    /* default = */ 0);
+       }
+
+       main_win_height = height - (4 * host_num);
+       main_win = newwin (/* height = */ main_win_height,
+                       /* width = */ 0,
+                       /* y = */ 0, /* x = */ 0);
+       /* Allow scrolling */
+       scrollok (main_win, TRUE);
+       /* wsetscrreg (main_win, 0, main_win_height - 1); */
+       /* Allow hardware accelerated scrolling. */
+       idlok (main_win, TRUE);
+       wmove (main_win, /* y = */ main_win_height - 1, /* x = */ 0);
+       wrefresh (main_win);
 
-       i = 0;
        for (iter = ping_iterator_get (ping);
                        iter != NULL;
                        iter = ping_iterator_next (iter))
        {
                ping_context_t *context;
-               size_t buffer_size;
 
-               context = context_create ();
+               context = ping_iterator_get_context (iter);
+               if (context == NULL)
+                       continue;
 
-               buffer_size = sizeof (context->host);
-               ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
+               if (context->window != NULL)
+               {
+                       delwin (context->window);
+                       context->window = NULL;
+               }
+               context->window = newwin (/* height = */ 4,
+                               /* width = */ 0,
+                               /* y = */ main_win_height + (4 * context->index),
+                               /* x = */ 0);
+       }
 
-               buffer_size = sizeof (context->addr);
-               ping_iterator_get_info (iter, PING_INFO_ADDRESS, context->addr, &buffer_size);
+
+       /* Don't know what good this does exactly, but without this code
+        * "check_resize" will be called right after startup and *somehow*
+        * this leads to display errors. If we purge all initial characters
+        * here, the problem goes away. "wgetch" is non-blocking due to
+        * "nodelay" (see above). */
+       while (wgetch (stdscr) != ERR)
+       {
+               /* eat up characters */;
+       }
+
+       return (0);
+} /* }}} int pre_loop_hook */
+
+static int pre_sleep_hook (pingobj_t *ping) /* {{{ */
+{
+       return (check_resize (ping));
+} /* }}} int pre_sleep_hook */
+
+static int post_sleep_hook (pingobj_t *ping) /* {{{ */
+{
+       return (check_resize (ping));
+} /* }}} int pre_sleep_hook */
+#else /* if !USE_NCURSES */
+static int pre_loop_hook (pingobj_t *ping) /* {{{ */
+{
+       pingobj_iter_t *iter;
+
+       for (iter = ping_iterator_get (ping);
+                       iter != NULL;
+                       iter = ping_iterator_next (iter))
+       {
+               ping_context_t *ctx;
+               size_t buffer_size;
+
+               ctx = ping_iterator_get_context (iter);
+               if (ctx == NULL)
+                       continue;
 
                buffer_size = 0;
                ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size);
 
-#if USE_NCURSES
-               context->window = newwin (/* height = */ 4, COLS,
-                               /* start y = */ 4*i, /* start x = */ 0);
-               box (context->window, 0, 0);
-               mvwprintw (context->window, /* y = */ 0, /* x = */ 5,
-                               " %s ping statistics ",
-                               context->host);
-               wrefresh (context->window);
-#else /* !USE_NCURSES */
                printf ("PING %s (%s) %zu bytes of data.\n",
-                               context->host, context->addr, buffer_size);
+                               ctx->host, ctx->addr, buffer_size);
+       }
+
+       return (0);
+} /* }}} int pre_loop_hook */
+
+static int pre_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */
+{
+       fflush (stdout);
+
+       return (0);
+} /* }}} int pre_sleep_hook */
+
+static int post_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */
+{
+       return (0);
+} /* }}} int post_sleep_hook */
 #endif
 
-               ping_iterator_set_context (iter, (void *) context);
+static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
+               int index)
+{
+       double          latency;
+       unsigned int    sequence;
+       int             recv_ttl;
+       uint8_t         recv_tos;
+       size_t          buffer_len;
+       size_t          data_len;
+       ping_context_t *context;
 
-               i++;
-       }
+       latency = -1.0;
+       buffer_len = sizeof (latency);
+       ping_iterator_get_info (iter, PING_INFO_LATENCY,
+                       &latency, &buffer_len);
+
+       sequence = 0;
+       buffer_len = sizeof (sequence);
+       ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
+                       &sequence, &buffer_len);
+
+       recv_ttl = -1;
+       buffer_len = sizeof (recv_ttl);
+       ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
+                       &recv_ttl, &buffer_len);
+
+       recv_tos = 0;
+       buffer_len = sizeof (recv_tos);
+       ping_iterator_get_info (iter, PING_INFO_RECV_TOS,
+                       &recv_tos, &buffer_len);
+
+       data_len = 0;
+       ping_iterator_get_info (iter, PING_INFO_DATA,
+                       NULL, &data_len);
+
+       context = (ping_context_t *) ping_iterator_get_context (iter);
 
 #if USE_NCURSES
-       delwin (main_win);
-       main_win = newwin (LINES - 4*i, COLS, 4*i, 0);
-       scrollok (main_win, TRUE);
+# define HOST_PRINTF(...) wprintw(main_win, __VA_ARGS__)
+#else
+# define HOST_PRINTF(...) printf(__VA_ARGS__)
 #endif
 
-       return (0);
-} /* }}} int print_header */
+       context->req_sent++;
+       if (latency > 0.0)
+       {
+               context->req_rcvd++;
+               context->latency_total += latency;
+               context->latency_total_square += (latency * latency);
 
-static int print_footer (pingobj_t *ping)
+               if ((context->latency_max < 0.0) || (context->latency_max < latency))
+                       context->latency_max = latency;
+               if ((context->latency_min < 0.0) || (context->latency_min > latency))
+                       context->latency_min = latency;
+
+#if USE_NCURSES
+               if (has_colors () == TRUE)
+               {
+                       int color = OPING_GREEN;
+                       double average = context_get_average (context);
+                       double stddev = context_get_stddev (context);
+
+                       if ((latency < (average - (2 * stddev)))
+                                       || (latency > (average + (2 * stddev))))
+                               color = OPING_RED;
+                       else if ((latency < (average - stddev))
+                                       || (latency > (average + stddev)))
+                               color = OPING_YELLOW;
+
+                       HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i tos=0x%02"PRIx8
+                                       " time=",
+                                       data_len, context->host, context->addr,
+                                       sequence, recv_ttl, recv_tos);
+                       wattron (main_win, COLOR_PAIR(color));
+                       HOST_PRINTF ("%.2f", latency);
+                       wattroff (main_win, COLOR_PAIR(color));
+                       HOST_PRINTF (" ms\n");
+               }
+               else
+               {
+#endif
+               HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i tos=0x%02"PRIx8
+                               " time=%.2f ms\n",
+                               data_len,
+                               context->host, context->addr,
+                               sequence, recv_ttl, recv_tos, latency);
+#if USE_NCURSES
+               }
+#endif
+       }
+       else
+       {
+#if USE_NCURSES
+               if (has_colors () == TRUE)
+               {
+                       HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u ",
+                                       context->host, context->addr,
+                                       sequence);
+                       wattron (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
+                       HOST_PRINTF ("timeout");
+                       wattroff (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
+                       HOST_PRINTF ("\n");
+               }
+               else
+               {
+#endif
+               HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u timeout\n",
+                               context->host, context->addr,
+                               sequence);
+#if USE_NCURSES
+               }
+#endif
+       }
+
+#if USE_NCURSES
+       update_stats_from_context (context);
+       wrefresh (main_win);
+#endif
+} /* }}} void update_host_hook */
+
+static int post_loop_hook (pingobj_t *ping) /* {{{ */
 {
        pingobj_iter_t *iter;
 
@@ -504,7 +823,7 @@ static int print_footer (pingobj_t *ping)
                printf ("\n--- %s ping statistics ---\n"
                                "%i packets transmitted, %i received, %.2f%% packet loss, time %.1fms\n",
                                context->host, context->req_sent, context->req_rcvd,
-                               100.0 * (context->req_sent - context->req_rcvd) / ((double) context->req_sent),
+                               context_get_packet_loss (context),
                                context->latency_total);
 
                if (context->req_rcvd != 0)
@@ -527,7 +846,7 @@ static int print_footer (pingobj_t *ping)
        }
 
        return (0);
-} /* }}} int print_footer */
+} /* }}} int post_loop_hook */
 
 int main (int argc, char **argv) /* {{{ */
 {
@@ -593,6 +912,12 @@ int main (int argc, char **argv) /* {{{ */
                                opt_send_ttl, ping_get_error (ping));
        }
 
+       if (ping_setopt (ping, PING_OPT_TOS, &opt_send_tos) != 0)
+       {
+               fprintf (stderr, "Setting TOS to %i failed: %s\n",
+                               opt_send_tos, ping_get_error (ping));
+       }
+
        {
                double temp_sec;
                double temp_nsec;
@@ -673,6 +998,10 @@ int main (int argc, char **argv) /* {{{ */
                                fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
                                continue;
                        }
+                       else
+                       {
+                               host_num++;
+                       }
                }
 
 #if _POSIX_SAVED_IDS
@@ -709,6 +1038,10 @@ int main (int argc, char **argv) /* {{{ */
                        fprintf (stderr, "Adding host `%s' failed: %s\n", argv[i], errmsg);
                        continue;
                }
+               else
+               {
+                       host_num++;
+               }
        }
 
        /* Permanently drop root privileges if we're setuid-root. */
@@ -724,7 +1057,7 @@ int main (int argc, char **argv) /* {{{ */
        saved_set_uid = (uid_t) -1;
 #endif
 
-       print_header (ping);
+       ping_initialize_contexts (ping);
 
        if (i == 0)
                return (1);
@@ -737,8 +1070,11 @@ int main (int argc, char **argv) /* {{{ */
                return (1);
        }
 
+       pre_loop_hook (ping);
+
        while (opt_count != 0)
        {
+               int index;
                int status;
 
                if (gettimeofday (&tv_begin, NULL) < 0)
@@ -754,13 +1090,16 @@ int main (int argc, char **argv) /* {{{ */
                        return (1);
                }
 
+               index = 0;
                for (iter = ping_iterator_get (ping);
                                iter != NULL;
                                iter = ping_iterator_next (iter))
                {
-                       print_host (iter);
+                       update_host_hook (iter, index);
+                       index++;
                }
-               fflush (stdout);
+
+               pre_sleep_hook (ping);
 
                /* Don't sleep in the last iteration */
                if (opt_count == 1)
@@ -789,11 +1128,13 @@ int main (int argc, char **argv) /* {{{ */
                        }
                }
 
+               post_sleep_hook (ping);
+
                if (opt_count > 0)
                        opt_count--;
        } /* while (opt_count != 0) */
 
-       print_footer (ping);
+       post_loop_hook (ping);
 
        ping_destroy (ping);