2007-01-24 Corinna Vinschen <corinna@vinschen.de>
+ * net.cc (if_nametoindex): This time, really free IP_ADAPTER_ADDRESSES
+ memory.
+ (if_indextoname): Ditto.
+
+2007-01-24 Corinna Vinschen <corinna@vinschen.de>
+
* security.h (pop_thread_privilege): Revert to previous state, not
to token used for impersonation.
extern "C" unsigned
if_nametoindex (const char *name)
{
- PIP_ADAPTER_ADDRESSES pap = NULL;
+ PIP_ADAPTER_ADDRESSES pa0 = NULL, pap;
unsigned index = 0;
myfault efault;
strncat (lname, name, IF_NAMESIZE - 1);
if (lname[0] == '{' && (c = strchr (lname, ':')))
*c = '\0';
- for (; pap; pap = pap->Next)
+ for (pap = pa0; pap; pap = pap->Next)
if (strcasematch (lname, pap->AdapterName))
{
index = pap->IfIndex;
break;
}
- free (pap);
+ free (pa0);
}
return index;
}
extern "C" char *
if_indextoname (unsigned ifindex, char *ifname)
{
- PIP_ADAPTER_ADDRESSES pap = NULL;
+ PIP_ADAPTER_ADDRESSES pa0 = NULL, pap;
char *name = NULL;
myfault efault;
return NULL;
if (wincap.has_gaa_prefixes ()
- && get_adapters_addresses (&pap, AF_UNSPEC))
+ && get_adapters_addresses (&pa0, AF_UNSPEC))
{
- for (; pap; pap = pap->Next)
+ for (pap = pa0; pap; pap = pap->Next)
if (ifindex == pap->IfIndex)
{
name = strcpy (ifname, pap->AdapterName);
break;
}
- free (pap);
+ free (pa0);
}
else
set_errno (ENXIO);