diff options
author | Christopher Faylor <me@cgf.cx> | 2007-07-07 16:43:03 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2007-07-07 16:43:03 +0000 |
commit | 7b44665a7bb37b22de9b1ffccb49875e85f2fafc (patch) | |
tree | 500439e0a2e839e4f8fc118f0e319b5394b1da95 /winsup/cygwin/net.cc | |
parent | a5a0080d9c1a0d2a964ed05a09685a14396acb66 (diff) | |
download | newlib-7b44665a7bb37b22de9b1ffccb49875e85f2fafc.zip newlib-7b44665a7bb37b22de9b1ffccb49875e85f2fafc.tar.gz newlib-7b44665a7bb37b22de9b1ffccb49875e85f2fafc.tar.bz2 |
* fork.cc: White space.
* net.cc: Ditto.
* posix_ipc.cc: Ditto.
Diffstat (limited to 'winsup/cygwin/net.cc')
-rw-r--r-- | winsup/cygwin/net.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 59e290c..d8f648e 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -1296,7 +1296,7 @@ get_routedst (DWORD if_index) && GetIpForwardTable (pift, &size, FALSE) == NO_ERROR) for (DWORD i = 0; i < pift->dwNumEntries; ++i) { - if (pift->table[i].dwForwardIfIndex == if_index + if (pift->table[i].dwForwardIfIndex == if_index && pift->table[i].dwForwardMask == INADDR_BROADCAST) return pift->table[i].dwForwardDest; } @@ -1408,7 +1408,7 @@ get_xp_ifs (ULONG family) { /* Destination address */ if (sa->sa_family == AF_INET) - { + { if_sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr; if_sin->sin_addr.s_addr = get_routedst (pap->IfIndex); if_sin->sin_family = AF_INET; @@ -1417,7 +1417,7 @@ get_xp_ifs (ULONG family) /* FIXME: No official way to get the dstaddr for ipv6? */ memcpy (&ifp->ifa_addr, sa, sa_size); ifp->ifa_ifa.ifa_dstaddr = (struct sockaddr *) - &ifp->ifa_brddstaddr; + &ifp->ifa_brddstaddr; } else { @@ -1425,7 +1425,7 @@ get_xp_ifs (ULONG family) if (sa->sa_family == AF_INET) { if_sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr; - uint32_t mask = + uint32_t mask = ((struct sockaddr_in *) &ifp->ifa_netmask)->sin_addr.s_addr; if_sin->sin_addr.s_addr = sin->sin_addr.s_addr & mask | ~mask; if_sin->sin_family = AF_INET; @@ -1604,7 +1604,7 @@ get_2k_ifs () { ifp->ifa_ifa.ifa_flags |= IFF_UP | IFF_LOWER_UP; /* Bug in NT4's IP Helper lib. The dwOperStatus has just - two values, 0 or 1, non operational, operational. */ + two values, 0 or 1, non operational, operational. */ if (ifrow->dwOperStatus >= (wincap.has_broken_if_oper_status () ? 1 : IF_OPER_STATUS_CONNECTED)) ifp->ifa_ifa.ifa_flags |= IFF_RUNNING; @@ -1625,7 +1625,7 @@ get_2k_ifs () { /* Destination address */ if_sin->sin_addr.s_addr = - get_routedst (ipt->table[ip_cnt].dwIndex); + get_routedst (ipt->table[ip_cnt].dwIndex); ifp->ifa_ifa.ifa_dstaddr = (struct sockaddr *) &ifp->ifa_brddstaddr; } @@ -1746,7 +1746,7 @@ get_nt_ifs () NULL, NULL, (unsigned char *) netmask, (size = 256, &size)) == ERROR_SUCCESS) - ++cnt; + ++cnt; RegCloseKey (key); } ++cnt; /* loopback */ @@ -1788,7 +1788,7 @@ get_nt_ifs () ifp->ifa_ifindex = -1; /* Friendly name */ struct ifreq_frndlyname *iff = (struct ifreq_frndlyname *) - &ifp->ifa_frndlyname; + &ifp->ifa_frndlyname; strcpy (iff->ifrf_friendlyname, "Default loopback"); iff->ifrf_len = 16; @@ -1875,7 +1875,7 @@ get_nt_ifs () sin->sin_family = AF_INET; ifp->ifa_ifa.ifa_netmask = (struct sockaddr *) &ifp->ifa_netmask; if (ppp) - { + { /* Destination address */ sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr; sin->sin_addr.s_addr = @@ -1885,7 +1885,7 @@ get_nt_ifs () &ifp->ifa_brddstaddr; } else - { + { /* Broadcast address */ lip = cygwin_inet_addr (dhcp ? dhcpaddress : ip); lnp = cygwin_inet_addr (dhcp ? dhcpnetmask : np); @@ -1978,7 +1978,7 @@ get_ifconf (struct ifconf *ifc, int what) ++cnt; strcpy (ifr->ifr_name, ifp->ifa_name); switch (what) - { + { case SIOCGIFFLAGS: ifr->ifr_flags = ifp->ifa_ifa.ifa_flags; break; |