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

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2009-08-12 09:42:39 -07:00
parent c007175b21 e3068f466a
commit 1642acc6b0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os/darwin/darwin_sigar.c
View File

@ -2487,7 +2487,11 @@ static int sigar_ifmsg_init(sigar_t *sigar)
return SIGAR_OK; return SIGAR_OK;
} }
static int has_ifaddr(char *name) /**
* @param name name of the interface
* @param name_len length of name (w/o \0)
*/
static int has_ifaddr(char *name, size_t name_len)
{ {
int sock, status; int sock, status;
struct ifreq ifr; struct ifreq ifr;
@ -2495,7 +2499,8 @@ static int has_ifaddr(char *name)
if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
return errno; return errno;
} }
SIGAR_SSTRCPY(ifr.ifr_name, name); strncpy(ifr.ifr_name, name, MIN(sizeof(ifr.ifr_name) - 1, name_len));
ifr.ifr_name[MIN(sizeof(ifr.ifr_name) - 1, name_len)] = '\0';
if (ioctl(sock, SIOCGIFADDR, &ifr) == 0) { if (ioctl(sock, SIOCGIFADDR, &ifr) == 0) {
status = SIGAR_OK; status = SIGAR_OK;
} }
@ -2545,7 +2550,7 @@ static int sigar_ifmsg_iter(sigar_t *sigar, ifmsg_iter_t *iter)
switch (iter->type) { switch (iter->type) {
case IFMSG_ITER_LIST: case IFMSG_ITER_LIST:
if (sdl->sdl_type == IFT_OTHER) { if (sdl->sdl_type == IFT_OTHER) {
if (has_ifaddr(sdl->sdl_data) != SIGAR_OK) { if (has_ifaddr(sdl->sdl_data, sdl->sdl_nlen) != SIGAR_OK) {
break; break;
} }
} }
@ -2566,7 +2571,7 @@ static int sigar_ifmsg_iter(sigar_t *sigar, ifmsg_iter_t *iter)
break; break;
case IFMSG_ITER_GET: case IFMSG_ITER_GET:
if (strEQ(iter->name, sdl->sdl_data)) { if (strlen(iter->name) == sdl->sdl_nlen && 0 == memcmp(iter->name, sdl->sdl_data, sdl->sdl_nlen)) {
iter->data.ifm = ifm; iter->data.ifm = ifm;
return SIGAR_OK; return SIGAR_OK;
} }