[ping] Allow "ping" command output to be inhibited

Originally-implemented-by: Cedric Levasseur <cyr-ius@ipocus.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2014-10-23 16:52:08 +01:00
parent 1c34ca70d1
commit dea6a6c1a0
4 changed files with 17 additions and 9 deletions

View File

@@ -166,7 +166,7 @@ static void pinger_expired ( struct retry_timer *timer, int over __unused ) {
int rc;
/* If no response has been received, notify the callback function */
if ( pinger->pending )
if ( pinger->pending && pinger->callback )
pinger->callback ( NULL, pinger->sequence, 0, -ETIMEDOUT );
/* Check for termination */
@@ -263,8 +263,9 @@ static int pinger_deliver ( struct pinger *pinger, struct io_buffer *iobuf,
/* Discard I/O buffer */
free_iob ( iobuf );
/* Notify callback function */
pinger->callback ( meta->src, sequence, len, rc );
/* Notify callback function, if applicable */
if ( pinger->callback )
pinger->callback ( meta->src, sequence, len, rc );
/* Terminate if applicable */
if ( terminate )
@@ -301,6 +302,7 @@ static struct interface_descriptor pinger_job_desc =
* @v timeout Timeout (in ticks)
* @v len Payload length
* @v count Number of packets to send (or zero for no limit)
* @v callback Callback function (or NULL)
* @ret rc Return status code
*/
int create_pinger ( struct interface *job, const char *hostname,