wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Juan Lang : include: Define more IF_TYPEs.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 4ec277d8f4731903cf4201d85e6501ca6d1f461b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec277d8f4731903cf4201d85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 14:24:25 2010 -0700 include: Define more IF_TYPEs. --- include/ipifcons.h | 228 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 200 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ec277d8f4731903cf420…

1 0

Juan Lang : iphlpapi: Trace parameters to GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: c297dd2facb799b0959f38c0b59a907569ae34da URL: http://source.winehq.org/git/wine.git/?a=commit;h=c297dd2facb799b0959f38c0b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 14:04:02 2010 -0700 iphlpapi: Trace parameters to GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 88b699b..90101f7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -927,6 +927,8 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, InterfaceIndexTable *table; ULONG i, size, total_size, ret = ERROR_NO_DATA; + TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); + if (!buflen) return ERROR_INVALID_PARAMETER; table = getInterfaceIndexTable();

1 0

Juan Lang : include: Add SCOPE_LEVEL definition.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 8da6bb6fb3f10978931af176f89caf0aeb78d9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da6bb6fb3f10978931af176f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 13:44:48 2010 -0700 include: Add SCOPE_LEVEL definition. --- include/ws2def.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 585647b..00b10ab 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -68,4 +68,14 @@ typedef struct _SOCKET_ADDRESS_LIST { SOCKET_ADDRESS Address[1]; } SOCKET_ADDRESS_LIST, *LPSOCKET_ADDRESS_LIST; +typedef enum { + ScopeLevelInterface = 1, + ScopeLevelLink = 2, + ScopeLevelSubnet = 3, + ScopeLevelAdmin = 4, + ScopeLevelSite = 5, + ScopeLevelOrganization = 8, + ScopeLevelGlobal = 14 +} SCOPE_LEVEL; + #endif /* _WS2DEF_ */

1 0

Juan Lang : include: Add GAA_FLAG_* definitions.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 0f89a4f878a2be7d584975d720da1a8e7436dbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f89a4f878a2be7d584975d72… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 13:42:26 2010 -0700 include: Add GAA_FLAG_* definitions. --- include/iptypes.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 16e7ffb..8ce7df6 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -265,6 +265,18 @@ typedef struct _IP_ADAPTER_ADDRESSES { ULONG Dhcpv6Iaid; } IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +#define GAA_FLAG_SKIP_UNICAST 0x00000001 +#define GAA_FLAG_SKIP_ANYCAST 0x00000002 +#define GAA_FLAG_SKIP_MULTICAST 0x00000004 +#define GAA_FLAG_SKIP_DNS_SERVER 0x00000008 +#define GAA_FLAG_INCLUDE_PREFIX 0x00000010 +#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020 +#define GAA_FLAG_INCLUDE_WINS_INFO 0x00000040 +#define GAA_FLAG_INCLUDE_ALL_GATEWAYS 0x00000080 +#define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x00000100 +#define GAA_FLAG_INCLUDE_ALL_COMPARTMENTS 0x00000200 +#define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400 + #endif /* _WINSOCK2API_ */ #endif /* WINE_IPTYPES_H_*/

1 0

