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

[SIGAR-20] Unhardcode buffer size used for windows net_interface_list

This commit is contained in:
Doug MacEachern 2006-10-24 02:24:30 +00:00
parent 7f32b812ff
commit 367f890b13
2 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-10-24 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-20] Fix windows sigar_net_inteface_list to handle > 100
interfaces (internal buffer size was fixed at 8k)
2006-10-10 Doug MacEachern <dougm@hyperic.com> 2006-10-10 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-18] Change Linux impl to use strtoull() where appropriate * [SIGAR-18] Change Linux impl to use strtoull() where appropriate

55
src/sigar_win32ish.c
View File

@ -154,10 +154,25 @@ static void hwaddr_lookup(sigar_t *sigar,
#endif /* WIN32 */ #endif /* WIN32 */
static int get_iflist(sigar_t *sigar, char *buffer, DWORD buflen, DWORD *bytes) static int sigar_ioctl_iflist(sigar_t *sigar,
SOCKET sock,
DWORD *bytes)
{
return WSAIoctl(sock,
SIO_GET_INTERFACE_LIST,
NULL,
0,
(void *)sigar->ifconf_buf,
sigar->ifconf_len,
bytes,
NULL,
NULL);
}
static int get_iflist(sigar_t *sigar, DWORD *bytes)
{ {
SOCKET sock = INVALID_SOCKET; SOCKET sock = INVALID_SOCKET;
int status, rc; int status, rc, limit;
#ifdef WIN32 #ifdef WIN32
status = sigar_wsa_init(sigar); status = sigar_wsa_init(sigar);
@ -174,15 +189,22 @@ static int get_iflist(sigar_t *sigar, char *buffer, DWORD buflen, DWORD *bytes)
return WSAGetLastError(); return WSAGetLastError();
} }
rc = WSAIoctl(sock, if (sigar->ifconf_len == 0) {
SIO_GET_INTERFACE_LIST, sigar->ifconf_len = 8192;
NULL, sigar->ifconf_buf = malloc(sigar->ifconf_len);
0, }
(void *)buffer,
buflen, /*
(unsigned int*)bytes, * XXX We can't tell ahead of time what buffer size is required
NULL, * limit just incase.
NULL); */
for (limit=0; limit<100; limit++) {
rc = sigar_ioctl_iflist(sigar, sock, bytes);
if (rc && (WSAGetLastError() == WSAEFAULT)) {
sigar->ifconf_len += (sizeof(INTERFACE_INFO) * 16);
sigar->ifconf_buf = malloc(sigar->ifconf_len);
}
}
status = rc ? WSAGetLastError() : SIGAR_OK; status = rc ? WSAGetLastError() : SIGAR_OK;
@ -196,7 +218,6 @@ sigar_net_interface_config_get(sigar_t *sigar,
const char *name, const char *name,
sigar_net_interface_config_t *ifconfig) sigar_net_interface_config_t *ifconfig)
{ {
char buffer[8192];
DWORD i, num, bytes; DWORD i, num, bytes;
DWORD lo=0, eth=0; DWORD lo=0, eth=0;
int status, type, inst; int status, type, inst;
@ -206,7 +227,7 @@ sigar_net_interface_config_get(sigar_t *sigar,
/* win32 lacks socket ioctls to query given interface. /* win32 lacks socket ioctls to query given interface.
* so we loop through the list to find our made up ifname. * so we loop through the list to find our made up ifname.
*/ */
status = get_iflist(sigar, buffer, sizeof(buffer), &bytes); status = get_iflist(sigar, &bytes);
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
return status; return status;
} }
@ -218,7 +239,7 @@ sigar_net_interface_config_get(sigar_t *sigar,
} }
for (i=0; i<num ; i++) { for (i=0; i<num ; i++) {
if_info = ((INTERFACE_INFO *)buffer) + i; if_info = ((INTERFACE_INFO *)sigar->ifconf_buf) + i;
if (if_info->iiFlags & IFF_LOOPBACK) { if (if_info->iiFlags & IFF_LOOPBACK) {
if ((type == IFTYPE_LO) && (inst == lo)) { if ((type == IFTYPE_LO) && (inst == lo)) {
@ -309,11 +330,10 @@ sigar_net_interface_list_get(sigar_t *sigar,
{ {
char eth[56], lo[56]; char eth[56], lo[56];
int ethcnt=0, locnt=0; int ethcnt=0, locnt=0;
char buffer[8192];
DWORD i, num, bytes; DWORD i, num, bytes;
int status; int status;
status = get_iflist(sigar, buffer, sizeof(buffer), &bytes); status = get_iflist(sigar, &bytes);
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
return status; return status;
} }
@ -326,7 +346,8 @@ sigar_net_interface_list_get(sigar_t *sigar,
malloc(sizeof(*(iflist->data)) * iflist->size); malloc(sizeof(*(iflist->data)) * iflist->size);
for (i=0; i<num ; i++) { for (i=0; i<num ; i++) {
INTERFACE_INFO *if_info = ((INTERFACE_INFO *)buffer) + i; INTERFACE_INFO *if_info =
((INTERFACE_INFO *)sigar->ifconf_buf) + i;
char *name; char *name;
if (if_info->iiFlags & IFF_LOOPBACK) { if (if_info->iiFlags & IFF_LOOPBACK) {