* fhandler_procnet.cc (format_procnet_ifinet6): Use sprintf rather than

__small_sprintf.
	* net.cc (if_nametoindex): Prefer IPv6IfIndex over IfIndex for
	consistency with /proc/net/if_inet6.
	(if_indextoname): Ditto.
	(if_nameindex): Ditto.
This commit is contained in:
Corinna Vinschen
2008-06-10 17:24:00 +00:00
parent 58014a9b46
commit 7a2c0a0d6b
3 changed files with 21 additions and 12 deletions

View File

@@ -260,14 +260,14 @@ format_procnet_ifinet6 (char *&filebuf)
filesize += sprintf (filebuf + filesize, "%04x",
ntohs (sin6->sin6_addr.s6_addr16[i]));
filebuf[filesize++] = ' ';
filesize += __small_sprintf (filebuf + filesize,
"%02x %02x %02x %02x %s\n",
pap->IfIndex ?: pap->Ipv6IfIndex,
ip_addr_prefix (pua, pap->FirstPrefix),
((struct sockaddr_in6 *)
pua->Address.lpSockaddr)->sin6_scope_id,
pua->DadState,
pap->AdapterName);
filesize += sprintf (filebuf + filesize,
"%02lx %02x %02x %02x %s\n",
pap->IfIndex ?: pap->Ipv6IfIndex,
ip_addr_prefix (pua, pap->FirstPrefix),
((struct sockaddr_in6 *)
pua->Address.lpSockaddr)->sin6_scope_id,
pua->DadState,
pap->AdapterName);
}
out: