From 972f3855dd520a10195bed862e61877de143fd8d Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Tue, 4 Jul 2006 17:44:13 +0000 Subject: [PATCH] convert net_interface_config to use sigar_net_address_t --- src/os/darwin/darwin_sigar.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index dc7db23b..475e4465 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -1615,26 +1615,31 @@ int sigar_net_interface_config_get(sigar_t *sigar, const char *name, ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr if (!ioctl(sock, SIOCGIFADDR, &ifr)) { - ifconfig->address = ifr_s_addr(ifr); + sigar_net_address_set(ifconfig->address, + ifr_s_addr(ifr)); } if (!ioctl(sock, SIOCGIFNETMASK, &ifr)) { - ifconfig->netmask = ifr_s_addr(ifr); + sigar_net_address_set(ifconfig->netmask, + ifr_s_addr(ifr)); } if (ifconfig->flags & IFF_LOOPBACK) { - ifconfig->destination = ifconfig->address; - ifconfig->broadcast = 0; + sigar_net_address_set(ifconfig->destination, + ifconfig->address.addr.in); + sigar_net_address_set(ifconfig->broadcast, 0); SIGAR_SSTRCPY(ifconfig->type, SIGAR_NIC_LOOPBACK); } else { if (!ioctl(sock, SIOCGIFDSTADDR, &ifr)) { - ifconfig->destination = ifr_s_addr(ifr); + sigar_net_address_set(ifconfig->destination, + ifr_s_addr(ifr)); } if (!ioctl(sock, SIOCGIFBRDADDR, &ifr)) { - ifconfig->broadcast = ifr_s_addr(ifr); + sigar_net_address_set(ifconfig->broadcast, + ifr_s_addr(ifr)); } SIGAR_SSTRCPY(ifconfig->type, SIGAR_NIC_ETHERNET);