oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(getifaddrs2): copy the entire sockaddr

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9554 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-01-28 23:02:46 +00:00
parent 81fbeb826f
commit 40119c91a7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/roken/getifaddrs.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 2000 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -116,15 +116,19 @@ getifaddrs2(struct ifaddrs **ifap,
p += sz) { p += sz) {
struct ifreq ifreq; struct ifreq ifreq;
struct sockaddr *sa; struct sockaddr *sa;
size_t salen;
ifr = (struct ifreq *)p; ifr = (struct ifreq *)p;
sa = &ifr->ifr_addr; sa = &ifr->ifr_addr;
sz = ifreq_sz; sz = ifreq_sz;
salen = sizeof(struct sockaddr);
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
salen = sa->sa_len;
sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len); sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len);
#endif #endif
#ifdef SA_LEN #ifdef SA_LEN
salen = SA_LEN(sa);
sz = max(sz, sizeof(ifr->ifr_name) + SA_LEN(sa)); sz = max(sz, sizeof(ifr->ifr_name) + SA_LEN(sa));
#endif #endif
memset (&ifreq, 0, sizeof(ifreq)); memset (&ifreq, 0, sizeof(ifreq));
@@ -140,8 +144,8 @@ getifaddrs2(struct ifaddrs **ifap,
(*end)->ifa_next = NULL; (*end)->ifa_next = NULL;
(*end)->ifa_name = strdup(ifr->ifr_name); (*end)->ifa_name = strdup(ifr->ifr_name);
(*end)->ifa_flags = ifreq.ifr_flags; (*end)->ifa_flags = ifreq.ifr_flags;
(*end)->ifa_addr = malloc(sizeof(*sa)); (*end)->ifa_addr = malloc(salen);
memcpy((*end)->ifa_addr, sa, sizeof(*sa)); memcpy((*end)->ifa_addr, sa, salen);
(*end)->ifa_netmask = NULL; (*end)->ifa_netmask = NULL;
#if 0 #if 0