mirror of https://github.com/Icinga/icinga2.git
Fix compiler warnings in Windows plugins
This fixes a bunch of compiler warnings in the Windows plugins.
This commit is contained in:
parent
b878086565
commit
25c2a2bb53
|
@ -317,7 +317,7 @@ bool QueryPerfData(printInfoStruct& pI)
|
||||||
pI.dValue = pDisplayValues[0].FmtValue.longValue;
|
pI.dValue = pDisplayValues[0].FmtValue.longValue;
|
||||||
break;
|
break;
|
||||||
case (PDH_FMT_LARGE):
|
case (PDH_FMT_LARGE):
|
||||||
pI.dValue = pDisplayValues[0].FmtValue.largeValue;
|
pI.dValue = (double) pDisplayValues[0].FmtValue.largeValue;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
pI.dValue = pDisplayValues[0].FmtValue.doubleValue;
|
pI.dValue = pDisplayValues[0].FmtValue.doubleValue;
|
||||||
|
|
|
@ -345,7 +345,7 @@ static int check_ping4(const printInfoStruct& pi, response& response)
|
||||||
QueryPerformanceCounter(&timer2);
|
QueryPerformanceCounter(&timer2);
|
||||||
|
|
||||||
if (((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart) < pi.timeout)
|
if (((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart) < pi.timeout)
|
||||||
Sleep(pi.timeout - ((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart));
|
Sleep((DWORD) (pi.timeout - ((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart)));
|
||||||
} while (--num);
|
} while (--num);
|
||||||
|
|
||||||
if (l_Debug)
|
if (l_Debug)
|
||||||
|
@ -400,82 +400,80 @@ static int check_ping6(const printInfoStruct& pi, response& response)
|
||||||
|
|
||||||
HANDLE hIcmp = Icmp6CreateFile();
|
HANDLE hIcmp = Icmp6CreateFile();
|
||||||
if (hIcmp == INVALID_HANDLE_VALUE) {
|
if (hIcmp == INVALID_HANDLE_VALUE) {
|
||||||
goto die;
|
printErrorInfo(GetLastError());
|
||||||
|
|
||||||
|
if (hIcmp)
|
||||||
|
IcmpCloseHandle(hIcmp);
|
||||||
|
|
||||||
|
if (repBuf)
|
||||||
|
delete reinterpret_cast<BYTE *>(repBuf);
|
||||||
|
|
||||||
|
return 3;
|
||||||
|
} else {
|
||||||
|
IP_OPTION_INFORMATION ipInfo = { 30, 0, 0, 0, NULL };
|
||||||
|
|
||||||
|
LARGE_INTEGER frequency;
|
||||||
|
QueryPerformanceFrequency(&frequency);
|
||||||
|
|
||||||
|
do {
|
||||||
|
LARGE_INTEGER timer1;
|
||||||
|
QueryPerformanceCounter(&timer1);
|
||||||
|
|
||||||
|
if (l_Debug)
|
||||||
|
std::wcout << L"Sending Icmp echo" << '\n';
|
||||||
|
|
||||||
|
if (!Icmp6SendEcho2(hIcmp, NULL, NULL, NULL, &ipSource6, &ipDest6,
|
||||||
|
NULL, 0, &ipInfo, repBuf, dwRepSize, pi.timeout)) {
|
||||||
|
response.dropped++;
|
||||||
|
if (l_Debug)
|
||||||
|
std::wcout << L"Dropped: Response was 0" << '\n';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (l_Debug)
|
||||||
|
std::wcout << "Ping recieved" << '\n';
|
||||||
|
|
||||||
|
Icmp6ParseReplies(repBuf, dwRepSize);
|
||||||
|
|
||||||
|
ICMPV6_ECHO_REPLY *pEchoReply = static_cast<ICMPV6_ECHO_REPLY *>(repBuf);
|
||||||
|
|
||||||
|
if (pEchoReply->Status != IP_SUCCESS) {
|
||||||
|
response.dropped++;
|
||||||
|
if (l_Debug)
|
||||||
|
std::wcout << L"Dropped: echo reply status " << pEchoReply->Status << '\n';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
rtt += pEchoReply->RoundTripTime;
|
||||||
|
|
||||||
|
if (l_Debug)
|
||||||
|
std::wcout << L"Recorded rtt of " << pEchoReply->RoundTripTime << '\n';
|
||||||
|
|
||||||
|
if (response.pMin == 0 || pEchoReply->RoundTripTime < response.pMin)
|
||||||
|
response.pMin = pEchoReply->RoundTripTime;
|
||||||
|
else if (pEchoReply->RoundTripTime > response.pMax)
|
||||||
|
response.pMax = pEchoReply->RoundTripTime;
|
||||||
|
|
||||||
|
LARGE_INTEGER timer2;
|
||||||
|
QueryPerformanceCounter(&timer2);
|
||||||
|
|
||||||
|
if (((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart) < pi.timeout)
|
||||||
|
Sleep((DWORD) (pi.timeout - ((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart)));
|
||||||
|
} while (--num);
|
||||||
|
|
||||||
|
if (l_Debug)
|
||||||
|
std::wcout << L"All pings sent. Cleaning up and returning" << '\n';
|
||||||
|
|
||||||
|
if (hIcmp)
|
||||||
|
IcmpCloseHandle(hIcmp);
|
||||||
|
|
||||||
|
if (repBuf)
|
||||||
|
delete reinterpret_cast<BYTE *>(repBuf);
|
||||||
|
|
||||||
|
response.avg = ((double)rtt / pi.num);
|
||||||
|
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
IP_OPTION_INFORMATION ipInfo = { 30, 0, 0, 0, NULL };
|
|
||||||
|
|
||||||
LARGE_INTEGER frequency;
|
|
||||||
QueryPerformanceFrequency(&frequency);
|
|
||||||
|
|
||||||
do {
|
|
||||||
LARGE_INTEGER timer1;
|
|
||||||
QueryPerformanceCounter(&timer1);
|
|
||||||
|
|
||||||
if (l_Debug)
|
|
||||||
std::wcout << L"Sending Icmp echo" << '\n';
|
|
||||||
|
|
||||||
if (!Icmp6SendEcho2(hIcmp, NULL, NULL, NULL, &ipSource6, &ipDest6,
|
|
||||||
NULL, 0, &ipInfo, repBuf, dwRepSize, pi.timeout)) {
|
|
||||||
response.dropped++;
|
|
||||||
if (l_Debug)
|
|
||||||
std::wcout << L"Dropped: Response was 0" << '\n';
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (l_Debug)
|
|
||||||
std::wcout << "Ping recieved" << '\n';
|
|
||||||
|
|
||||||
Icmp6ParseReplies(repBuf, dwRepSize);
|
|
||||||
|
|
||||||
ICMPV6_ECHO_REPLY *pEchoReply = static_cast<ICMPV6_ECHO_REPLY *>(repBuf);
|
|
||||||
|
|
||||||
if (pEchoReply->Status != IP_SUCCESS) {
|
|
||||||
response.dropped++;
|
|
||||||
if (l_Debug)
|
|
||||||
std::wcout << L"Dropped: echo reply status " << pEchoReply->Status << '\n';
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
rtt += pEchoReply->RoundTripTime;
|
|
||||||
|
|
||||||
if (l_Debug)
|
|
||||||
std::wcout << L"Recorded rtt of " << pEchoReply->RoundTripTime << '\n';
|
|
||||||
|
|
||||||
if (response.pMin == 0 || pEchoReply->RoundTripTime < response.pMin)
|
|
||||||
response.pMin = pEchoReply->RoundTripTime;
|
|
||||||
else if (pEchoReply->RoundTripTime > response.pMax)
|
|
||||||
response.pMax = pEchoReply->RoundTripTime;
|
|
||||||
|
|
||||||
LARGE_INTEGER timer2;
|
|
||||||
QueryPerformanceCounter(&timer2);
|
|
||||||
|
|
||||||
if (((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart) < pi.timeout)
|
|
||||||
Sleep(pi.timeout - ((timer2.QuadPart - timer1.QuadPart) * 1000 / frequency.QuadPart));
|
|
||||||
} while (--num);
|
|
||||||
|
|
||||||
if (l_Debug)
|
|
||||||
std::wcout << L"All pings sent. Cleaning up and returning" << '\n';
|
|
||||||
|
|
||||||
if (hIcmp)
|
|
||||||
IcmpCloseHandle(hIcmp);
|
|
||||||
|
|
||||||
if (repBuf)
|
|
||||||
delete reinterpret_cast<BYTE *>(repBuf);
|
|
||||||
|
|
||||||
response.avg = ((double)rtt / pi.num);
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
die:
|
|
||||||
printErrorInfo(GetLastError());
|
|
||||||
|
|
||||||
if (hIcmp)
|
|
||||||
IcmpCloseHandle(hIcmp);
|
|
||||||
|
|
||||||
if (repBuf)
|
|
||||||
delete reinterpret_cast<BYTE *>(repBuf);
|
|
||||||
|
|
||||||
return 3;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int wmain(int argc, WCHAR **argv)
|
int wmain(int argc, WCHAR **argv)
|
||||||
|
|
|
@ -167,7 +167,7 @@ static std::wstring getServiceByDescription(const std::wstring& description)
|
||||||
EnumServicesStatus(hSCM, SERVICE_WIN32 | SERVICE_DRIVER, SERVICE_STATE_ALL, lpServices, pcbBytesNeeded,
|
EnumServicesStatus(hSCM, SERVICE_WIN32 | SERVICE_DRIVER, SERVICE_STATE_ALL, lpServices, pcbBytesNeeded,
|
||||||
&pcbBytesNeeded, &lpServicesReturned, &lpResumeHandle);
|
&pcbBytesNeeded, &lpServicesReturned, &lpResumeHandle);
|
||||||
|
|
||||||
for (int index = 0; index < lpServicesReturned; index++) {
|
for (decltype(lpServicesReturned) index = 0; index < lpServicesReturned; index++) {
|
||||||
LPWSTR lpCurrent = lpServices[index].lpServiceName;
|
LPWSTR lpCurrent = lpServices[index].lpServiceName;
|
||||||
|
|
||||||
if (l_Debug) {
|
if (l_Debug) {
|
||||||
|
|
|
@ -87,7 +87,7 @@ static int parseArguments(int ac, WCHAR **av, po::variables_map& vm, printInfoSt
|
||||||
L"threshold will be set to one greater than the set warning threshold.\n\n"
|
L"threshold will be set to one greater than the set warning threshold.\n\n"
|
||||||
L"The \"possible-reboot\" option is not recommended since this true for nearly\n"
|
L"The \"possible-reboot\" option is not recommended since this true for nearly\n"
|
||||||
L"every update."
|
L"every update."
|
||||||
, progName, progName);
|
, progName);
|
||||||
std::cout << '\n';
|
std::cout << '\n';
|
||||||
return 0;
|
return 0;
|
||||||
} if (vm.count("version")) {
|
} if (vm.count("version")) {
|
||||||
|
|
|
@ -143,9 +143,9 @@ static int printOutput(printInfoStruct& printInfo)
|
||||||
|
|
||||||
state state = OK;
|
state state = OK;
|
||||||
|
|
||||||
if (printInfo.warn.rend(printInfo.time))
|
if (printInfo.warn.rend((double) printInfo.time))
|
||||||
state = WARNING;
|
state = WARNING;
|
||||||
if (printInfo.crit.rend(printInfo.time))
|
if (printInfo.crit.rend((double) printInfo.time))
|
||||||
state = CRITICAL;
|
state = CRITICAL;
|
||||||
|
|
||||||
switch (state) {
|
switch (state) {
|
||||||
|
|
Loading…
Reference in New Issue