summaryrefslogtreecommitdiffstats
path: root/plugins-root
diff options
context:
space:
mode:
authorLorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>2023-07-11 21:08:31 (GMT)
committerGitHub <noreply@github.com>2023-07-11 21:08:31 (GMT)
commite4b6e83264e7f948a868d89229c28bcccd98699f (patch)
treed5046000910b42d18c6fe42634f9cec9e96d9c0e /plugins-root
parent9ef6660cab8eb2b017323b9e000cb3560f07886b (diff)
parent65aa35d1afdea2570309efc7a08050504a53f091 (diff)
downloadmonitoring-plugins-e4b6e83264e7f948a868d89229c28bcccd98699f.tar.gz
Merge branch 'master' into compiler_warning_part_6refs/pull/1871/head
Diffstat (limited to 'plugins-root')
-rw-r--r--plugins-root/check_dhcp.c12
-rw-r--r--plugins-root/check_icmp.c5
2 files changed, 11 insertions, 6 deletions
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 147db6b..2d22619 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -229,7 +229,7 @@ struct in_addr requested_address;
229 229
230int process_arguments(int, char **); 230int process_arguments(int, char **);
231int call_getopt(int, char **); 231int call_getopt(int, char **);
232int validate_arguments(int, int); 232int validate_arguments(int);
233void print_usage(void); 233void print_usage(void);
234void print_help(void); 234void print_help(void);
235 235
@@ -1055,8 +1055,8 @@ int process_arguments(int argc, char **argv){
1055 return ERROR; 1055 return ERROR;
1056 1056
1057 arg_index = call_getopt(argc,argv); 1057 arg_index = call_getopt(argc,argv);
1058 return validate_arguments(argc,arg_index); 1058 return validate_arguments(argc);
1059 } 1059}
1060 1060
1061 1061
1062 1062
@@ -1154,13 +1154,13 @@ int call_getopt(int argc, char **argv){
1154 } 1154 }
1155 1155
1156 1156
1157int validate_arguments(int argc, int arg_index){ 1157int validate_arguments(int argc){
1158 1158
1159 if(argc-optind > 0) 1159 if(argc - optind > 0)
1160 usage(_("Got unexpected non-option argument")); 1160 usage(_("Got unexpected non-option argument"));
1161 1161
1162 return OK; 1162 return OK;
1163 } 1163}
1164 1164
1165 1165
1166#if defined(__sun__) || defined(__solaris__) || defined(__hpux__) 1166#if defined(__sun__) || defined(__solaris__) || defined(__hpux__)
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 9ceb35b..1d47e9f 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1432,15 +1432,20 @@ get_ip_address(const char *ifname)
1432{ 1432{
1433 // TODO: Rewrite this so the function return an error and we exit somewhere else 1433 // TODO: Rewrite this so the function return an error and we exit somewhere else
1434 struct sockaddr_in ip; 1434 struct sockaddr_in ip;
1435 ip.sin_addr.s_addr = 0; // Fake initialization to make compiler happy
1435#if defined(SIOCGIFADDR) 1436#if defined(SIOCGIFADDR)
1436 struct ifreq ifr; 1437 struct ifreq ifr;
1437 1438
1438 strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); 1439 strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
1440
1439 ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; 1441 ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
1442
1440 if(ioctl(icmp_sock, SIOCGIFADDR, &ifr) == -1) 1443 if(ioctl(icmp_sock, SIOCGIFADDR, &ifr) == -1)
1441 crash("Cannot determine IP address of interface %s", ifname); 1444 crash("Cannot determine IP address of interface %s", ifname);
1445
1442 memcpy(&ip, &ifr.ifr_addr, sizeof(ip)); 1446 memcpy(&ip, &ifr.ifr_addr, sizeof(ip));
1443#else 1447#else
1448 (void) ifname;
1444 errno = 0; 1449 errno = 0;
1445 crash("Cannot get interface IP address on this platform."); 1450 crash("Cannot get interface IP address on this platform.");
1446#endif 1451#endif