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

SIGAR_NETIF_NAME_SHORT=1 env var will use the old eth%d names in sigar_net_interface_list_get

This commit is contained in:
Doug MacEachern 2011-04-12 15:28:01 -07:00
parent 73c3c287f7
commit 59aeadaef2
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/os/win32/sigar_os.h
View File

@ -589,6 +589,7 @@ struct sigar_t {
sigar_cache_t *netif_mib_rows; sigar_cache_t *netif_mib_rows;
sigar_cache_t *netif_addr_rows; sigar_cache_t *netif_addr_rows;
sigar_cache_t *netif_names; /* dwIndex -> net_interface_config.name */ sigar_cache_t *netif_names; /* dwIndex -> net_interface_config.name */
int netif_name_short;
WORD ws_version; WORD ws_version;
int ws_error; int ws_error;

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

@ -526,6 +526,19 @@ static int sigar_enable_privilege(char *name)
return status; return status;
} }
static int netif_name_short(void)
{
char value[32767]; /* max size from msdn docs */
DWORD retval =
GetEnvironmentVariable("SIGAR_NETIF_NAME_SHORT", value, sizeof(value));
if ((retval > 0) && (strEQ(value, "1") || (strEQ(value, "true")))) {
return 1;
}
else {
return 0;
}
}
int sigar_os_open(sigar_t **sigar_ptr) int sigar_os_open(sigar_t **sigar_ptr)
{ {
LONG result; LONG result;
@ -586,6 +599,8 @@ int sigar_os_open(sigar_t **sigar_ptr)
sigar->netif_addr_rows = NULL; sigar->netif_addr_rows = NULL;
sigar->netif_adapters = NULL; sigar->netif_adapters = NULL;
sigar->netif_names = NULL; sigar->netif_names = NULL;
sigar->netif_name_short = netif_name_short();
sigar->pinfo.pid = -1; sigar->pinfo.pid = -1;
sigar->ws_version = 0; sigar->ws_version = 0;
sigar->lcpu = -1; sigar->lcpu = -1;
@ -2748,7 +2763,9 @@ sigar_net_interface_list_get(sigar_t *sigar,
sprintf(name, NETIF_LA "%d", la++); sprintf(name, NETIF_LA "%d", la++);
} }
else if (ifr->dwType == MIB_IF_TYPE_LOOPBACK) { else if (ifr->dwType == MIB_IF_TYPE_LOOPBACK) {
if (!sigar->netif_name_short) {
status = sigar_net_interface_name_get(sigar, ifr, address_list, name); status = sigar_net_interface_name_get(sigar, ifr, address_list, name);
}
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
sprintf(name, "lo%d", lo++); sprintf(name, "lo%d", lo++);
} }
@ -2756,16 +2773,22 @@ sigar_net_interface_list_get(sigar_t *sigar,
else if ((ifr->dwType == MIB_IF_TYPE_ETHERNET) || else if ((ifr->dwType == MIB_IF_TYPE_ETHERNET) ||
(ifr->dwType == IF_TYPE_IEEE80211)) (ifr->dwType == IF_TYPE_IEEE80211))
{ {
if ((strstr(ifr->bDescr, "Scheduler") == NULL) && if (!sigar->netif_name_short &&
(strstr(ifr->bDescr, "Scheduler") == NULL) &&
(strstr(ifr->bDescr, "Filter") == NULL)) (strstr(ifr->bDescr, "Filter") == NULL))
{ {
status = sigar_net_interface_name_get(sigar, ifr, address_list, name); status = sigar_net_interface_name_get(sigar, ifr, address_list, name);
} }
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
if (sigar->netif_name_short) {
sprintf(name, "eth%d", eth++);
}
else {
snprintf(name, ifr->dwDescrLen, "%s", ifr->bDescr); snprintf(name, ifr->dwDescrLen, "%s", ifr->bDescr);
} }
} }
}
else { else {
continue; /*XXX*/ continue; /*XXX*/
} }