|
@@ -99,9 +99,9 @@ char **responses = NULL;
|
|
|
char *authtype = NULL;
|
|
char *authtype = NULL;
|
|
|
char *authuser = NULL;
|
|
char *authuser = NULL;
|
|
|
char *authpass = NULL;
|
|
char *authpass = NULL;
|
|
|
-int warning_time = 0;
|
|
|
|
|
|
|
+double warning_time = 0;
|
|
|
int check_warning_time = FALSE;
|
|
int check_warning_time = FALSE;
|
|
|
-int critical_time = 0;
|
|
|
|
|
|
|
+double critical_time = 0;
|
|
|
int check_critical_time = FALSE;
|
|
int check_critical_time = FALSE;
|
|
|
int verbose = 0;
|
|
int verbose = 0;
|
|
|
int use_ssl = FALSE;
|
|
int use_ssl = FALSE;
|
|
@@ -417,9 +417,9 @@ main (int argc, char **argv)
|
|
|
elapsed_time = (double)microsec / 1.0e6;
|
|
elapsed_time = (double)microsec / 1.0e6;
|
|
|
|
|
|
|
|
if (result == STATE_OK) {
|
|
if (result == STATE_OK) {
|
|
|
- if (check_critical_time && elapsed_time > (double) critical_time)
|
|
|
|
|
|
|
+ if (check_critical_time && elapsed_time > critical_time)
|
|
|
result = STATE_CRITICAL;
|
|
result = STATE_CRITICAL;
|
|
|
- else if (check_warning_time && elapsed_time > (double) warning_time)
|
|
|
|
|
|
|
+ else if (check_warning_time && elapsed_time > warning_time)
|
|
|
result = STATE_WARNING;
|
|
result = STATE_WARNING;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -552,21 +552,19 @@ process_arguments (int argc, char **argv)
|
|
|
nresponses++;
|
|
nresponses++;
|
|
|
break;
|
|
break;
|
|
|
case 'c': /* critical time threshold */
|
|
case 'c': /* critical time threshold */
|
|
|
- if (is_intnonneg (optarg)) {
|
|
|
|
|
- critical_time = atoi (optarg);
|
|
|
|
|
- check_critical_time = TRUE;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (!is_nonnegative (optarg))
|
|
|
|
|
+ usage4 (_("Critical time must be a positive"));
|
|
|
else {
|
|
else {
|
|
|
- usage4 (_("Critical time must be a positive integer"));
|
|
|
|
|
|
|
+ critical_time = strtod (optarg, NULL);
|
|
|
|
|
+ check_critical_time = TRUE;
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case 'w': /* warning time threshold */
|
|
case 'w': /* warning time threshold */
|
|
|
- if (is_intnonneg (optarg)) {
|
|
|
|
|
- warning_time = atoi (optarg);
|
|
|
|
|
- check_warning_time = TRUE;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (!is_nonnegative (optarg))
|
|
|
|
|
+ usage4 (_("Warning time must be a positive"));
|
|
|
else {
|
|
else {
|
|
|
- usage4 (_("Warning time must be a positive integer"));
|
|
|
|
|
|
|
+ warning_time = strtod (optarg, NULL);
|
|
|
|
|
+ check_warning_time = TRUE;
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case 'v': /* verbose */
|
|
case 'v': /* verbose */
|