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

* autoload.cc (GetIpForwardTable): Define.

Browse Source 
* fhandler_socket.cc (fhandler_socket::ioctl): Handle SIOCGIFDSTADDR.
	* net.cc (get_routedst): New static function to get destination
	address of point-to-point interfaces.
	(get_xp_ifconf): Handle SIOCGIFDSTADDR.
	(get_2k_ifconf): Ditto.
	(get_nt_ifconf): Ditto.
	(get_ifconf): Ditto.
	* include/asm/socket.h (SIOCGIFDSTADDR): Define.
	* include/cygwin/if.h (struct ifreq): Add ifru_dstaddr member.
	(ifr_dstaddr): Define.
	* include/cygwin/in.h: Cast ipv4 addresses correctly to in_addr_t in
	definitions.
This commit is contained in:
Corinna Vinschen
2007-06-14 16:02:32 +00:00
parent 28826d8fb1
commit 8e4a60b383
7 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
winsup/cygwin/net.cc
View File

@@ -1285,6 +1285,23 @@ convert_ifr_flags (u_long ws_flags)
| ((ws_flags & WS_IFF_MULTICAST) << 8);
}
static u_long
get_routedst (DWORD if_index)
{
PMIB_IPFORWARDTABLE pift;
ULONG size = 0;
if (GetIpForwardTable (NULL, &size, FALSE) == ERROR_INSUFFICIENT_BUFFER
&& (pift = (PMIB_IPFORWARDTABLE) alloca (size))
&& GetIpForwardTable (pift, &size, FALSE) == NO_ERROR)
for (DWORD i = 0; i < pift->dwNumEntries; ++i)
{
if (pift->table[i].dwForwardIfIndex == if_index
&& pift->table[i].dwForwardMask == INADDR_BROADCAST)
return pift->table[i].dwForwardDest;
}
return INADDR_ANY;
}
/*
* IFCONF XP SP1 and above.
* Use IP Helpper function GetAdaptersAddresses.
@@ -1364,6 +1381,20 @@ get_xp_ifconf (SOCKET s, struct ifconf *ifc, int what)
&iie[iinf_idx].iiBroadcastAddress.AddressIn,
sizeof (struct sockaddr_in));
break;
case SIOCGIFDSTADDR:
if (pap->IfType == IF_TYPE_PPP)
{
struct sockaddr_in *sa = (struct sockaddr_in *)
&ifr->ifr_dstaddr;
sa->sin_addr.s_addr = get_routedst (pap->IfIndex);
sa->sin_family = AF_INET;
sa->sin_port = 0;
}
else
memcpy (&ifr->ifr_addr,
&iie[iinf_idx].iiAddress.AddressIn,
sizeof (struct sockaddr_in));
break;
case SIOCGIFNETMASK:
memcpy (&ifr->ifr_netmask,
&iie[iinf_idx].iiNetmask.AddressIn,
@@ -1565,6 +1596,17 @@ get_2k_ifconf (struct ifconf *ifc, int what)
sa->sin_port = 0;
#endif
break;
case SIOCGIFDSTADDR:
sa = (struct sockaddr_in *) &ifr->ifr_dstaddr;
if (ifrow->dwType == MIB_IF_TYPE_PPP
|| ifrow->dwType == MIB_IF_TYPE_SLIP)
sa->sin_addr.s_addr =
get_routedst (ipt->table[ip_cnt].dwIndex);
else
sa->sin_addr.s_addr = ipt->table[ip_cnt].dwAddr;
sa->sin_family = AF_INET;
sa->sin_port = 0;
break;
case SIOCGIFNETMASK:
sa = (struct sockaddr_in *) &ifr->ifr_netmask;
sa->sin_addr.s_addr = ipt->table[ip_cnt].dwMask;
@@ -1719,6 +1761,7 @@ get_nt_ifconf (struct ifconf *ifc, int what)
break;
case SIOCGIFCONF:
case SIOCGIFADDR:
case SIOCGIFDSTADDR:
sa = (struct sockaddr_in *) &ifr->ifr_addr;
sa->sin_addr.s_addr =
cygwin_inet_addr (dhcpaddress);
@@ -1766,6 +1809,7 @@ get_nt_ifconf (struct ifconf *ifc, int what)
break;
case SIOCGIFCONF:
case SIOCGIFADDR:
case SIOCGIFDSTADDR:
sa = (struct sockaddr_in *) &ifr->ifr_addr;
sa->sin_addr.s_addr = cygwin_inet_addr (ip);
sa->sin_family = AF_INET;
@@ -1845,6 +1889,7 @@ get_ifconf (SOCKET s, struct ifconf *ifc, int what)
break;
case SIOCGIFCONF:
case SIOCGIFADDR:
case SIOCGIFDSTADDR:
sa = (struct sockaddr_in *) &ifr->ifr_addr;
sa->sin_addr.s_addr = htonl (INADDR_LOOPBACK);
sa->sin_family = AF_INET;