libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* net.cc (get_2k_ifconf): Change multiple IP address naming scheme 

to Linux style.

	Patch by Alexander Gottwald <ago@informatik.tu-chemnitz.de>:
        * net.cc (get_2k_ifconf): Added support for multiple IP addresses on
        one interface.
This commit is contained in:
Corinna Vinschen 2001-10-22 12:23:33 +00:00
parent 8b6234ca12
commit c270dc2555
2 changed files with 98 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
2001-10-22 Corinna Vinschen <corinna@vinschen.de>
* net.cc (get_2k_ifconf): Change multiple IP address naming scheme
to Linux style.
Sun Oct 21 19:04:37 2001 Alexander Gottwald <ago@informatik.tu-chemnitz.de>
* net.cc (get_2k_ifconf): Added support for multiple IP addresses on
one interface.
2001-10-22 Corinna Vinschen <corinna@vinschen.de> 2001-10-22 Corinna Vinschen <corinna@vinschen.de>
* miscfuncs.cc (__check_invalid_read_ptr_errno): Return error, if any. * miscfuncs.cc (__check_invalid_read_ptr_errno): Return error, if any.

22
winsup/cygwin/net.cc
View File

@ -1551,7 +1551,7 @@ static void
get_2k_ifconf (struct ifconf *ifc, int what) get_2k_ifconf (struct ifconf *ifc, int what)
{ {
int cnt = 0; int cnt = 0;
char eth[2] = "/", ppp[2] = "/", slp[2] = "/"; char eth[2] = "/", ppp[2] = "/", slp[2] = "/", sub[2] = "0";
/* Union maps buffer to correct struct */ /* Union maps buffer to correct struct */
struct ifreq *ifr = ifc->ifc_req; struct ifreq *ifr = ifc->ifc_req;
@ -1571,11 +1571,21 @@ get_2k_ifconf (struct ifconf *ifc, int what)
!GetIfTable(ift, &siz_if_table, TRUE) && !GetIfTable(ift, &siz_if_table, TRUE) &&
!GetIpAddrTable(ipt, &siz_ip_table, TRUE)) !GetIpAddrTable(ipt, &siz_ip_table, TRUE))
{ {
/* Iterate over all known interfaces */
for (if_cnt = 0; if_cnt < ift->dwNumEntries; ++if_cnt) for (if_cnt = 0; if_cnt < ift->dwNumEntries; ++if_cnt)
{ {
*sub = '0';
/* Iterate over all configured IP-addresses */
for (ip_cnt = 0; ip_cnt < ipt->dwNumEntries; ++ip_cnt)
{
/* Does the IP address belong to the interface? */
if (ipt->table[ip_cnt].dwIndex == ift->table[if_cnt].dwIndex)
{
/* Setup the interface name */
switch (ift->table[if_cnt].dwType) switch (ift->table[if_cnt].dwType)
{ {
case MIB_IF_TYPE_ETHERNET: case MIB_IF_TYPE_ETHERNET:
if (*sub == '0')
++*eth; ++*eth;
strcpy (ifr->ifr_name, "eth"); strcpy (ifr->ifr_name, "eth");
strcat (ifr->ifr_name, eth); strcat (ifr->ifr_name, eth);
@ -1596,9 +1606,13 @@ get_2k_ifconf (struct ifconf *ifc, int what)
default: default:
continue; continue;
} }
for (ip_cnt = 0; ip_cnt < ipt->dwNumEntries; ++ip_cnt) if (*sub > '0')
if (ipt->table[ip_cnt].dwIndex == ift->table[if_cnt].dwIndex)
{ {
strcat (ifr->ifr_name, ":");
strcat (ifr->ifr_name, sub);
}
++*sub;
/* setup sockaddr struct */
switch (what) switch (what)
{ {
case SIOCGIFCONF: case SIOCGIFCONF:
@ -1647,7 +1661,7 @@ get_2k_ifconf (struct ifconf *ifc, int what)
if ((caddr_t) ++ifr > if ((caddr_t) ++ifr >
ifc->ifc_buf + ifc->ifc_len - sizeof (struct ifreq)) ifc->ifc_buf + ifc->ifc_len - sizeof (struct ifreq))
goto done; goto done;
break; }
} }
} }
} }