bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-use ifconf_buf for GetAdaptersInfo

This commit is contained in:
Doug MacEachern 2005-12-21 02:31:06 +00:00
parent 0d2a149924
commit 361af1a2cf
1 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/os/win32/win32_sigar.c
View File

@ -1725,9 +1725,45 @@ SIGAR_DECLARE(int) sigar_cpu_info_list_get(sigar_t *sigar,
#define sigar_GetAdaptersInfo \ #define sigar_GetAdaptersInfo \
sigar->iphlpapi.get_adapters_info.func sigar->iphlpapi.get_adapters_info.func
static int sigar_get_adapters_info(sigar_t *sigar)
{
ULONG size = sigar->ifconf_len;
DWORD rc;
DLLMOD_INIT(iphlpapi, FALSE);
if (!sigar_GetAdaptersInfo) {
return SIGAR_ENOTIMPL;
}
rc = sigar_GetAdaptersInfo((PIP_ADAPTER_INFO)sigar->ifconf_buf,
&size);
if (rc == ERROR_BUFFER_OVERFLOW) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"GetAdaptersInfo "
"realloc ifconf_buf old=%d, new=%d",
sigar->ifconf_len, size);
sigar->ifconf_len = size;
sigar->ifconf_buf = realloc(sigar->ifconf_buf,
sigar->ifconf_len);
rc = sigar_GetAdaptersInfo((PIP_ADAPTER_INFO)sigar->ifconf_buf,
&size);
}
if (rc != NO_ERROR) {
return GetLastError();
}
else {
return SIGAR_OK;
}
}
SIGAR_DECLARE(int) sigar_net_info_get(sigar_t *sigar, SIGAR_DECLARE(int) sigar_net_info_get(sigar_t *sigar,
sigar_net_info_t *netinfo) sigar_net_info_t *netinfo)
{ {
PIP_ADAPTER_INFO adapter;
FIXED_INFO *info; FIXED_INFO *info;
ULONG len = 0; ULONG len = 0;
IP_ADDR_STRING *ip; IP_ADDR_STRING *ip;
@ -1765,40 +1801,25 @@ SIGAR_DECLARE(int) sigar_net_info_get(sigar_t *sigar,
free(info); free(info);
if (sigar_GetAdaptersInfo) { if (sigar_get_adapters_info(sigar) != SIGAR_OK) {
PIP_ADAPTER_INFO buffer, info; return SIGAR_OK;
len = 0;
rc = sigar_GetAdaptersInfo(NULL, &len);
if (rc != ERROR_BUFFER_OVERFLOW) {
return rc;
}
buffer = malloc(len);
rc = sigar_GetAdaptersInfo(buffer, &len);
if (rc != NO_ERROR) {
free(buffer);
return rc;
} }
info = buffer; adapter = (PIP_ADAPTER_INFO)sigar->ifconf_buf;
while (info) { while (adapter) {
/* should only be 1 */ /* should only be 1 */
if (info->GatewayList.IpAddress.String[0]) { if (adapter->GatewayList.IpAddress.String[0]) {
SIGAR_SSTRCPY(netinfo->default_gateway, SIGAR_SSTRCPY(netinfo->default_gateway,
info->GatewayList.IpAddress.String); adapter->GatewayList.IpAddress.String);
} }
#if 0 #if 0
if (info->DhcpEnabled) { if (apapters->DhcpEnabled) {
SIGAR_SSTRCPY(netinfo->dhcp_server, SIGAR_SSTRCPY(netinfo->dhcp_server,
info->DhcpServer.IpAddress.String); apdaters->DhcpServer.IpAddress.String);
} }
#endif #endif
info = info->Next; adapter = adapter->Next;
}
free(buffer);
} }
return SIGAR_OK; return SIGAR_OK;
@ -1883,6 +1904,7 @@ static int sigar_get_if_table(sigar_t *sigar)
if (rc == ERROR_INSUFFICIENT_BUFFER) { if (rc == ERROR_INSUFFICIENT_BUFFER) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG, sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"GetIfTable "
"realloc ifconf_buf old=%d, new=%d", "realloc ifconf_buf old=%d, new=%d",
sigar->ifconf_len, size); sigar->ifconf_len, size);
sigar->ifconf_len = size; sigar->ifconf_len = size;