[Nagiosplug-checkins] CVS: nagiosplug/plugins check_fping.c,1.11,1.12

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv661/plugins

Modified Files:
	check_fping.c 
Log Message:
use fperfdata

Index: check_fping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_fping.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** check_fping.c	26 Aug 2003 10:51:03 -0000	1.11
--- check_fping.c	14 Mar 2004 03:37:32 -0000	1.12
***************
*** 166,171 ****
  		      _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"),
  				 state_text (status), server_name, loss, rta,
! 		     perfdata ("loss", (int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100),
! 		     perfdata ("rta", (long int)(rta*1.0e3), "us", wrta_p, (long int)(wrta*1.0e3), crta_p, (long int)(crta*1.0e3), TRUE, 0, FALSE, 0));
  
  	}
--- 166,171 ----
  		      _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"),
  				 state_text (status), server_name, loss, rta,
! 		     perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100),
! 		     fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0));
  
  	}
***************
*** 187,191 ****
  		die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
  		     state_text (status), server_name, loss ,
! 		     perfdata ("loss", (int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100));
  	
  	}
--- 187,191 ----
  		die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
  		     state_text (status), server_name, loss ,
! 		     perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100));
  	
  	}
***************
*** 264,268 ****
  			get_threshold (optarg, rv);
  			if (rv[RTA]) {
! 				crta = 1e3 * strtod (rv[RTA], NULL);
  				crta_p = TRUE;
  				rv[RTA] = NULL;
--- 264,268 ----
  			get_threshold (optarg, rv);
  			if (rv[RTA]) {
! 				crta = 1e-3 * strtod (rv[RTA], NULL);
  				crta_p = TRUE;
  				rv[RTA] = NULL;
***************
*** 277,281 ****
  			get_threshold (optarg, rv);
  			if (rv[RTA]) {
! 				wrta = 1e3 * strtod (rv[RTA], NULL);
  				wrta_p = TRUE;
  				rv[RTA] = NULL;
--- 277,281 ----
  			get_threshold (optarg, rv);
  			if (rv[RTA]) {
! 				wrta = 1e-3 * strtod (rv[RTA], NULL);
  				wrta_p = TRUE;
  				rv[RTA] = NULL;