X-Git-Url: https://git.octo.it/?p=liboping.git;a=blobdiff_plain;f=src%2Foping.c;h=de44d08b2f85e7222da053b3044fce06111faaae;hp=6263a4def36459c7d94c8dbbb362cc89b56a9f6e;hb=5bacc4ccaee4b44b1f45b8e589797ba9a4001cba;hpb=0a2a9fe209b27e37d15096fa730bac9520dfeced

diff --git a/src/oping.c b/src/oping.c
index 6263a4d..de44d08 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -1,6 +1,6 @@
 /**
  * Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2014  Florian octo Forster <ff at octo.it>
+ * Copyright (C) 2006-2016  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
@@ -208,8 +208,11 @@ static double  opt_exit_status_threshold = 1.0;
 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 int host_num  = 0;
+static FILE *outfile = NULL;
 
 #if USE_NCURSES
 static WINDOW *main_win = NULL;
@@ -439,7 +442,8 @@ static void usage_exit (const char *name, int status) /* {{{ */
 			"  -I srcaddr   source address\n"
 			"  -D device    outgoing interface name\n"
 			"  -m mark      mark to set on outgoing packets\n"
-			"  -f filename  filename to read hosts from\n"
+			"  -f filename  read hosts from <filename>\n"
+			"  -O filename  write RTT measurements to <filename>\n"
 #if USE_NCURSES
 			"  -u / -U      force / disable UTF-8 output\n"
 			"  -g graph     graph type to draw\n"
@@ -649,7 +653,7 @@ static int read_options (int argc, char **argv) /* {{{ */
 
 	while (1)
 	{
-		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z: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
@@ -746,6 +750,13 @@ static int read_options (int argc, char **argv) /* {{{ */
 				set_opt_send_qos (optarg);
 				break;
 
+			case 'O':
+				{
+					free (opt_outfile);
+					opt_outfile = strdup (optarg);
+				}
+				break;
+
 			case 'P':
 				{
 					double new_percentile;
@@ -781,6 +792,9 @@ static int read_options (int argc, char **argv) /* {{{ */
 				opt_utf8 = 1;
 				break;
 #endif
+			case 'b':
+				opt_bell = 1;
+				break;
 
 			case 'Z':
 			{
@@ -1346,10 +1360,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);
 	}
@@ -1566,6 +1581,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)) */
 	{
@@ -1591,6 +1613,20 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 #endif
 	}
 
+	if (outfile != NULL)
+	{
+		struct timeval tv = {0};
+		if (gettimeofday (&tv, NULL) == 0)
+		{
+			double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.0);
+
+			if ((sequence % 32) == 0)
+				fprintf (outfile, "#time,host,latency[ms]\n");
+
+			fprintf (outfile, "%.3f,\"%s\",%.2f\n", t, context->host, latency);
+		}
+	}
+
 #if USE_NCURSES
 	update_stats_from_context (context, iter);
 	wrefresh (main_win);
@@ -1762,19 +1798,20 @@ int main (int argc, char **argv) /* {{{ */
 		}
 	}
 
-	if(opt_mark != NULL)
+	if (opt_mark != NULL)
 	{
-		char *endp;
-		int mark = strtoul(opt_mark, &endp, 0);
-		if(opt_mark[0] != '\0' && *endp == '\0')
+		char *endp = NULL;
+		int mark = (int) strtol (opt_mark, &endp, /* base = */ 0);
+		if ((opt_mark[0] != 0) && (endp != NULL) && (*endp == 0))
 		{
-			if(ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0)
+			if (ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0)
 			{
 				fprintf (stderr, "Setting mark failed: %s\n",
 					ping_get_error (ping));
 			}
 		}
-		else{
+		else
+		{
 			fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
 		}
 	}
@@ -1889,6 +1926,17 @@ int main (int argc, char **argv) /* {{{ */
 	saved_set_uid = (uid_t) -1;
 #endif
 
+	if (opt_outfile != NULL)
+	{
+		outfile = fopen (opt_outfile, "a");
+		if (outfile == NULL)
+		{
+			fprintf (stderr, "opening \"%s\" failed: %s\n",
+				 opt_outfile, strerror (errno));
+			exit (EXIT_FAILURE);
+		}
+	}
+
 	ping_initialize_contexts (ping);
 
 	if (i == 0)
@@ -1975,6 +2023,12 @@ int main (int argc, char **argv) /* {{{ */
 
 	ping_destroy (ping);
 
+	if (outfile != NULL)
+	{
+		fclose (outfile);
+		outfile = NULL;
+	}
+
 	if (status == 0)
 		exit (EXIT_SUCCESS);
 	else