JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* net.cc (if_nametoindex): Free IP_ADAPTER_ADDRESSES memory.

Browse Source 
(if_indextoname): Ditto.
	(if_nameindex): Ditto.  Remove duplicate indexed entries in result.
This commit is contained in:
Corinna Vinschen 2007-01-23 09:23:54 +00:00
parent bff4389137
commit 4b13fd15d4
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-23 Corinna Vinschen <corinna@vinschen.de>
* net.cc (if_nametoindex): Free IP_ADAPTER_ADDRESSES memory.
(if_indextoname): Ditto.
(if_nameindex): Ditto. Remove duplicate indexed entries in result.
2007-01-21 Corinna Vinschen <corinna@vinschen.de> 2007-01-21 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (WSAIoctl): Define. * autoload.cc (WSAIoctl): Define.

53
winsup/cygwin/net.cc
View File

@ -2092,6 +2092,7 @@ extern "C" unsigned
if_nametoindex (const char *name) if_nametoindex (const char *name)
{ {
PIP_ADAPTER_ADDRESSES pap = NULL; PIP_ADAPTER_ADDRESSES pap = NULL;
unsigned index = 0;
myfault efault; myfault efault;
if (efault.faulted (EFAULT)) if (efault.faulted (EFAULT))
@ -2108,15 +2109,20 @@ if_nametoindex (const char *name)
*c = '\0'; *c = '\0';
for (; pap; pap = pap->Next) for (; pap; pap = pap->Next)
if (strcasematch (lname, pap->AdapterName)) if (strcasematch (lname, pap->AdapterName))
return pap->IfIndex; {
index = pap->IfIndex;
break;
}
free (pap);
} }
return 0; return index;
} }
extern "C" char * extern "C" char *
if_indextoname (unsigned ifindex, char *ifname) if_indextoname (unsigned ifindex, char *ifname)
{ {
PIP_ADAPTER_ADDRESSES pap = NULL; PIP_ADAPTER_ADDRESSES pap = NULL;
char *name = NULL;
myfault efault; myfault efault;
if (efault.faulted (EFAULT)) if (efault.faulted (EFAULT))
@ -2128,12 +2134,14 @@ if_indextoname (unsigned ifindex, char *ifname)
for (; pap; pap = pap->Next) for (; pap; pap = pap->Next)
if (ifindex == pap->IfIndex) if (ifindex == pap->IfIndex)
{ {
strcpy (ifname, pap->AdapterName); name = strcpy (ifname, pap->AdapterName);
return ifname; break;
} }
free (pap);
} }
set_errno (ENXIO); else
return NULL; set_errno (ENXIO);
return name;
} }
extern "C" struct if_nameindex * extern "C" struct if_nameindex *
@ -2157,22 +2165,29 @@ if_nameindex (void)
malloc ((cnt + 1) * sizeof (struct if_nameindex) malloc ((cnt + 1) * sizeof (struct if_nameindex)
+ cnt * IF_NAMESIZE); + cnt * IF_NAMESIZE);
if (!iflist) if (!iflist)
set_errno (ENOBUFS);
else
{ {
set_errno (ENOBUFS); ifnamelist = (char (*)[IF_NAMESIZE]) (iflist + cnt + 1);
return NULL; for (pap = pa0, cnt = 0; pap; pap = pap->Next)
{
for (int i = 0; i < cnt; ++i)
if (iflist[i].if_index == (pap->IfIndex ?: pap->Ipv6IfIndex))
goto outer_loop;
iflist[cnt].if_index = pap->IfIndex ?: pap->Ipv6IfIndex;
strcpy (iflist[cnt].if_name = ifnamelist[cnt], pap->AdapterName);
++cnt;
outer_loop:
;
}
iflist[cnt].if_index = 0;
iflist[cnt].if_name = NULL;
} }
ifnamelist = (char (*)[IF_NAMESIZE]) (iflist + cnt + 1); free (pa0);
for (pap = pa0, cnt = 0; pap; pap = pap->Next, ++cnt)
{
iflist[cnt].if_index = pap->IfIndex ?: pap->Ipv6IfIndex;
strcpy (iflist[cnt].if_name = ifnamelist[cnt], pap->AdapterName);
}
iflist[cnt].if_index = 0;
iflist[cnt].if_name = NULL;
return iflist;
} }
set_errno (ENXIO); else
return NULL; set_errno (ENXIO);
return iflist;
} }
extern "C" void extern "C" void