Juan Lang : iphlpapi: Set gateway addresses in GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: f776aea60d5d79c1fbcf7994f945da833e5c342a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f776aea60d5d79c1fbcf7994f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 10:14:18 2010 -0700 iphlpapi: Set gateway addresses in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 94 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6ec06e8..88b699b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -696,34 +696,82 @@ static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) return buf; } +static ULONG count_v4_gateways(DWORD index, PMIB_IPFORWARDTABLE routeTable) +{ + DWORD i, num_gateways = 0; + + for (i = 0; i < routeTable->dwNumEntries; i++) + { + if (routeTable->table[i].dwForwardIfIndex == index && + routeTable->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT) + num_gateways++; + } + return num_gateways; +} + +static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, + PMIB_IPFORWARDTABLE routeTable) +{ + DWORD i; + PMIB_IPFORWARDROW row = NULL; + + for (i = 0; !row && i < routeTable->dwNumEntries; i++) + { + if (routeTable->table[i].dwForwardIfIndex == index && + routeTable->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT) + row = &routeTable->table[i]; + } + return row; +} + static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, num_v6addrs = 0, total_size; + ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; SOCKET_ADDRESS *v6addrs = NULL; + PMIB_IPFORWARDTABLE routeTable = NULL; if (family == AF_INET) - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); + if (!ret) + { + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + num_v4_gateways = count_v4_gateways(index, routeTable); + } + } else if (family == AF_INET6) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == AF_UNSPEC) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); if (!ret) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + { + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + num_v4_gateways = count_v4_gateways(index, routeTable); + if (!ret) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } } else { FIXME("address family %u unsupported\n", family); ret = ERROR_NO_DATA; } - if (ret) return ret; + if (ret) + { + HeapFree(GetProcessHeap(), 0, routeTable); + return ret; + } total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -751,11 +799,44 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); + if (num_v4_gateways) + { + PMIB_IPFORWARDROW adapterRow; + + if ((adapterRow = findIPv4Gateway(index, routeTable))) + { + PIP_ADAPTER_GATEWAY_ADDRESS gw; + PSOCKADDR_IN sin; + + for (gw = aa->FirstGatewayAddress; gw && gw->Next; + gw = gw->Next) + ; + if (!gw) + { + gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + aa->FirstGatewayAddress = gw; + } + else + { + gw->Next = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + gw = gw->Next; + } + gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); + ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); + sin = (PSOCKADDR_IN)ptr; + sin->sin_family = AF_INET; + sin->sin_port = 0; + memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, + sizeof(DWORD)); + gw->Address.lpSockaddr = (LPSOCKADDR)sin; + gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); + ptr += sizeof(SOCKADDR_IN); + } + } if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; struct sockaddr_in *sa; - aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) @@ -834,6 +915,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; + HeapFree(GetProcessHeap(), 0, routeTable); HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS;

1 0

Juan Lang : include: Add Vista+ fields to IP_ADAPTER_ADDRESSES.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 873be06c925e666863d06ae1de08229f5898abc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873be06c925e666863d06ae1d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 13:03:57 2010 -0700 include: Add Vista+ fields to IP_ADAPTER_ADDRESSES. --- include/iptypes.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 82927a9..16e7ffb 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -28,6 +28,8 @@ #define MAX_HOSTNAME_LEN 128 #define MAX_DOMAIN_NAME_LEN 128 #define MAX_SCOPE_ID_LEN 256 +#define MAX_DHCPV6_DUID_LENGTH 130 +#define MAX_DNS_SUFFIX_STRING_LENGTH 256 #define BROADCAST_NODETYPE 1 #define PEER_TO_PEER_NODETYPE 2 @@ -180,6 +182,34 @@ typedef struct _IP_ADAPTER_PREFIX { ULONG PrefixLength; } IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX; +typedef struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_WINS_SERVER_ADDRESS_LH, *PIP_ADAPTER_WINS_SERVER_ADDRESS_LH; +typedef IP_ADAPTER_WINS_SERVER_ADDRESS_LH IP_ADAPTER_WINS_SERVER_ADDRESS; +typedef IP_ADAPTER_WINS_SERVER_ADDRESS_LH *PIP_ADAPTER_WINS_SERVER_ADDRESS; + +typedef struct _IP_ADAPTER_GATEWAY_ADDRESS_LH { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_GATEWAY_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_GATEWAY_ADDRESS_LH, *PIP_ADAPTER_GATEWAY_ADDRESS_LH; +typedef IP_ADAPTER_GATEWAY_ADDRESS_LH IP_ADAPTER_GATEWAY_ADDRESS; +typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; + #define IP_ADAPTER_DDNS_ENABLED 0x1 #define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x2 #define IP_ADAPTER_DHCP_ENABLED 0x4 @@ -217,6 +247,22 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD Ipv6IfIndex; DWORD ZoneIndices[16]; PIP_ADAPTER_PREFIX FirstPrefix; + ULONG64 TransmitLinkSpeed; + ULONG64 ReceiveLinkSpeed; + PIP_ADAPTER_WINS_SERVER_ADDRESS_LH FirstWinsServerAddress; + PIP_ADAPTER_GATEWAY_ADDRESS_LH FirstGatewayAddress; + ULONG Ipv4Metric; + ULONG Ipv6Metric; + IF_LUID Luid; + SOCKET_ADDRESS Dhcpv4Server; + NET_IF_COMPARTMENT_ID CompartmentId; + NET_IF_NETWORK_GUID NetworkGuid; + NET_IF_CONNECTION_TYPE ConnectionType; + TUNNEL_TYPE TunnelType; + SOCKET_ADDRESS Dhcpv6Server; + BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; + ULONG Dhcpv6ClientDuidLength; + ULONG Dhcpv6Iaid; } IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; #endif /* _WINSOCK2API_ */

