3434#include <sys/ioctl.h>
3535#include <net/if.h>
3636#include <netinet/in.h>
37+ #include <netinet/in6_var.h>
3738#include <arpa/inet.h>
3839
3940#include <sys/time.h>
@@ -158,28 +159,42 @@ int uv_exepath(char* buffer, size_t* size) {
158159
159160int uv_interface_addresses (uv_interface_address_t * * addresses , int * count ) {
160161 uv_interface_address_t * address ;
161- int sockfd , inet6 , size = 1 ;
162+ int sockfd , sock6fd , inet6 , i , r , size = 1 ;
162163 struct ifconf ifc ;
163164 struct ifreq * ifr , * p , flg ;
165+ struct in6_ifreq if6 ;
164166 struct sockaddr_dl * sa_addr ;
165167
168+ ifc .ifc_req = NULL ;
169+ sock6fd = -1 ;
170+ r = 0 ;
166171 * count = 0 ;
167172 * addresses = NULL ;
168173
169174 if (0 > (sockfd = socket (AF_INET , SOCK_DGRAM , IPPROTO_IP ))) {
170- return UV__ERR (errno );
175+ r = UV__ERR (errno );
176+ goto cleanup ;
177+ }
178+
179+ if (0 > (sock6fd = socket (AF_INET6 , SOCK_DGRAM , IPPROTO_IP ))) {
180+ r = UV__ERR (errno );
181+ goto cleanup ;
171182 }
172183
173184 if (ioctl (sockfd , SIOCGSIZIFCONF , & size ) == -1 ) {
174- uv__close ( sockfd );
175- return UV__ERR ( errno ) ;
185+ r = UV__ERR ( errno );
186+ goto cleanup ;
176187 }
177188
178189 ifc .ifc_req = (struct ifreq * )uv__malloc (size );
190+ if (ifc .ifc_req == NULL ) {
191+ r = UV_ENOMEM ;
192+ goto cleanup ;
193+ }
179194 ifc .ifc_len = size ;
180195 if (ioctl (sockfd , SIOCGIFCONF , & ifc ) == -1 ) {
181- uv__close ( sockfd );
182- return UV__ERR ( errno ) ;
196+ r = UV__ERR ( errno );
197+ goto cleanup ;
183198 }
184199
185200#define ADDR_SIZE (p ) MAX((p).sa_len, sizeof(p))
@@ -197,8 +212,8 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
197212
198213 memcpy (flg .ifr_name , p -> ifr_name , sizeof (flg .ifr_name ));
199214 if (ioctl (sockfd , SIOCGIFFLAGS , & flg ) == -1 ) {
200- uv__close ( sockfd );
201- return UV__ERR ( errno ) ;
215+ r = UV__ERR ( errno );
216+ goto cleanup ;
202217 }
203218
204219 if (!(flg .ifr_flags & IFF_UP && flg .ifr_flags & IFF_RUNNING ))
@@ -207,16 +222,14 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
207222 (* count )++ ;
208223 }
209224
210- if (* count == 0 ) {
211- uv__close (sockfd );
212- return 0 ;
213- }
225+ if (* count == 0 )
226+ goto cleanup ;
214227
215228 /* Alloc the return interface structs */
216- * addresses = uv__malloc (* count * sizeof (uv_interface_address_t ));
229+ * addresses = uv__calloc (* count , sizeof (* * addresses ));
217230 if (!(* addresses )) {
218- uv__close ( sockfd ) ;
219- return UV_ENOMEM ;
231+ r = UV_ENOMEM ;
232+ goto cleanup ;
220233 }
221234 address = * addresses ;
222235
@@ -233,10 +246,8 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
233246 inet6 = (p -> ifr_addr .sa_family == AF_INET6 );
234247
235248 memcpy (flg .ifr_name , p -> ifr_name , sizeof (flg .ifr_name ));
236- if (ioctl (sockfd , SIOCGIFFLAGS , & flg ) == -1 ) {
237- uv__close (sockfd );
238- return UV_ENOSYS ;
239- }
249+ if (ioctl (sockfd , SIOCGIFFLAGS , & flg ) == -1 )
250+ goto syserror ;
240251
241252 if (!(flg .ifr_flags & IFF_UP && flg .ifr_flags & IFF_RUNNING ))
242253 continue ;
@@ -250,28 +261,67 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
250261 else
251262 address -> address .address4 = * ((struct sockaddr_in * ) & p -> ifr_addr );
252263
253- sa_addr = (struct sockaddr_dl * ) & p -> ifr_addr ;
254- memcpy (address -> phys_addr , LLADDR (sa_addr ), sizeof (address -> phys_addr ));
255-
256- if (ioctl (sockfd , SIOCGIFNETMASK , p ) == -1 ) {
257- uv__close (sockfd );
258- return UV_ENOSYS ;
259- }
260-
261- if (inet6 )
262- address -> netmask .netmask6 = * ((struct sockaddr_in6 * ) & p -> ifr_addr );
263- else
264+ if (inet6 ) {
265+ memset (& if6 , 0 , sizeof (if6 ));
266+ r = uv__strscpy (if6 .ifr_name , p -> ifr_name , sizeof (if6 .ifr_name ));
267+ if (r == UV_E2BIG )
268+ goto cleanup ;
269+ r = 0 ;
270+ memcpy (& if6 .ifr_Addr , & p -> ifr_addr , sizeof (if6 .ifr_Addr ));
271+ if (ioctl (sock6fd , SIOCGIFNETMASK6 , & if6 ) == -1 )
272+ goto syserror ;
273+ address -> netmask .netmask6 = * ((struct sockaddr_in6 * ) & if6 .ifr_Addr );
274+ /* Explicitly set family as the ioctl call appears to return it as 0. */
275+ address -> netmask .netmask6 .sin6_family = AF_INET6 ;
276+ } else {
277+ if (ioctl (sockfd , SIOCGIFNETMASK , p ) == -1 )
278+ goto syserror ;
264279 address -> netmask .netmask4 = * ((struct sockaddr_in * ) & p -> ifr_addr );
280+ /* Explicitly set family as the ioctl call appears to return it as 0. */
281+ address -> netmask .netmask4 .sin_family = AF_INET ;
282+ }
265283
266284 address -> is_internal = flg .ifr_flags & IFF_LOOPBACK ? 1 : 0 ;
267285
268286 address ++ ;
269287 }
270288
289+ /* Fill in physical addresses. */
290+ ifr = ifc .ifc_req ;
291+ while ((char * )ifr < (char * )ifc .ifc_req + ifc .ifc_len ) {
292+ p = ifr ;
293+ ifr = (struct ifreq * )
294+ ((char * )ifr + sizeof (ifr -> ifr_name ) + ADDR_SIZE (ifr -> ifr_addr ));
295+
296+ if (p -> ifr_addr .sa_family != AF_LINK )
297+ continue ;
298+
299+ address = * addresses ;
300+ for (i = 0 ; i < * count ; i ++ ) {
301+ if (strcmp (address -> name , p -> ifr_name ) == 0 ) {
302+ sa_addr = (struct sockaddr_dl * ) & p -> ifr_addr ;
303+ memcpy (address -> phys_addr , LLADDR (sa_addr ), sizeof (address -> phys_addr ));
304+ }
305+ address ++ ;
306+ }
307+ }
308+
271309#undef ADDR_SIZE
310+ goto cleanup ;
272311
273- uv__close (sockfd );
274- return 0 ;
312+ syserror :
313+ uv_free_interface_addresses (* addresses , * count );
314+ * addresses = NULL ;
315+ * count = 0 ;
316+ r = UV_ENOSYS ;
317+
318+ cleanup :
319+ if (sockfd != -1 )
320+ uv__close (sockfd );
321+ if (sock6fd != -1 )
322+ uv__close (sock6fd );
323+ uv__free (ifc .ifc_req );
324+ return r ;
275325}
276326
277327
0 commit comments