X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=528c90d1e25930077472719056ed6a8112ab3ad3;hb=c56d49bb736fb69d95287b094e048851c0ec8419;hp=3e114f574acfbacae5026a258ba2f17d91aaa014;hpb=48acd61a5c6257cae2df205467caa0a91c2b0d1c;p=liboping.git

diff --git a/src/oping.c b/src/oping.c
index 3e114f5..528c90d 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -82,11 +82,17 @@
 /* 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
@@ -172,7 +178,7 @@ typedef struct ping_context
 	 * 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
@@ -209,6 +215,7 @@ static int     opt_show_graph = 1;
 static int     opt_utf8       = 0;
 #endif
 static char   *opt_outfile    = NULL;
+static int     opt_bell       = 0;
 
 static int host_num  = 0;
 static FILE *outfile = NULL;
@@ -225,22 +232,17 @@ static void sigint_handler (int signal) /* {{{ */
 	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) /* {{{ */
@@ -652,7 +654,7 @@ static int read_options (int argc, char **argv) /* {{{ */
 
 	while (1)
 	{
-		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:"
+		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
 #if USE_NCURSES
 				"uUg:"
 #endif
@@ -754,6 +756,7 @@ static int read_options (int argc, char **argv) /* {{{ */
 					free (opt_outfile);
 					opt_outfile = strdup (optarg);
 				}
+				break;
 
 			case 'P':
 				{
@@ -790,6 +793,9 @@ static int read_options (int argc, char **argv) /* {{{ */
 				opt_utf8 = 1;
 				break;
 #endif
+			case 'b':
+				opt_bell = 1;
+				break;
 
 			case 'Z':
 			{
@@ -1355,10 +1361,11 @@ static int pre_loop_hook (pingobj_t *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);
 	}
@@ -1575,6 +1582,13 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 #if USE_NCURSES
 		}
 #endif
+                if (opt_bell) {
+#if USE_NCURSES
+			beep();
+#else
+			HOST_PRINTF ("\a");
+#endif
+                }
 	}
 	else /* if (!(latency > 0.0)) */
 	{
@@ -1602,11 +1616,10 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 
 	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");