X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=f2e48a6c28b1b49359eeeff1ae689c9ae05339ff;hb=de2e53623737bbd78a7e14a8a8e016fbc5f2e397;hp=3ae226c6f5e64d25e31d3ab3d960e0e673a8289f;hpb=a336f1ecc9665dc1d2f20fd8dfe6d9a93bb41b25;p=liboping.git

diff --git a/src/oping.c b/src/oping.c
index 3ae226c..f2e48a6 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
@@ -196,6 +196,7 @@ static double  opt_timeout    = PING_DEF_TIMEOUT;
 static int     opt_addrfamily = PING_DEF_AF;
 static char   *opt_srcaddr    = NULL;
 static char   *opt_device     = NULL;
+static char   *opt_mark       = NULL;
 static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
 static int     opt_send_ttl   = 64;
@@ -207,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;
@@ -437,7 +441,9 @@ static void usage_exit (const char *name, int status) /* {{{ */
 			"               Use \"-Q help\" for a list of valid options.\n"
 			"  -I srcaddr   source address\n"
 			"  -D device    outgoing interface name\n"
-			"  -f filename  filename to read hosts from\n"
+			"  -m mark      mark to set on outgoing packets\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"
@@ -647,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:w:"
+		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
 #if USE_NCURSES
 				"uUg:"
 #endif
@@ -724,6 +730,10 @@ static int read_options (int argc, char **argv) /* {{{ */
 				opt_device = optarg;
 				break;
 
+			case 'm':
+				opt_mark = optarg;
+				break;
+
 			case 't':
 			{
 				int new_send_ttl;
@@ -740,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;
@@ -775,6 +792,9 @@ static int read_options (int argc, char **argv) /* {{{ */
 				opt_utf8 = 1;
 				break;
 #endif
+			case 'b':
+				opt_bell = 1;
+				break;
 
 			case 'Z':
 			{
@@ -1340,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);
 	}
@@ -1560,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)) */
 	{
@@ -1585,6 +1613,21 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 #endif
 	}
 
+	if (outfile != NULL)
+	{
+		struct timespec ts = { 0, 0 };
+
+		if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
+		{
+			double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.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);
@@ -1756,6 +1799,24 @@ int main (int argc, char **argv) /* {{{ */
 		}
 	}
 
+	if (opt_mark != NULL)
+	{
+		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)
+			{
+				fprintf (stderr, "Setting mark failed: %s\n",
+					ping_get_error (ping));
+			}
+		}
+		else
+		{
+			fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
+		}
+	}
+
 	if (opt_filename != NULL)
 	{
 		FILE *infile;
@@ -1866,6 +1927,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)
@@ -1952,6 +2024,12 @@ int main (int argc, char **argv) /* {{{ */
 
 	ping_destroy (ping);
 
+	if (outfile != NULL)
+	{
+		fclose (outfile);
+		outfile = NULL;
+	}
+
 	if (status == 0)
 		exit (EXIT_SUCCESS);
 	else