[monitoring-plugins] Fixed parameter handling after ...

[Jacob Hansen]

    Module: monitoring-plugins
    Branch: master
    Commit: 248bebb037b4ac3a184706ec715f82a6ed4749a5
    Author: Lars Michelsen <lm at mathias-kettner.de>
 Committer: Jacob Hansen <jhansen at op5.com>
      Date: Thu Oct 22 16:40:02 2015 +0200
       URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=248bebb

Fixed parameter handling after 01efbb2183d49c5082598d4799788fc385342f28

---

 plugins-root/check_icmp.c | 76 +++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 6aeedf4..4c17d23 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -422,6 +422,44 @@ main(int argc, char **argv)
         address_family = AF_INET;
 	int icmp_proto = IPPROTO_ICMP;
 
+	/* get calling name the old-fashioned way for portability instead
+	 * of relying on the glibc-ism __progname */
+	ptr = strrchr(argv[0], '/');
+	if(ptr) progname = &ptr[1];
+	else progname = argv[0];
+
+	/* now set defaults. Use progname to set them initially (allows for
+	 * superfast check_host program when target host is up */
+	cursor = list = NULL;
+	table = NULL;
+
+	mode = MODE_RTA;
+	crit.rta = 500000;
+	crit.pl = 80;
+	warn.rta = 200000;
+	warn.pl = 40;
+	protocols = HAVE_ICMP | HAVE_UDP | HAVE_TCP;
+	pkt_interval = 80000;  /* 80 msec packet interval by default */
+	packets = 5;
+
+	if(!strcmp(progname, "check_icmp") || !strcmp(progname, "check_ping")) {
+		mode = MODE_ICMP;
+		protocols = HAVE_ICMP;
+	}
+	else if(!strcmp(progname, "check_host")) {
+		mode = MODE_HOSTCHECK;
+		pkt_interval = 1000000;
+		packets = 5;
+		crit.rta = warn.rta = 1000000;
+		crit.pl = warn.pl = 100;
+	}
+	else if(!strcmp(progname, "check_rta_multi")) {
+		mode = MODE_ALL;
+		target_interval = 0;
+		pkt_interval = 50000;
+		packets = 5;
+	}
+
 	/* parse the arguments */
 	for(i = 1; i < argc; i++) {
 		while((arg = getopt(argc, argv, "vhVw:c:n:p:t:H:s:i:b:I:l:m:64")) != EOF) {
@@ -533,44 +571,6 @@ main(int argc, char **argv)
 	pid = getpid() & 0xffff;
 	/* printf("pid = %u\n", pid); */
 
-	/* get calling name the old-fashioned way for portability instead
-	 * of relying on the glibc-ism __progname */
-	ptr = strrchr(argv[0], '/');
-	if(ptr) progname = &ptr[1];
-	else progname = argv[0];
-
-	/* now set defaults. Use progname to set them initially (allows for
-	 * superfast check_host program when target host is up */
-	cursor = list = NULL;
-	table = NULL;
-
-	mode = MODE_RTA;
-	crit.rta = 500000;
-	crit.pl = 80;
-	warn.rta = 200000;
-	warn.pl = 40;
-	protocols = HAVE_ICMP | HAVE_UDP | HAVE_TCP;
-	pkt_interval = 80000;  /* 80 msec packet interval by default */
-	packets = 5;
-
-	if(!strcmp(progname, "check_icmp") || !strcmp(progname, "check_ping")) {
-		mode = MODE_ICMP;
-		protocols = HAVE_ICMP;
-	}
-	else if(!strcmp(progname, "check_host")) {
-		mode = MODE_HOSTCHECK;
-		pkt_interval = 1000000;
-		packets = 5;
-		crit.rta = warn.rta = 1000000;
-		crit.pl = warn.pl = 100;
-	}
-	else if(!strcmp(progname, "check_rta_multi")) {
-		mode = MODE_ALL;
-		target_interval = 0;
-		pkt_interval = 50000;
-		packets = 5;
-	}
-
 	/* Parse extra opts if any */
 	argv=np_extra_opts(&argc, argv, progname);