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

more fqdn logging. 

use ip address if fqdn cannot be determined.
This commit is contained in:
Doug MacEachern 2004-07-16 20:06:02 +00:00
parent 661af074db
commit 8aa114b220
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/sigar.c
View File

@ -977,6 +977,11 @@ static int fqdn_ip_get(sigar_t *sigar, char *name)
} }
sigar_inet_ntoa(sigar, ifconfig.address, name); sigar_inet_ntoa(sigar, ifconfig.address, name);
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"[fqdn] using ip address '%s' for fqdn",
name);
break; break;
} }
@ -1013,17 +1018,24 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
if (gethostname(name, namelen - 1) != 0) { if (gethostname(name, namelen - 1) != 0) {
sigar_log_printf(sigar, SIGAR_LOG_ERROR, sigar_log_printf(sigar, SIGAR_LOG_ERROR,
"[%s] gethostname failed: %s", "[fqdn] gethostname failed: %s",
SIGAR_FUNC, sigar_strerror(sigar, errno)); sigar_strerror(sigar, errno));
return errno; return errno;
} }
else {
if (SIGAR_LOG_IS_DEBUG(sigar)) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"[fqdn] gethostname() returned: '%s'",
name);
}
}
/* XXX use _r versions of these functions. */ /* XXX use _r versions of these functions. */
if (!(p = gethostbyname(name))) { if (!(p = gethostbyname(name))) {
if (SIGAR_LOG_IS_DEBUG(sigar)) { if (SIGAR_LOG_IS_DEBUG(sigar)) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG, sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"[%s] gethostbyname(%s) failed: %s", "[fqdn] gethostbyname(%s) failed: %s",
SIGAR_FUNC, name, sigar_strerror(sigar, errno)); name, sigar_strerror(sigar, errno));
} }
if (!IS_FQDN(name)) { if (!IS_FQDN(name)) {
@ -1037,10 +1049,14 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
FQDN_SET(p->h_name); FQDN_SET(p->h_name);
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"FQDN resolved using gethostbyname.h_name"); "[fqdn] resolved using gethostbyname.h_name");
return SIGAR_OK; return SIGAR_OK;
} }
else {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"[fqdn] unresolved using gethostbyname.h_name");
}
if (p->h_aliases) { if (p->h_aliases) {
int i; int i;
@ -1050,13 +1066,16 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
FQDN_SET(p->h_aliases[i]); FQDN_SET(p->h_aliases[i]);
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"FQDN resolved using gethostbyname.h_aliases"); "[fqdn] resolved using gethostbyname.h_aliases");
return SIGAR_OK; return SIGAR_OK;
} }
} }
} }
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"[fqdn] unresolved using gethostbyname.h_aliases");
if (p->h_addr_list) { if (p->h_addr_list) {
int i,j; int i,j;
@ -1070,7 +1089,7 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
FQDN_SET(q->h_name); FQDN_SET(q->h_name);
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"FQDN resolved using gethostbyaddr.h_name"); "[fqdn] resolved using gethostbyaddr.h_name");
return SIGAR_OK; return SIGAR_OK;
} }
@ -1080,7 +1099,7 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
FQDN_SET(q->h_aliases[j]); FQDN_SET(q->h_aliases[j]);
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"FQDN resolved using " "[fqdn] resolved using "
"gethostbyaddr.h_aliases"); "gethostbyaddr.h_aliases");
return SIGAR_OK; return SIGAR_OK;
@ -1090,6 +1109,9 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
} }
} }
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
"[fqdn] unresolved using gethostbyname.h_addr_list");
#ifndef WIN32 #ifndef WIN32
if (!IS_FQDN(name) && /* e.g. aix gethostname is already fqdn */ if (!IS_FQDN(name) && /* e.g. aix gethostname is already fqdn */
(getdomainname(domain, sizeof(domain) - 1) == 0) && (getdomainname(domain, sizeof(domain) - 1) == 0) &&
@ -1105,14 +1127,18 @@ SIGAR_DECLARE(int) sigar_fqdn_get(sigar_t *sigar, char *name, int namelen)
SIGAR_STRNCPY(ptr, domain, namelen); SIGAR_STRNCPY(ptr, domain, namelen);
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"FQDN resolved using getdomainname"); "[fqdn] resolved using getdomainname");
} }
else { else {
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"FQDN getdomainname failed"); "[fqdn] getdomainname failed");
} }
#endif #endif
if (!IS_FQDN(name)) {
fqdn_ip_get(sigar, name);
}
return SIGAR_OK; return SIGAR_OK;
} }