OutData->if_physaddrlen = Interface->AddressLength;
OutData->if_adminstatus = MIB_IF_ADMIN_STATUS_UP;
/* NDIS_HARDWARE_STATUS -> ROUTER_CONNECTION_STATE */
- Status = GetInterfaceConnectionStatus( Interface, &OutData->if_operstatus );
-
- /* Not sure what to do here, but not ready seems a safe bet on failure */
- if( !NT_SUCCESS(Status) )
- OutData->if_operstatus = NdisHardwareStatusNotReady;
+ GetInterfaceConnectionStatus( Interface, &OutData->if_operstatus );
IFDescr = (PCHAR)&OutData->if_descr[0];
ForEachInterface(CurrentIF) {
if (CurrentIF->Context && AddrIsUnspecified(&CurrentIF->Unicast)) {
TcpipReleaseSpinLock(&InterfaceListLock, OldIrql);
- if (NT_SUCCESS(GetInterfaceConnectionStatus(CurrentIF, &IfStatus)) &&
- (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL)) {
+
+ GetInterfaceConnectionStatus(CurrentIF, &IfStatus);
+ if (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL) {
return CurrentIF;
}
+
TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql);
}
} EndFor(CurrentIF);
ForEachInterface(CurrentIF) {
if (CurrentIF->Context && (Index++ == NextDefaultAdapter)) {
TcpipReleaseSpinLock(&InterfaceListLock, OldIrql);
- if (NT_SUCCESS(GetInterfaceConnectionStatus(CurrentIF, &IfStatus)) &&
- (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL)) {
+
+ GetInterfaceConnectionStatus(CurrentIF, &IfStatus);
+ if (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL) {
NextDefaultAdapter++;
return CurrentIF;
}
+
TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql);
}
} EndFor(CurrentIF);
if (CurrentIF->Context) {
Index++;
TcpipReleaseSpinLock(&InterfaceListLock, OldIrql);
- if (NT_SUCCESS(GetInterfaceConnectionStatus(CurrentIF, &IfStatus)) &&
- (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL)) {
+
+ GetInterfaceConnectionStatus(CurrentIF, &IfStatus);
+ if (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL) {
NextDefaultAdapter = Index;
return CurrentIF;
}
+
TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql);
}
} EndFor(CurrentIF);
return NULL;
}
-NTSTATUS GetInterfaceConnectionStatus(PIP_INTERFACE Interface, PULONG Result)
+VOID GetInterfaceConnectionStatus(PIP_INTERFACE Interface, PULONG Result)
{
- NTSTATUS Status;
-
- /* Query OID_GEN_MEDIA_CONNECT_STATUS for connection status information */
- Status = TcpipLanGetDwordOid(Interface, OID_GEN_MEDIA_CONNECT_STATUS, Result);
- if (!NT_SUCCESS(Status))
- return Status;
+ PLAN_ADAPTER Adapter = Interface->Context;
- /* Translate the result into MIB_IF_OPER_STATUS_XXX */
- if (*Result == NdisMediaStateConnected)
- {
- /* Up and running */
+ /* Loopback has no adapter context */
+ if (Adapter == NULL || Adapter->State == LAN_STATE_STARTED) {
*Result = MIB_IF_OPER_STATUS_OPERATIONAL;
}
- else
- {
- /* Down */
+ else {
*Result = MIB_IF_OPER_STATUS_DISCONNECTED;
}
-
- return STATUS_SUCCESS;
}