1 0

Juan Lang : include: Define NDIS_INTERFACE_INFORMATION.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 1a6188e846f6ecee3409f2a12f32d047f3dd73b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6188e846f6ecee3409f2a12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 13:02:23 2010 -0700 include: Define NDIS_INTERFACE_INFORMATION. --- include/ifdef.h | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/ifdef.h b/include/ifdef.h index 0b52d80..80ab755 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -189,4 +189,39 @@ typedef enum { IfOperStatusLowerLayerDown } IF_OPER_STATUS; +typedef struct _NDIS_INTERFACE_INFORMATION { + NET_IF_OPER_STATUS ifOperStatus; + ULONG ifOperStatusFlags; + NET_IF_MEDIA_CONNECT_STATE MediaConnectState; + NET_IF_MEDIA_DUPLEX_STATE MediaDuplexState; + ULONG ifMtu; + BOOLEAN ifPromiscuousMode; + BOOLEAN ifDeviceWakeUpEnable; + ULONG64 XmitLinkSpeed; + ULONG64 RcvLinkSpeed; + ULONG64 ifLastChange; + ULONG64 ifCounterDiscontinuityTime; + ULONG64 ifInUnknownProtos; + ULONG64 ifInDiscards; + ULONG64 ifInErrors; + ULONG64 ifHCInOctets; + ULONG64 ifHCInUcastPkts; + ULONG64 ifHCInMulticastPkts; + ULONG64 ifHCInBroadcastPkts; + ULONG64 ifHCOutOctets; + ULONG64 ifHCOutUcastPkts; + ULONG64 ifHCOutMulticastPkts; + ULONG64 ifHCOutBroadcastPkts; + ULONG64 ifOutErrors; + ULONG64 ifOutDiscards; + ULONG64 ifHCInUcastOctets; + ULONG64 ifHCInMulticastOctets; + ULONG64 ifHCInBroadcastOctets; + ULONG64 ifHCOutUcastOctets; + ULONG64 ifHCOutMulticastOctets; + ULONG64 ifHCOutBroadcastOctets; + NET_IF_COMPARTMENT_ID CompartmentId; + ULONG SupportedStatistics; +} NDIS_INTERFACE_INFORMATION, *PNDIS_INTERFACE_INFORMATION; + #endif /* WINE_IFDEF_H*/

1 0

Juan Lang : include: Move IF_OPER_STATUS to ifdef.h.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: accb42f3c3dc107e79381678078f6a9a1d82210f URL: http://source.winehq.org/git/wine.git/?a=commit;h=accb42f3c3dc107e793816780… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 12:57:31 2010 -0700 include: Move IF_OPER_STATUS to ifdef.h. --- include/ifdef.h | 10 ++++++++++ include/iptypes.h | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/ifdef.h b/include/ifdef.h index a3f2b01..0b52d80 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -179,4 +179,14 @@ typedef enum _IF_ADMINISTRATIVE_STATE { IF_ADMINISTRATIVE_STATE_DEMANDDIAL = 2 } IF_ADMINISTRATIVE_STATE, *PIF_ADMINISTRATIVE_STATE; +typedef enum { + IfOperStatusUp = 1, + IfOperStatusDown, + IfOperStatusTesting, + IfOperStatusUnknown, + IfOperStatusDormant, + IfOperStatusNotPresent, + IfOperStatusLowerLayerDown +} IF_OPER_STATUS; + #endif /* WINE_IFDEF_H*/ diff --git a/include/iptypes.h b/include/iptypes.h index 9b80f77..82927a9 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -20,6 +20,7 @@ #define WINE_IPTYPES_H_ #include <time.h> +#include <ifdef.h> #define MAX_ADAPTER_DESCRIPTION_LENGTH 128 #define MAX_ADAPTER_NAME_LENGTH 256 @@ -104,16 +105,6 @@ typedef enum { } IP_SUFFIX_ORIGIN; typedef enum { - IfOperStatusUp = 1, - IfOperStatusDown, - IfOperStatusTesting, - IfOperStatusUnknown, - IfOperStatusDormant, - IfOperStatusNotPresent, - IfOperStatusLowerLayerDown -} IF_OPER_STATUS; - -typedef enum { IpDadStateInvalid = 0, IpDadStateTentative, IpDadStateDuplicate,

