/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2016 Florian octo Forster <ff at octo.it>
+ * Copyright (C) 2006-2017 Florian octo Forster <ff at octo.it>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
# define _X_OPEN_SOURCE_EXTENDED
-# if HAVE_NCURSESW_NCURSES_H
-# include <ncursesw/ncurses.h>
-# elif HAVE_NCURSES_H
+#if defined HAVE_NCURSESW_CURSES_H
+# include <ncursesw/curses.h>
+#elif defined HAVE_NCURSESW_H
+# include <ncursesw.h>
+#elif defined HAVE_NCURSES_CURSES_H
+# include <ncurses/curses.h>
+#elif defined HAVE_NCURSES_H
# include <ncurses.h>
-# endif
+#else
+# error "SysV or X/Open-compatible Curses header file required"
+#endif
# define OPING_GREEN 1
# define OPING_YELLOW 2
* and HISTORY_SIZE_MAX. */
size_t history_size;
- /* Number "received" entries in the history, i.e. non-NAN entries. */
+ /* Total number of reponses received. */
size_t history_received;
/* Index of the next RTT to be written to history_by_time. This wraps
opt_count = 0;
} /* }}} void sigint_handler */
-static ping_context_t *context_create (void) /* {{{ */
+static ping_context_t *context_create () /* {{{ */
{
- ping_context_t *ret;
-
- if ((ret = malloc (sizeof (ping_context_t))) == NULL)
+ ping_context_t *ctx = calloc (1, sizeof (*ctx));
+ if (ctx == NULL)
return (NULL);
- memset (ret, '\0', sizeof (ping_context_t));
-
- ret->latency_total = 0.0;
-
#if USE_NCURSES
- ret->window = NULL;
+ ctx->window = NULL;
#endif
- return (ret);
+ return (ctx);
} /* }}} ping_context_t *context_create */
static void context_destroy (ping_context_t *context) /* {{{ */
if (context->window != NULL)
{
+ werase (context->window);
+ wrefresh (context->window);
delwin (context->window);
context->window = NULL;
}
/* FIXME - scroll main_win correctly so that old
* data is still visible */
need_resize = 1;
- host_num++;
+ host_num = ping_iterator_count(ping);
ping_initialize_contexts(ping);
}
}
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);
- init_pair (OPING_GREEN_HIST, COLOR_GREEN, COLOR_BLACK);
+ use_default_colors ();
+ init_pair (OPING_GREEN, COLOR_GREEN, /* default = */ -1);
+ init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ -1);
+ init_pair (OPING_RED, COLOR_RED, /* default = */ -1);
+ init_pair (OPING_GREEN_HIST, COLOR_GREEN, -1);
init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW);
}
if (outfile != NULL)
{
- struct timespec ts = { 0, 0 };
-
- if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
+ struct timeval tv = {0};
+ if (gettimeofday (&tv, NULL) == 0)
{
- double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
+ double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.0);
if ((sequence % 32) == 0)
fprintf (outfile, "#time,host,latency[ms]\n");