From dea6a6c1a07462890dc8bed4d048febdd13a2a3a Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 23 Oct 2014 16:52:08 +0100 Subject: [ping] Allow "ping" command output to be inhibited Originally-implemented-by: Cedric Levasseur Signed-off-by: Michael Brown --- src/usr/pingmgmt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/usr') diff --git a/src/usr/pingmgmt.c b/src/usr/pingmgmt.c index f8366f26..16b3ec99 100644 --- a/src/usr/pingmgmt.c +++ b/src/usr/pingmgmt.c @@ -59,22 +59,24 @@ static void ping_callback ( struct sockaddr *peer, unsigned int sequence, * @v timeout Timeout between pings, in ticks * @v len Payload length * @v count Number of packets to send (or zero for no limit) + * @v quiet Inhibit output * @ret rc Return status code */ int ping ( const char *hostname, unsigned long timeout, size_t len, - unsigned int count ) { + unsigned int count, int quiet ) { int rc; /* Create pinger */ - if ( ( rc = create_pinger ( &monojob, hostname, timeout, len, - count, ping_callback ) ) != 0 ) { + if ( ( rc = create_pinger ( &monojob, hostname, timeout, len, count, + ( quiet ? NULL : ping_callback ) ) ) != 0 ){ printf ( "Could not start ping: %s\n", strerror ( rc ) ); return rc; } /* Wait for ping to complete */ if ( ( rc = monojob_wait ( NULL, 0 ) ) != 0 ) { - printf ( "Finished: %s\n", strerror ( rc ) ); + if ( ! quiet ) + printf ( "Finished: %s\n", strerror ( rc ) ); return rc; } -- cgit v1.2.3-55-g7522