1 0

Juan Lang : include: Add ifdef.h.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 53db1245176080d6f102a0fd73811e60ca6f59a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53db1245176080d6f102a0fd7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 12:56:15 2010 -0700 include: Add ifdef.h. --- include/Makefile.in | 1 + include/ifdef.h | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 391cef7..c4bb8db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -273,6 +273,7 @@ SRCDIR_INCLUDES = \ icm.h \ icmpapi.h \ idispids.h \ + ifdef.h \ imagehlp.h \ imm.h \ in6addr.h \ diff --git a/include/ifdef.h b/include/ifdef.h new file mode 100644 index 0000000..a3f2b01 --- /dev/null +++ b/include/ifdef.h @@ -0,0 +1,182 @@ +/* WINE ifdef.h + * Copyright 2010 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef WINE_IFDEF_H +#define WINE_IFDEF_H + +typedef ULONG32 NET_IF_OBJECT_ID, *PNET_IF_OBJECT_ID; +typedef UINT32 NET_IF_COMPARTMENT_ID, *PNET_IF_COMPARTMENT_ID; +typedef GUID NET_IF_NETWORK_GUID, *PNET_IF_NETWORK_GUID; +typedef ULONG NET_IFINDEX, *PNET_IFINDEX; +typedef NET_IFINDEX IF_INDEX, *PIF_INDEX; +typedef UINT16 NET_IFTYPE, *PNET_IFTYPE; + +#define NET_IF_OPER_STATUS_DOWN_NOT_AUTHENTICATED 0x00000001 +#define NET_IF_OPER_STATUS_DOWN_NOT_MEDIA_CONNECTED 0x00000002 +#define NET_IF_OPER_STATUS_DORMANT_PAUSED 0x00000004 +#define NET_IF_OPER_STATUS_DORMANT_LOW_POWER 0x00000008 + +#define NET_IF_COMPARTMENT_ID_UNSPECIFIED 0 +#define NET_IF_COMPARTMENT_ID_PRIMARY 1 + +#define NET_IF_OID_IF_ALIAS 0x00000001 +#define NET_IF_OID_COMPARTMENT_ID 0x00000002 +#define NET_IF_OID_NETWORK_GUID 0x00000003 +#define NET_IF_OID_IF_ENTRY 0x00000004 + +#define NET_SET_UNSPECIFIED_NETWORK_GUID(x) +#define NET_IS_UNSPECIFIED_NETWORK_GUID(x) + +#define NET_SITEID_UNSPECIFIED 0 +#define NET_SITEID_MAXUSER 0x07ffffff +#define NET_SITEID_MAXSYSTEM 0x0fffffff + +#define NET_IFINDEX_UNSPECIFIED 0 +#define IFI_UNSPECIFIED NET_IFINDEX_UNSPECIFIED + +#define NET_IFLUID_UNSPECIFIED 0 + +#define NIIF_HARDWARE_INTERFACE 0x00000001 +#define NIIF_FILTER_INTERFACE 0x00000002 +#define NIIF_NDIS_WDM_INTERFACE 0x00000020 +#define NIIF_NDIS_ENDPOINT_INTERFACE 0x00000040 +#define NIIF_NDIS_ISCSI_INTERFACE 0x00000080 +#define NIIF_WAN_TUNNEL_TYPE_UNKNOWN 0xffffffff + +#define NET_BUS_NUMBER_UNKNOWN 0xffffffff +#define NET_SLOT_NUMBER_UNKNOWN 0xffffffff +#define NET_FUNCTION_NUMBER_UNKNOWN 0xffffffff + +#define IF_MAX_STRING_SIZE 256 +#define IF_MAX_PHYS_ADDRESS_LENGTH 32 + +typedef enum _NET_IF_ADMIN_STATUS { + NET_IF_ADMIN_STATUS_UP = 1, + NET_IF_ADMIN_STATUS_DOWN = 2, + NET_IF_ADMIN_STATUS_TESTING = 3 +} NET_IF_ADMIN_STATUS, *PNET_IF_ADMIN_STATUS; + +typedef enum _NET_IF_OPER_STATUS { + NET_IF_OPER_STATUS_UP = 1, + NET_IF_OPER_STATUS_DOWN = 2, + NET_IF_OPER_STATUS_TESTING = 3, + NET_IF_OPER_STATUS_UNKNOWN = 4, + NET_IF_OPER_STATUS_DORMANT = 5, + NET_IF_OPER_STATUS_NOT_PRESENT = 6, + NET_IF_OPER_STATUS_LOWER_LAYER_DOWN = 7 +} NET_IF_OPER_STATUS, *PNET_IF_OPER_STATUS; + +typedef enum _NET_IF_RCV_ADDRESS_TYPE { + NET_IF_RCV_ADDRESS_TYPE_OTHER = 1, + NET_IF_RCV_ADDRESS_TYPE_VOLATILE = 2, + NET_IF_RCV_ADDRESS_TYPE_NON_VOLATILE = 3 +} NET_IF_RCV_ADDRESS_TYPE, *PNET_IF_RCV_ADDRESS_TYPE; + +typedef struct _NET_IF_RCV_ADDRESS_LH { + NET_IF_RCV_ADDRESS_TYPE ifRcvAddressType; + USHORT ifRcvAddressLength; + USHORT ifRcvAddressOffset; +} NET_IF_RCV_ADDRESS_LH, *PNET_IF_RCV_ADDRESS_LH; +typedef NET_IF_RCV_ADDRESS_LH NET_IF_RCV_ADDRESS; +typedef NET_IF_RCV_ADDRESS_LH *PNET_IF_RCV_ADDRESS; + +typedef union _NET_LUID_LH { + ULONG64 Value; + struct { + ULONG64 Reserved : 24; + ULONG64 NetLuidIndex : 24; + ULONG64 IfType : 16; + } Info; +} NET_LUID_LH, *PNET_LUID_LH; +typedef NET_LUID_LH NET_LUID; +typedef NET_LUID *PNET_LUID; +typedef NET_LUID IF_LUID; +typedef NET_LUID *PIF_LUID; + +typedef enum _NET_IF_ACCESS_TYPE { + NET_IF_ACCESS_LOOPBACK = 1, + NET_IF_ACCESS_BROADCAST = 2, + NET_IF_ACCESS_POINT_TO_POINT = 2, + NET_IF_ACCESS_POINT_TO_MULTI_POINT = 4, + NET_IF_ACCESS_MAXIMUM = 5 +} NET_IF_ACCESS_TYPE, *PNET_IF_ACCESS_TYPE; + +typedef enum _NET_IF_DIRECTION_TYPE { + NET_IF_DIRECTION_SENDRECEIVE = 0, + NET_IF_DIRECTION_SENDONLY = 1, + NET_IF_DIRECTION_RECEIVEONLY = 2, + NET_IF_DIRECTION_MAXIMUM = 3 +} NET_IF_DIRECTION_TYPE, *PNET_IF_DIRECTION_TYPE; + +typedef enum _NET_IF_CONNECTION_TYPE { + NET_IF_CONNECTION_DEDICATED = 1, + NET_IF_CONNECTION_PASSIVE = 2, + NET_IF_CONNECTION_DEMAND = 3, + NET_IF_CONNECTION_MAXIMUM = 4, +} NET_IF_CONNECTION_TYPE, *PNET_IF_CONNECTION_TYPE; + +typedef enum _NET_IF_MEDIA_CONNECT_STATE { + MediaConnectStateUnknown = 0, + MediaConnectStateConnected = 1, + MediaConnectStateDisconnected = 2 +} NET_IF_MEDIA_CONNECT_STATE, *PNET_IF_MEDIA_CONNECT_STATE; + +typedef enum _NET_IF_MEDIA_DUPLEX_STATE { + MediaDuplexStateUnknown = 0, + MediaDuplexStateHalf = 1, + MediaDuplexStateFull = 2 +} NET_IF_MEDIA_DUPLEX_STATE, *PNET_IF_MEDIA_DUPLEX_STATE; + +typedef struct _NET_PHYSICAL_LOCATION_LH { + ULONG BusNumber; + ULONG SlotNumber; + ULONG FunctionNumber; +} NET_PHYSICAL_LOCATION_LH, *PNET_PHYSICAL_LOCATION_LH; +typedef NET_PHYSICAL_LOCATION_LH NET_PHYSICAL_LOCATION; +typedef NET_PHYSICAL_LOCATION *PNET_PHYSICAL_LOCATION; + +typedef struct _IF_COUNTED_STRING_LH { + USHORT Length; + WCHAR String[IF_MAX_STRING_SIZE + 1]; +} IF_COUNTED_STRING_LH, *PIF_COUNTED_STRING_LH; +typedef IF_COUNTED_STRING_LH IF_COUNTED_STRING; +typedef IF_COUNTED_STRING *PIF_COUNTED_STRING; + +typedef struct _IF_PHYSICAL_ADDRESS_LH { + USHORT Length; + UCHAR Address[IF_MAX_PHYS_ADDRESS_LENGTH]; +} IF_PHYSICAL_ADDRESS_LH, *PIF_PHYSICAL_ADDRESS_LH; +typedef IF_PHYSICAL_ADDRESS_LH IF_PHYSICAL_ADDRESS; +typedef IF_PHYSICAL_ADDRESS *PIF_PHYSICAL_ADDRESS; + +typedef enum { + TUNNEL_TYPE_NONE = 0, + TUNNEL_TYPE_OTHER = 1, + TUNNEL_TYPE_DIRECT = 2, + TUNNEL_TYPE_6TO4 = 11, + TUNNEL_TYPE_ISATAP = 13, + TUNNEL_TYPE_TEREDO = 14, + TUNNEL_TYPE_IPHTTPS = 15, +} TUNNEL_TYPE; + +typedef enum _IF_ADMINISTRATIVE_STATE { + IF_ADMINISTRATIVE_STATE_DISABLED = 0, + IF_ADMINISTRATIVE_STATE_ENABLED = 1, + IF_ADMINISTRATIVE_STATE_DEMANDDIAL = 2 +} IF_ADMINISTRATIVE_STATE, *PIF_ADMINISTRATIVE_STATE; + +#endif /* WINE_IFDEF_H*/

1 0

Juan Lang : iphlpapi: Set ConnectionType in GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 0905dfc3e7d0c95a479aaf4ad001396c448fac0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0905dfc3e7d0c95a479aaf4ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 10:44:04 2010 -0700 iphlpapi: Set ConnectionType in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d06b44c..6ec06e8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -608,6 +608,16 @@ static DWORD typeFromMibType(DWORD mib_type) } } +static DWORD connectionTypeFromMibType(DWORD mib_type) +{ + switch (mib_type) + { + case MIB_IF_TYPE_PPP: return NET_IF_CONNECTION_DEMAND; + case MIB_IF_TYPE_SLIP: return NET_IF_CONNECTION_DEMAND; + default: return NET_IF_CONNECTION_DEDICATED; + } +} + static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) { ULONG ret, i, j; @@ -814,6 +824,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); + aa->ConnectionType = connectionTypeFromMibType(type); getInterfaceMtuByName(name, &aa->Mtu);

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010