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

change net_info to work if /etc/resolv.conf does not exist

This commit is contained in:
Doug MacEachern 2007-04-05 17:00:28 +00:00
parent a2572d9510
commit e91faa5dbc
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/sigar.c
View File

@ -1220,37 +1220,34 @@ int sigar_net_info_get(sigar_t *sigar,
char buffer[BUFSIZ], *ptr; char buffer[BUFSIZ], *ptr;
FILE *fp; FILE *fp;
if (!(fp = fopen("/etc/resolv.conf", "r"))) {
return errno;
}
SIGAR_ZERO(netinfo); SIGAR_ZERO(netinfo);
while ((ptr = fgets(buffer, sizeof(buffer), fp))) { if ((fp = fopen("/etc/resolv.conf", "r"))) {
int len; while ((ptr = fgets(buffer, sizeof(buffer), fp))) {
int len;
SIGAR_SKIP_SPACE(ptr); SIGAR_SKIP_SPACE(ptr);
if (!(ptr = strstr(ptr, "nameserver"))) { if (!(ptr = strstr(ptr, "nameserver"))) {
continue; continue;
} }
ptr += 10; ptr += 10;
SIGAR_SKIP_SPACE(ptr); SIGAR_SKIP_SPACE(ptr);
len = strlen(ptr); len = strlen(ptr);
ptr[len-1] = '\0'; /* chop \n */ ptr[len-1] = '\0'; /* chop \n */
if (!netinfo->primary_dns[0]) { if (!netinfo->primary_dns[0]) {
SIGAR_SSTRCPY(netinfo->primary_dns, ptr); SIGAR_SSTRCPY(netinfo->primary_dns, ptr);
}
else if (!netinfo->secondary_dns[0]) {
SIGAR_SSTRCPY(netinfo->secondary_dns, ptr);
}
else {
break;
}
} }
else if (!netinfo->secondary_dns[0]) { fclose(fp);
SIGAR_SSTRCPY(netinfo->secondary_dns, ptr); } /* else /etc/resolv.conf may not exist if unplugged (MacOSX) */
}
else {
break;
}
}
fclose(fp);
size = sizeof(netinfo->host_name)-1; size = sizeof(netinfo->host_name)-1;
if (gethostname(netinfo->host_name, size) == 0) { if (gethostname(netinfo->host_name, size) == 0) {