Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[weiden] 14502: free work items after processing them

by weiden＠svn.reactos.com

free work items after processing them Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-05 12:34:38 UTC (rev 14501) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-05 15:08:18 UTC (rev 14502) @@ -125,8 +125,11 @@ Irp = WorkItemData->Irp; ReadBytes(DeviceObject, Irp, WorkItemData); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + IoFreeWorkItem(WorkItemData->IoWorkItem); ExFreePoolWithTag(pWorkItemData, SERIAL_TAG); - IoCompleteRequest(Irp, IO_NO_INCREMENT); } NTSTATUS STDCALL @@ -215,7 +218,8 @@ WorkItem = IoAllocateWorkItem(DeviceObject); if (WorkItem) { - IoQueueWorkItem(WorkItem, SerialReadWorkItem, DelayedWorkQueue, WorkItemData); + WorkItemData->IoWorkItem = WorkItem; + IoQueueWorkItem(WorkItem, SerialReadWorkItem, DelayedWorkQueue, WorkItemData); IoMarkIrpPending(Irp); return STATUS_PENDING; } _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-04-05 12:34:38 UTC (rev 14501) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-04-05 15:08:18 UTC (rev 14502) @@ -108,6 +108,7 @@ typedef struct _WORKITEM_DATA { PIRP Irp; + PIO_WORKITEM IoWorkItem; BOOLEAN UseIntervalTimeout; BOOLEAN UseTotalTimeout;

19 years, 5 months

[hpoussin] 14501: Print date and time formats according to regional settings

by hpoussin＠svn.reactos.com

Print date and time formats according to regional settings Modified: trunk/reactos/subsys/system/cmd/config.h _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-04-05 12:00:37 UTC (rev 14500) +++ trunk/reactos/subsys/system/cmd/config.h 2005-04-05 12:34:38 UTC (rev 14501) @@ -52,13 +52,9 @@ /* Define one of these to select the used locale. */ /* (date and time formats etc.) used in DATE, TIME, */ /* DIR, PROMPT etc. */ -#ifdef __REACTOS__ -#define LOCALE_DEFAULT -#else #define LOCALE_WINDOWS /* System locale */ /* #define LOCALE_GERMAN */ /* German locale */ /* #define LOCALE_DEFAULT */ /* United States locale */ -#endif #ifndef __REACTOS__ #define INCLUDE_CMD_ACTIVATE

19 years, 5 months

[hpoussin] 14500: Remove useless code (ACPI now reports resources correctly)

by hpoussin＠svn.reactos.com

Remove useless code (ACPI now reports resources correctly) Change ULONG to ULONG_PTR for IoStatus.Information field Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/ntoskrnl/io/pnpreport.c _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-05 12:00:13 UTC (rev 14499) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-05 12:00:37 UTC (rev 14500) @@ -298,7 +298,7 @@ ULONG IoControlCode; PSERIAL_DEVICE_EXTENSION DeviceExtension; ULONG LengthIn, LengthOut; - ULONG Information = 0; + ULONG_PTR Information = 0; PVOID BufferIn, BufferOut; PUCHAR ComPortBase; NTSTATUS Status; _____ Modified: trunk/reactos/drivers/dd/serial/info.c --- trunk/reactos/drivers/dd/serial/info.c 2005-04-05 12:00:13 UTC (rev 14499) +++ trunk/reactos/drivers/dd/serial/info.c 2005-04-05 12:00:37 UTC (rev 14500) @@ -20,7 +20,7 @@ PIO_STACK_LOCATION Stack; PVOID SystemBuffer; ULONG BufferLength; - ULONG Information = 0; + ULONG_PTR Information = 0; NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-05 12:00:13 UTC (rev 14499) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-05 12:00:37 UTC (rev 14500) @@ -298,7 +298,7 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; - ULONG Information = 0; + ULONG_PTR Information = 0; NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -308,6 +308,7 @@ { case IRP_MN_START_DEVICE: { + BOOLEAN ConflictDetected; DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); /* FIXME: first HACK: PnP manager can send multiple @@ -319,85 +320,19 @@ Status = STATUS_SUCCESS; break; } - /* FIXME: AllocatedResources MUST never be NULL ; - * that's the second HACK because resource arbitration - * doesn't exist in ReactOS yet... + /* FIXME: second HACK: verify that we don't have resource conflict, + * because PnP manager doesn't do it automatically */ - if (Stack->Parameters.StartDevice.AllocatedResources == NULL) + Status = IoReportResourceForDetection( + DeviceObject->DriverObject, Stack->Parameters.StartDevice.AllocatedResources, 0, + NULL, NULL, 0, + &ConflictDetected); + if (!NT_SUCCESS(Status)) { - ULONG ResourceListSize; - PCM_RESOURCE_LIST ResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - KIRQL Dirql; - ULONG ComPortBase; - ULONG Irq; - BOOLEAN ConflictDetected; - - DPRINT1("Serial: no allocated resources for this device! Creating fake list\n"); - switch (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort) - { - case 1: - ComPortBase = 0x3f8; - Irq = 4; - break; - case 2: - ComPortBase = 0x2f8; - Irq = 3; - break; - default: - ComPortBase = Irq = 0; - } - - /* Create resource list */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); - if (!ResourceList) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; - ResourceList->List[0].BusNumber = -1; /* unknown */ - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - ResourceDescriptor->u.Port.Start.u.HighPart = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; - ResourceDescriptor->u.Port.Length = 8; - - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; - ResourceDescriptor->Type = CmResourceTypeInterrupt; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, 0, Irq, - &Dirql, - &ResourceDescriptor->u.Interrupt.Affinity); - ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; - - /* Verify that this COM port is not the serial debug port */ - Status = IoReportResourceForDetection( - DeviceObject->DriverObject, ResourceList, 0, - NULL, NULL, 0, - &ConflictDetected); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - Stack->Parameters.StartDevice.AllocatedResources = - Stack->Parameters.StartDevice.AllocatedResourcesTranslated = - ResourceList; + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } /* Call lower driver */ _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-05 12:00:13 UTC (rev 14499) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-05 12:00:37 UTC (rev 14500) @@ -34,7 +34,7 @@ KIRQL Irql; ULONG ObjectCount; PVOID ObjectsArray[2]; - ULONG Information = 0; + ULONG_PTR Information = 0; NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -247,7 +247,7 @@ PIO_STACK_LOCATION Stack; PSERIAL_DEVICE_EXTENSION DeviceExtension; ULONG Length; - ULONG Information = 0; + ULONG_PTR Information = 0; PUCHAR Buffer; PUCHAR ComPortBase; KIRQL Irql; _____ Modified: trunk/reactos/ntoskrnl/io/pnpreport.c --- trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-05 12:00:13 UTC (rev 14499) +++ trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-05 12:00:37 UTC (rev 14500) @@ -83,13 +83,6 @@ *ConflictDetected = FALSE; DPRINT1("IoReportResourceForDetection unimplemented\n"); - if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0) - { - /* We hope serial ports will be enumerated by ACPI */ - *ConflictDetected = TRUE; - return STATUS_CONFLICTING_ADDRESSES; - } - /* HACK: check if serial debug output is enabled. If yes, * prevent serial port driver to detect this serial port * by indicating a conflict @@ -123,6 +116,13 @@ } } } + + if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0) + { + /* We hope legacy devices will be enumerated by ACPI */ + *ConflictDetected = TRUE; + return STATUS_CONFLICTING_ADDRESSES; + } return STATUS_SUCCESS; }

19 years, 5 months

[ros-diffs] [hpoussin] 14499: Implement IRP_MN_QUERY_RESOURCES (Irq, IO ports, DMA)

by hpoussin＠svn.reactos.com

Implement IRP_MN_QUERY_RESOURCES (Irq, IO ports, DMA) Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-04-05 05:12:16 UTC (rev 14498) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-04-05 12:00:13 UTC (rev 14499) @@ -4,6 +4,7 @@ * FILE: acpi/ospm/fdo.c * PURPOSE: ACPI device object dispatch routines * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * HervÚ Poussineau (hpoussin(a)reactos.com) * UPDATE HISTORY: * 08-08-2001 CSH Created */ @@ -115,6 +116,149 @@ } +static BOOLEAN +AcpiCreateResourceList(PCM_RESOURCE_LIST* pResourceList, + PULONG ResourceListSize, + RESOURCE* resources) +{ + BOOLEAN Done; + ULONG NumberOfResources = 0; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + RESOURCE* resource; + ULONG i; + KIRQL Dirql; + + /* Count number of resources */ + Done = FALSE; + resource = resources; + while (!Done) + { + switch (resource->id) + { + case irq: + { + IRQ_RESOURCE *irq_data = (IRQ_RESOURCE*) &resource->data; + NumberOfResources += irq_data->number_of_interrupts; + break; + } + case dma: + { + DMA_RESOURCE *dma_data = (DMA_RESOURCE*) &resource->data; + NumberOfResources += dma_data->number_of_channels; + break; + } + case io: + { + NumberOfResources++; + break; + } + case end_tag: + { + Done = TRUE; + break; + } + } + resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); + } + + /* Allocate memory */ + *ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePool(PagedPool, *ResourceListSize); + *pResourceList = ResourceList; + if (!ResourceList) + return FALSE; + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Internal; /* FIXME */ + ResourceList->List[0].BusNumber = 0; /* We're the only ACPI bus device in the system */ + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = NumberOfResources; + ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; + + /* Fill resources list structure */ + Done = FALSE; + resource = resources; + while (!Done) + { + switch (resource->id) + { + case irq: + { + IRQ_RESOURCE *irq_data = (IRQ_RESOURCE*) &resource->data; + for (i = 0; i < irq_data->number_of_interrupts; i++) + { + ResourceDescriptor->Type = CmResourceTypeInterrupt; + + ResourceDescriptor->ShareDisposition = + (irq_data->shared_exclusive == SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + ResourceDescriptor->Flags = + (irq_data->edge_level == LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); + ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( + Internal, 0, 0, irq_data->interrupts[i], + &Dirql, + &ResourceDescriptor->u.Interrupt.Affinity); + ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + ResourceDescriptor++; + } + break; + } + case dma: + { + DMA_RESOURCE *dma_data = (DMA_RESOURCE*) &resource->data; + for (i = 0; i < dma_data->number_of_channels; i++) + { + ResourceDescriptor->Type = CmResourceTypeDma; + ResourceDescriptor->Flags = 0; + switch (dma_data->type) + { + case TYPE_A: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; + case TYPE_B: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; + case TYPE_F: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; + } + if (dma_data->bus_master == BUS_MASTER) + ResourceDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; + switch (dma_data->transfer) + { + case TRANSFER_8: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; break; + case TRANSFER_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_16; break; + case TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; + } + ResourceDescriptor->u.Dma.Channel = dma_data->channels[i]; + ResourceDescriptor++; + } + break; + } + case io: + { + IO_RESOURCE *io_data = (IO_RESOURCE*) &resource->data; + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (io_data->io_decode == DECODE_16) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; + else + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; + ResourceDescriptor->u.Port.Start.u.HighPart = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = io_data->min_base_address; + ResourceDescriptor->u.Port.Length = io_data->range_length; + ResourceDescriptor++; + break; + } + case end_tag: + { + Done = TRUE; + break; + } + } + resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); + } + + acpi_rs_dump_resource_list(resource); + return TRUE; +} + + static NTSTATUS FdoQueryBusRelations( IN PDEVICE_OBJECT DeviceObject, @@ -149,6 +293,7 @@ CurrentEntry = DeviceExtension->DeviceListHead.Flink; while (CurrentEntry != &DeviceExtension->DeviceListHead) { + ACPI_BUFFER Buffer; Device = CONTAINING_RECORD(CurrentEntry, ACPI_DEVICE, DeviceListEntry); /* FIXME: For ACPI namespace devices on the motherboard create filter DOs @@ -200,6 +345,34 @@ AcpiStatus = bm_get_node(Device->BmHandle, 0, &Node); if (ACPI_SUCCESS(AcpiStatus)) { + /* Get current resources */ + Buffer.length = 0; + Status = acpi_get_current_resources(Node->device.acpi_handle, &Buffer); + if ((Status & ACPI_OK) == 0) + { + ASSERT(FALSE); + } + if (Buffer.length > 0) + { + Buffer.pointer = ExAllocatePool(PagedPool, Buffer.length); + if (!Buffer.pointer) + { + ASSERT(FALSE); + } + Status = acpi_get_current_resources(Node->device.acpi_handle, &Buffer); + if (ACPI_FAILURE(Status)) + { + ASSERT(FALSE); + } + if (!AcpiCreateResourceList(&PdoDeviceExtension->ResourceList, + &PdoDeviceExtension->ResourceListSize, + (RESOURCE*)Buffer.pointer)) + { + ASSERT(FALSE); + } + ExFreePool(Buffer.pointer); + } + /* Add Device ID string */ if (!AcpiCreateDeviceIDString(&PdoDeviceExtension->DeviceID, Node)) _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h --- trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h 2005-04-05 05:12:16 UTC (rev 14498) +++ trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h 2005-04-05 12:00:13 UTC (rev 14499) @@ -47,6 +47,9 @@ UNICODE_STRING InstanceID; // Hardware IDs UNICODE_STRING HardwareIDs; + // Resource list + PCM_RESOURCE_LIST ResourceList; + ULONG ResourceListSize; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c --- trunk/reactos/drivers/bus/acpi/ospm/pdo.c 2005-04-05 05:12:16 UTC (rev 14498) +++ trunk/reactos/drivers/bus/acpi/ospm/pdo.c 2005-04-05 12:00:13 UTC (rev 14499) @@ -108,6 +108,35 @@ static NTSTATUS +PdoQueryResources( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST ResourceList; + + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->ResourceListSize == 0) + { + return Irp->IoStatus.Status; + } + + ResourceList = ExAllocatePool(PagedPool, DeviceExtension->ResourceListSize); + if (!ResourceList) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(ResourceList, DeviceExtension->ResourceList, DeviceExtension->ResourceListSize); + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + return STATUS_SUCCESS; +} + + +static NTSTATUS PdoSetPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -201,6 +230,9 @@ break; case IRP_MN_QUERY_RESOURCES: + Status = PdoQueryResources(DeviceObject, + Irp, + IrpSp); break; case IRP_MN_QUERY_STOP_DEVICE: @@ -213,6 +245,7 @@ break; case IRP_MN_START_DEVICE: + Status = STATUS_SUCCESS; break; case IRP_MN_STOP_DEVICE:

19 years, 5 months

[royce] 14498: add some asserts

by royce＠svn.reactos.com

add some asserts Modified: trunk/reactos/ntoskrnl/io/mdl.c _____ Modified: trunk/reactos/ntoskrnl/io/mdl.c --- trunk/reactos/ntoskrnl/io/mdl.c 2005-04-04 23:48:11 UTC (rev 14497) +++ trunk/reactos/ntoskrnl/io/mdl.c 2005-04-05 05:12:16 UTC (rev 14498) @@ -4,7 +4,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/mdl.c * PURPOSE: Io manager mdl functions - * + * * PROGRAMMERS: David Welch (welch(a)mcmail.com) */ @@ -32,7 +32,7 @@ PIRP Irp) { PMDL Mdl; - + if (ChargeQuota) { // Mdl = ExAllocatePoolWithQuota(NonPagedPool, @@ -48,27 +48,27 @@ TAG_MDL); } MmInitializeMdl(Mdl, (char*)VirtualAddress, Length); - + if (Irp) { if (SecondaryBuffer) { ASSERT(Irp->MdlAddress); - + /* FIXME: add to end of list maybe?? */ Mdl->Next = Irp->MdlAddress->Next; Irp->MdlAddress->Next = Mdl; } else { - /* + /* * What if there's allready an mdl at Irp->MdlAddress? * Is that bad and should we do something about it? */ Irp->MdlAddress = Mdl; } } - + return(Mdl); } @@ -122,13 +122,16 @@ */ VOID STDCALL IoFreeMdl(PMDL Mdl) -{ - /* +{ + /* * This unmaps partial mdl's from kernel space but also asserts that non-partial * mdl's isn't still mapped into kernel space. */ + ASSERT(Mdl); + ASSERT_IRQL(DISPATCH_LEVEL); + MmPrepareMdlForReuse(Mdl); - + ExFreePool(Mdl); }

19 years, 5 months

[arty] 14497: Added acknowledgement (thank tinus and sorry I didn't put this in the first

by arty＠svn.reactos.com

Added acknowledgement (thank tinus and sorry I didn't put this in the first commit). Modified: trunk/reactos/subsys/system/dhcp/design.txt _____ Modified: trunk/reactos/subsys/system/dhcp/design.txt --- trunk/reactos/subsys/system/dhcp/design.txt 2005-04-04 23:45:33 UTC (rev 14496) +++ trunk/reactos/subsys/system/dhcp/design.txt 2005-04-04 23:48:11 UTC (rev 14497) @@ -1,3 +1,7 @@ +Acknowledgements: + + Tinus provided the initial port of these dhclient file. + Ok I need these things: 1) Adapter concept thingy

19 years, 5 months

[arty] 14496: First import of DHCP client service.

by arty＠svn.reactos.com

First import of DHCP client service. No pipe created yet. Event model up and running. Does not produce a dhcp offer yet but working on that. Added: trunk/reactos/subsys/system/dhcp/ Added: trunk/reactos/subsys/system/dhcp/Makefile Added: trunk/reactos/subsys/system/dhcp/adapter.c Added: trunk/reactos/subsys/system/dhcp/alloc.c Added: trunk/reactos/subsys/system/dhcp/compat.c Added: trunk/reactos/subsys/system/dhcp/design.txt Added: trunk/reactos/subsys/system/dhcp/dhclient.c Added: trunk/reactos/subsys/system/dhcp/dhcp.rc Added: trunk/reactos/subsys/system/dhcp/dhcpmain.c Added: trunk/reactos/subsys/system/dhcp/dispatch.c Added: trunk/reactos/subsys/system/dhcp/hash.c Added: trunk/reactos/subsys/system/dhcp/include/ Added: trunk/reactos/subsys/system/dhcp/include/cdefs.h Added: trunk/reactos/subsys/system/dhcp/include/debug.h Added: trunk/reactos/subsys/system/dhcp/include/dhcp.h Added: trunk/reactos/subsys/system/dhcp/include/dhcpd.h Added: trunk/reactos/subsys/system/dhcp/include/dhctoken.h Added: trunk/reactos/subsys/system/dhcp/include/hash.h Added: trunk/reactos/subsys/system/dhcp/include/inet.h Added: trunk/reactos/subsys/system/dhcp/include/osdep.h Added: trunk/reactos/subsys/system/dhcp/include/predec.h Added: trunk/reactos/subsys/system/dhcp/include/privsep.h Added: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Added: trunk/reactos/subsys/system/dhcp/include/site.h Added: trunk/reactos/subsys/system/dhcp/include/stdint.h Added: trunk/reactos/subsys/system/dhcp/include/sysconf.h Added: trunk/reactos/subsys/system/dhcp/include/tree.h Added: trunk/reactos/subsys/system/dhcp/include/version.h Added: trunk/reactos/subsys/system/dhcp/memory.c Added: trunk/reactos/subsys/system/dhcp/options.c Added: trunk/reactos/subsys/system/dhcp/privsep.c Added: trunk/reactos/subsys/system/dhcp/socket.c Added: trunk/reactos/subsys/system/dhcp/tables.c Added: trunk/reactos/subsys/system/dhcp/timer.c Added: trunk/reactos/subsys/system/dhcp/tree.c Added: trunk/reactos/subsys/system/dhcp/util.c _____ Added: trunk/reactos/subsys/system/dhcp/Makefile --- trunk/reactos/subsys/system/dhcp/Makefile 2005-04-04 23:17:28 UTC (rev 14495) +++ trunk/reactos/subsys/system/dhcp/Makefile 2005-04-04 23:45:33 UTC (rev 14496) @@ -0,0 +1,30 @@ +# + +PATH_TO_TOP = ../../.. + +TARGET_TYPE = program + +TARGET_APPTYPE = windows + +TARGET_NAME = dhcp + +TARGET_CFLAGS = -D__REACTOS__ -D_WIN32_WINNT=0x0501 -D__USE_W32API -Iinclude + +TARGET_OBJECTS = adapter.o alloc.o compat.o dhclient.o dispatch.o hash.o \ + options.o privsep.o socket.o tables.o timer.o util.o + +TARGET_SDKLIBS = iphlpapi.a ws2_32.a ntdll.a + +TARGET_RC_SRCS = dhcp.rc + +TARGET_RC_BINSRC = + +TARGET_RC_BINARIES = + +default: all +DEP_OBJECTS = $(TARGET_OBJECTS) +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk _____ Added: trunk/reactos/subsys/system/dhcp/adapter.c --- trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-04 23:17:28 UTC (rev 14495) +++ trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-04 23:45:33 UTC (rev 14496) @@ -0,0 +1,162 @@ +#include "rosdhcp.h" + +static LIST_ENTRY AdapterList; +static WSADATA wsd; +extern struct interface_info *ifi; + +DWORD GetAddress( PDHCP_ADAPTER Adapter ) { + PMIB_IPADDRTABLE AddressTable = NULL; + ULONG i, Size = 0, NumAddressRows; + DWORD Error = GetIpAddrTable( AddressTable, &Size, FALSE ); + + while( Error == ERROR_INSUFFICIENT_BUFFER ) { + free( AddressTable ); + AddressTable = malloc( Size ); + if( AddressTable ) + Error = GetIpAddrTable( AddressTable, &Size, FALSE ); + } + if( Error != ERROR_SUCCESS ) { + free( AddressTable ); + return Error; + } + + NumAddressRows = Size / sizeof(MIB_IPADDRTABLE); + for( i = 0; i < AddressTable->dwNumEntries; i++ ) { + DH_DbgPrint(MID_TRACE, + ("Finding address for adapter %d: (%d -> %x)\n", + Adapter->IfMib.dwIndex, + AddressTable->table[i].dwIndex, + AddressTable->table[i].dwAddr)); + if( Adapter->IfMib.dwIndex == AddressTable->table[i].dwIndex ) { + memcpy( &Adapter->IfAddr, &AddressTable->table[i], + sizeof( MIB_IPADDRROW ) ); + } + } +} + +void AdapterInit() { + PMIB_IFTABLE Table = malloc(sizeof(MIB_IFTABLE)); + DWORD Error, Size, i; + PDHCP_ADAPTER Adapter = NULL; + + WSAStartup(0x0101,&wsd); + + InitializeListHead( &AdapterList ); + + DH_DbgPrint(MID_TRACE,("Getting Adapter List...\n")); + + while( (Error = GetIfTable(Table, &Size, 0 )) == + ERROR_INSUFFICIENT_BUFFER ) { + DH_DbgPrint(MID_TRACE,("Error %d, New Buffer Size: %d\n", Error, Size)); + free( Table ); + Table = malloc( Size ); + } + + if( Error != NO_ERROR ) goto term; + + DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries)); + + for( i = 0; i < Table->dwNumEntries; i++ ) { + DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", i)); + Adapter = calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); + + if( Adapter ) { + memcpy( &Adapter->IfMib, &Table->table[i], + sizeof(Adapter->IfMib) ); + GetAddress( Adapter ); + InsertTailList( &AdapterList, &Adapter->ListEntry ); + Adapter->DhclientInfo.next = ifi; + Adapter->DhclientInfo.client = &Adapter->DhclientState; + Adapter->DhclientInfo.rbuf = Adapter->recv_buf; + Adapter->DhclientInfo.rbuf_max = Table->table[i].dwMtu; + Adapter->DhclientInfo.rbuf_len = + Adapter->DhclientInfo.rbuf_offset = 0; + Adapter->DhclientInfo.rfdesc = + Adapter->DhclientInfo.wfdesc = + socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); + Adapter->ListenAddr.sin_family = AF_INET; + Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); + Adapter->BindStatus = + (bind( Adapter->DhclientInfo.rfdesc, + (struct sockaddr *)&Adapter->ListenAddr, + sizeof(Adapter->ListenAddr) ) == 0) ? + 0 : WSAGetLastError(); + Adapter->DhclientState.config = &Adapter->DhclientConfig; + Adapter->DhclientConfig.initial_interval = DHCP_DISCOVER_INTERVAL; + Adapter->DhclientConfig.retry_interval = DHCP_DISCOVER_INTERVAL; + Adapter->DhclientConfig.select_interval = 1; + Adapter->DhclientConfig.reboot_timeout = DHCP_REBOOT_TIMEOUT; + Adapter->DhclientConfig.backoff_cutoff = DHCP_BACKOFF_MAX; + Adapter->DhclientState.interval = + Adapter->DhclientConfig.retry_interval; + strncpy(Adapter->DhclientInfo.name, Adapter->IfMib.bDescr, + sizeof(Adapter->DhclientInfo.name)); + DH_DbgPrint(MID_TRACE,("Adapter Name: [%s]\n", Adapter->DhclientInfo.name)); + ifi = &Adapter->DhclientInfo; + } + } + + DH_DbgPrint(MID_TRACE,("done with AdapterInit\n")); + +term: + if( Table ) free( Table ); +} + +void AdapterStop() { + PLIST_ENTRY ListEntry; + PDHCP_ADAPTER Adapter; + while( !IsListEmpty( &AdapterList ) ) { + ListEntry = (PLIST_ENTRY)RemoveHeadList( &AdapterList ); + Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); + free( Adapter ); + } + WSACleanup(); +} + +PDHCP_ADAPTER AdapterFindIndex( unsigned int indx ) { + PDHCP_ADAPTER Adapter; + PLIST_ENTRY ListEntry; + + for( ListEntry = AdapterList.Flink; + ListEntry != &AdapterList; + ListEntry = ListEntry->Flink ) { + Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); + if( Adapter->IfMib.dwIndex == indx ) return Adapter; + } + + return NULL; +} + +PDHCP_ADAPTER AdapterFindName( const WCHAR *name ) { + PDHCP_ADAPTER Adapter; + PLIST_ENTRY ListEntry; + + for( ListEntry = AdapterList.Flink; + ListEntry != &AdapterList; + ListEntry = ListEntry->Flink ) { + Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); + if( !wcsicmp( Adapter->IfMib.wszName, name ) ) return Adapter; + } + + return NULL; +} + +PDHCP_ADAPTER AdapterGetFirst() { + if( IsListEmpty( &AdapterList ) ) return NULL; else { + return CONTAINING_RECORD + ( AdapterList.Flink, DHCP_ADAPTER, ListEntry ); + } +} + +PDHCP_ADAPTER AdapterGetNext( PDHCP_ADAPTER This ) +{ + if( This->ListEntry.Flink == &AdapterList ) return NULL; + return CONTAINING_RECORD + ( This->ListEntry.Flink, DHCP_ADAPTER, ListEntry ); +} + +void if_register_send(struct interface_info *ip) { +} + +void if_register_receive(struct interface_info *ip) { +} _____ Added: trunk/reactos/subsys/system/dhcp/alloc.c --- trunk/reactos/subsys/system/dhcp/alloc.c 2005-04-04 23:17:28 UTC (rev 14495) +++ trunk/reactos/subsys/system/dhcp/alloc.c 2005-04-04 23:45:33 UTC (rev 14496) @@ -0,0 +1,79 @@ +/* $OpenBSD: alloc.c,v 1.9 2004/05/04 20:28:40 deraadt Exp $ */ + +/* Memory allocation... */ + +/* + * Copyright (c) 1995, 1996, 1998 The Internet Software Consortium. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of The Internet Software Consortium nor the names + * of its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND + * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This software has been written for the Internet Software Consortium + * by Ted Lemon <mellon(a)fugue.com> in cooperation with Vixie + * Enterprises. To learn more about the Internet Software Consortium, + * see ``http://www.vix.com/isc''. To learn more about Vixie + * Enterprises, see ``http://www.vix.com''. + */ + +#include "rosdhcp.h" +#include "dhcpd.h" + +struct string_list * +new_string_list(size_t size) +{ + struct string_list *rval; + + rval = calloc(1, sizeof(struct string_list) + size); + if (rval != NULL) + rval->string = ((char *)rval) + sizeof(struct string_list); + return (rval); +} + +struct hash_table * +new_hash_table(int count) +{ + struct hash_table *rval; + + rval = calloc(1, sizeof(struct hash_table) - + (DEFAULT_HASH_SIZE * sizeof(struct hash_bucket *)) + + (count * sizeof(struct hash_bucket *))); + if (rval == NULL) + return (NULL); + rval->hash_count = count; + return (rval); +} + +struct hash_bucket * +new_hash_bucket(void) +{ + struct hash_bucket *rval = calloc(1, sizeof(struct hash_bucket)); + + return (rval); +} + +void free_hash_bucket(struct hash_bucket *hb) { free(hb); } _____ Added: trunk/reactos/subsys/system/dhcp/compat.c --- trunk/reactos/subsys/system/dhcp/compat.c 2005-04-04 23:17:28 UTC (rev 14495) +++ trunk/reactos/subsys/system/dhcp/compat.c 2005-04-04 23:45:33 UTC (rev 14496) @@ -0,0 +1,40 @@ +#include "rosdhcp.h" +#include "dhcpd.h" +#include "stdint.h" + +size_t strlcpy(char *d, const char *s, size_t bufsize) +{ + size_t len = strlen(s); + size_t ret = len; + if (bufsize > 0) { + if (len >= bufsize) + len = bufsize-1; + memcpy(d, s, len); + d[len] = 0; + } + return ret; +} + +// not really random :( +u_int32_t arc4random() +{ + static int did_srand = 0; + u_int32_t ret; + + if (!did_srand) { + srand(0); + did_srand = 1; + } + + ret = rand() << 10 ^ rand(); + return ret; +} + +int inet_aton(const char *cp, struct in_addr *inp) +{ + inp->S_un.S_addr = inet_addr(cp); + if (INADDR_NONE == inp->S_un.S_addr) + return 0; + + return 1; +} _____ Added: trunk/reactos/subsys/system/dhcp/design.txt --- trunk/reactos/subsys/system/dhcp/design.txt 2005-04-04 23:17:28 UTC (rev 14495) +++ trunk/reactos/subsys/system/dhcp/design.txt 2005-04-04 23:45:33 UTC (rev 14496) @@ -0,0 +1,29 @@ +Ok I need these things: + +1) Adapter concept thingy + + Needs a name and index + Current IP address etc + interface_info + + Must be able to get one from an adapter index or name + Must query the ip address and such + Must be able to set the address + +2) System state doodad + + List of adapters + List of parameter changes + List of persistent stuff + + Must be able to initialize from the registry + (persistent stuff, some adapter info) + Save changes to persistent set + +3) Parameter change set + + TODO + +4) Persistent queries + + TODO \ No newline at end of file _____ Added: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-04 23:17:28 UTC (rev 14495) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-04 23:45:33 UTC (rev 14496) @@ -0,0 +1,2308 @@ +/* $OpenBSD: dhclient.c,v 1.62 2004/12/05 18:35:51 deraadt Exp $ */ + +/* + * Copyright 2004 Henning Brauer <henning(a)openbsd.org> + * Copyright (c) 1995, 1996, 1997, 1998, 1999 + * The Internet Software Consortium. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of The Internet Software Consortium nor the names + * of its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND + * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This software has been written for the Internet Software Consortium + * by Ted Lemon <mellon(a)fugue.com> in cooperation with Vixie + * Enterprises. To learn more about the Internet Software Consortium, + * see ``http://www.vix.com/isc''. To learn more about Vixie + * Enterprises, see ``http://www.vix.com''. + * + * This client was substantially modified and enhanced by Elliot Poger + * for use on Linux while he was working on the MosquitoNet project at + * Stanford. + * + * The current version owes much to Elliot's Linux enhancements, but + * was substantially reorganized and partially rewritten by Ted Lemon + * so as to use the same networking framework that the Internet Software + * Consortium DHCP server uses. Much system-specific configuration code + * was moved into a shell script so that as support for more operating + * systems is added, it will not be necessary to port and maintain + * system-specific configuration code to these operating systems - instead, + * the shell script can invoke the native tools to accomplish the same + * purpose. + */ + +#include <winsock2.h> +#include "rosdhcp.h" +#include "dhcpd.h" +#include "privsep.h" + +#define PERIOD 0x2e +#define hyphenchar(c) ((c) == 0x2d) +#define bslashchar(c) ((c) == 0x5c) +#define periodchar(c) ((c) == PERIOD) +#define asterchar(c) ((c) == 0x2a) +#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) || \ + ((c) >= 0x61 && (c) <= 0x7a)) +#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) + +#define borderchar(c) (alphachar(c) || digitchar(c)) +#define middlechar(c) (borderchar(c) || hyphenchar(c)) +#define domainchar(c) ((c) > 0x20 && (c) < 0x7f) + +unsigned long debug_trace_level = DEBUG_ULTRA; +time_t cur_time; +time_t default_lease_time = 43200; /* 12 hours... */ + +char *path_dhclient_conf = _PATH_DHCLIENT_CONF; +char *path_dhclient_db = NULL; + +int log_perror = 1; +int privfd; +//int nullfd = -1; + +struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } }; +struct in_addr inaddr_any; +struct sockaddr_in sockaddr_broadcast; + +/* + * ASSERT_STATE() does nothing now; it used to be + * assert (state_is == state_shouldbe). + */ +#define ASSERT_STATE(state_is, state_shouldbe) {} + +#define TIME_MAX 2147483647 + +int log_priority; +int no_daemon; +int unknown_ok = 1; +int routefd; + +struct interface_info *ifi = NULL; + +void usage(void); +int check_option(struct client_lease *l, int option); +int ipv4addrs(char * buf); +int res_hnok(const char *dn); +char *option_as_string(unsigned int code, unsigned char *data, int len); +int fork_privchld(int, int); + +#define ROUNDUP(a) \ + ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) + +time_t scripttime; + +#if 0 + +int +findproto(char *cp, int n) +{ + struct sockaddr *sa; + int i; + + if (n == 0) + return -1; + for (i = 1; i; i <<= 1) { + if (i & n) { + sa = (struct sockaddr *)cp; + switch (i) { + case RTA_IFA: + case RTA_DST: + case RTA_GATEWAY: + case RTA_NETMASK: + if (sa->sa_family == AF_INET) + return AF_INET; + if (sa->sa_family == AF_INET6) + return AF_INET6; + break; + case RTA_IFP: + break; + } + ADVANCE(cp, sa); + } + } + return (-1); +} + + +struct sockaddr * +get_ifa(char *cp, int n) +{ + struct sockaddr *sa; + int i; + + if (n == 0) + return (NULL); + for (i = 1; i; i <<= 1) + if (i & n) { + sa = (struct sockaddr *)cp; + if (i == RTA_IFA) + return (sa); + ADVANCE(cp, sa); + } + + return (NULL); +} +struct iaddr defaddr = { 4 }; + +/* ARGSUSED */ +void +routehandler(struct protocol *p) +{ + char msg[2048]; + struct rt_msghdr *rtm; + struct if_msghdr *ifm; + struct ifa_msghdr *ifam; + struct if_announcemsghdr *ifan; + struct client_lease *l; + time_t t = time(NULL); + struct sockaddr *sa; + struct iaddr a; + ssize_t n; + + n = read(routefd, &msg, sizeof(msg)); + rtm = (struct rt_msghdr *)msg; + if (n < sizeof(rtm->rtm_msglen) || n < rtm->rtm_msglen || + rtm->rtm_version != RTM_VERSION) + return; + + switch (rtm->rtm_type) { + case RTM_NEWADDR: + ifam = (struct ifa_msghdr *)rtm; + if (ifam->ifam_index != ifi->index) + break; + if (findproto((char *)(ifam + 1), ifam->ifam_addrs) != AF_INET) + break; + if (ifi == NULL) + goto die; + sa = get_ifa((char *)(ifam + 1), ifam->ifam_addrs); + if (sa == NULL) + goto die; + + if ((a.len = sizeof(struct in_addr)) > sizeof(a.iabuf)) + error("king bula sez: len mismatch"); + memcpy(a.iabuf, &((struct sockaddr_in *)sa)->sin_addr, a.len); + if (addr_eq(a, defaddr)) + break; + + for (l = ifi->client->active; l != NULL; l = l->next) + if (addr_eq(a, l->address)) + break; + + if (l != NULL) /* new addr is the one we set */ + break; + + goto die; + case RTM_DELADDR: + ifam = (struct ifa_msghdr *)rtm; + if (ifam->ifam_index != ifi->index) + break; + if (findproto((char *)(ifam + 1), ifam->ifam_addrs) != AF_INET) + break; + if (scripttime == 0 || t < scripttime + 10) + break; + goto die; + case RTM_IFINFO: + ifm = (struct if_msghdr *)rtm; + if (ifm->ifm_index != ifi->index) + break; + if ((rtm->rtm_flags & RTF_UP) == 0) + goto die; + break; + case RTM_IFANNOUNCE: + ifan = (struct if_announcemsghdr *)rtm; + if (ifan->ifan_what == IFAN_DEPARTURE && + ifan->ifan_index == ifi->index) + goto die; + break; + default: + break; + } + return; + +die: + script_init("FAIL", NULL); + if (ifi->client->alias) + script_write_params("alias_", ifi->client->alias); + script_go(); + exit(1); +} +#endif + +int +main(int argc, char *argv[]) +{ + extern char *__progname; + int ch, fd, quiet = 0, i = 0; + int pipe_fd[2]; + struct passwd *pw; + + AdapterInit(); + + tzset(); + time(&cur_time); + + memset(&sockaddr_broadcast, 0, sizeof(sockaddr_broadcast)); + sockaddr_broadcast.sin_family = AF_INET; + sockaddr_broadcast.sin_port = htons(REMOTE_PORT); + sockaddr_broadcast.sin_addr.s_addr = INADDR_BROADCAST; + inaddr_any.s_addr = INADDR_ANY; + + DH_DbgPrint(MID_TRACE,("DHCP Service Started\n")); + + read_client_conf(); + + if (!interface_link_status(ifi->name)) { + DH_DbgPrint(MID_TRACE,("%s: no link ", ifi->name)); + Sleep(1000); + while (!interface_link_status(ifi->name)) { + DH_DbgPrint(MID_TRACE,(".")); + if (++i > 10) { + DH_DbgPrint(MID_TRACE,("Giving up for now on adapter [%s]\n", ifi->name)); + } + Sleep(1000); + } + DH_DbgPrint(MID_TRACE,("Got link on [%s]\n", ifi->name)); + } + + DH_DbgPrint(MID_TRACE,("Discover Interfaces\n")); + + /* set up the interface */ + discover_interfaces(ifi); + + DH_DbgPrint + (MID_TRACE, + ("Setting init state and restarting interface %p\n",ifi)); + + ifi->client->state = S_INIT; + state_reboot(ifi); + + bootp_packet_handler = do_packet; + + DH_DbgPrint(MID_TRACE,("Going into dispatch()\n")); + + dispatch(); + + /* not reached */ + return (0); +} + +void +usage(void) +{ +// extern char *__progname; + +// fprintf(stderr, "usage: %s [-dqu] ", __progname); + fprintf(stderr, "usage: dhclient [-dqu] "); + fprintf(stderr, "[-c conffile] [-l leasefile] interface\n"); + exit(1); +} + +/* + * Individual States: + * + * Each routine is called from the dhclient_state_machine() in one of + * these conditions: + * -> entering INIT state + * -> recvpacket_flag == 0: timeout in this state + * -> otherwise: received a packet in this state + * + * Return conditions as handled by dhclient_state_machine(): + * Returns 1, sendpacket_flag = 1: send packet, reset timer. + * Returns 1, sendpacket_flag = 0: just reset the timer (wait for a milestone). + * Returns 0: finish the nap which was interrupted for no good reason. + * + * Several per-interface variables are used to keep track of the process: + * active_lease: the lease that is being used on the interface + * (null pointer if not configured yet). + * offered_leases: leases corresponding to DHCPOFFER messages that have + * been sent to us by DHCP servers. + * acked_leases: leases corresponding to DHCPACK messages that have been + * sent to us by DHCP servers. + * sendpacket: DHCP packet we're trying to send. + * destination: IP address to send sendpacket to + * In addition, there are several relevant per-lease variables. + * T1_expiry, T2_expiry, lease_expiry: lease milestones + * In the active lease, these control the process of renewing the lease; + * In leases on the acked_leases list, this simply determines when we + * can no longer legitimately use the lease. + */ + +void +state_reboot(void *ipp) +{ + struct interface_info *ip = ipp; + + /* If we don't remember an active lease, go straight to INIT. */ + if (!ip->client->active || ip->client->active->is_bootp) { + state_init(ip); + return; + } + + /* We are in the rebooting state. */ + ip->client->state = S_REBOOTING; + + /* make_request doesn't initialize xid because it normally comes + from the DHCPDISCOVER, but we haven't sent a DHCPDISCOVER, + so pick an xid now. */ + ip->client->xid = arc4random(); + + /* Make a DHCPREQUEST packet, and set appropriate per-interface + flags. */ + make_request(ip, ip->client->active); + ip->client->destination = iaddr_broadcast; + ip->client->first_sending = cur_time; + ip->client->interval = ip->client->config->initial_interval; + + /* Zap the medium list... */ + ip->client->medium = NULL; + + /* Send out the first DHCPREQUEST packet. */ + send_request(ip); +} + +/* + * Called when a lease has completely expired and we've + * been unable to renew it. + */ +void +state_init(void *ipp) +{ + struct interface_info *ip = ipp; + + ASSERT_STATE(state, S_INIT); + + /* Make a DHCPDISCOVER packet, and set appropriate per-interface + flags. */ + make_discover(ip, ip->client->active); + ip->client->xid = ip->client->packet.xid; + ip->client->destination = iaddr_broadcast; + ip->client->state = S_SELECTING; + ip->client->first_sending = cur_time; + ip->client->interval = ip->client->config->initial_interval; + + /* Add an immediate timeout to cause the first DHCPDISCOVER packet + to go out. */ + send_discover(ip); +} + +/* + * state_selecting is called when one or more DHCPOFFER packets + * have been received and a configurable period of time has passed. + */ +void +state_selecting(void *ipp) +{ + struct interface_info *ip = ipp; + struct client_lease *lp, *next, *picked; + + ASSERT_STATE(state, S_SELECTING); + + /* Cancel state_selecting and send_discover timeouts, since either + one could have got us here. */ + cancel_timeout(state_selecting, ip); + cancel_timeout(send_discover, ip); + + /* We have received one or more DHCPOFFER packets. Currently, + the only criterion by which we judge leases is whether or + not we get a response when we arp for them. */ + picked = NULL; + for (lp = ip->client->offered_leases; lp; lp = next) { + next = lp->next; + + /* Check to see if we got an ARPREPLY for the address + in this particular lease. */ + if (!picked) { + script_init("ARPCHECK", lp->medium); + script_write_params("check_", lp); + + /* If the ARPCHECK code detects another + machine using the offered address, it exits + nonzero. We need to send a DHCPDECLINE and + toss the lease. */ + if (script_go()) { + make_decline(ip, lp); + send_decline(ip); + goto freeit; + } + picked = lp; + picked->next = NULL; + } else { +freeit: + free_client_lease(lp); + } + } + ip->client->offered_leases = NULL; + + /* If we just tossed all the leases we were offered, go back + to square one. */ + if (!picked) { + ip->client->state = S_INIT; + state_init(ip); + return; + } + + /* If it was a BOOTREPLY, we can just take the address right now. */ + if (!picked->options[DHO_DHCP_MESSAGE_TYPE].len) { + ip->client->new = picked; + + /* Make up some lease expiry times + XXX these should be configurable. */ + ip->client->new->expiry = cur_time + 12000; + ip->client->new->renewal += cur_time + 8000; + ip->client->new->rebind += cur_time + 10000; + + ip->client->state = S_REQUESTING; + + /* Bind to the address we received. */ + bind_lease(ip); + return; + } + + /* Go to the REQUESTING state. */ + ip->client->destination = iaddr_broadcast; + ip->client->state = S_REQUESTING; + ip->client->first_sending = cur_time; + ip->client->interval = ip->client->config->initial_interval; + + /* Make a DHCPREQUEST packet from the lease we picked. */ + make_request(ip, picked); + ip->client->xid = ip->client->packet.xid; + + /* Toss the lease we picked - we'll get it back in a DHCPACK. */ + free_client_lease(picked); + + /* Add an immediate timeout to send the first DHCPREQUEST packet. */ + send_request(ip); +} + +/* state_requesting is called when we receive a DHCPACK message after + having sent out one or more DHCPREQUEST packets. */ + +void +dhcpack(struct packet *packet) +{ + struct interface_info *ip = packet->interface; + struct client_lease *lease; + + /* If we're not receptive to an offer right now, or if the offer + has an unrecognizable transaction id, then just drop it. */ + if (packet->interface->client->xid != packet->raw->xid || + (packet->interface->hw_address.hlen != packet->raw->hlen) || + (memcmp(packet->interface->hw_address.haddr, + packet->raw->chaddr, packet->raw->hlen))) + return; + + if (ip->client->state != S_REBOOTING && + ip->client->state != S_REQUESTING && + ip->client->state != S_RENEWING && + ip->client->state != S_REBINDING) + return; + + note("DHCPACK from %s", piaddr(packet->client_addr)); + + lease = packet_to_lease(packet); + if (!lease) { + note("packet_to_lease failed."); + return; + } + + ip->client->new = lease; + + /* Stop resending DHCPREQUEST. */ + cancel_timeout(send_request, ip); + + /* Figure out the lease time. */ + if (ip->client->new->options[DHO_DHCP_LEASE_TIME].data) + ip->client->new->expiry = getULong( + ip->client->new->options[DHO_DHCP_LEASE_TIME].data); + else + ip->client->new->expiry = default_lease_time; + /* A number that looks negative here is really just very large, + because the lease expiry offset is unsigned. */ + if (ip->client->new->expiry < 0) + ip->client->new->expiry = TIME_MAX; + /* XXX should be fixed by resetting the client state */ + if (ip->client->new->expiry < 60) + ip->client->new->expiry = 60; + + /* Take the server-provided renewal time if there is one; + otherwise figure it out according to the spec. */ + if (ip->client->new->options[DHO_DHCP_RENEWAL_TIME].len) + ip->client->new->renewal = getULong( + ip->client->new->options[DHO_DHCP_RENEWAL_TIME].data); + else + ip->client->new->renewal = ip->client->new->expiry / 2; + + /* Same deal with the rebind time. */ + if (ip->client->new->options[DHO_DHCP_REBINDING_TIME].len) + ip->client->new->rebind = getULong( + ip->client->new->options[DHO_DHCP_REBINDING_TIME].data); + else + ip->client->new->rebind = ip->client->new->renewal + + ip->client->new->renewal / 2 + ip->client->new->renewal / 4; + + ip->client->new->expiry += cur_time; + /* Lease lengths can never be negative. */ + if (ip->client->new->expiry < cur_time) + ip->client->new->expiry = TIME_MAX; + ip->client->new->renewal += cur_time; + if (ip->client->new->renewal < cur_time) + ip->client->new->renewal = TIME_MAX; + ip->client->new->rebind += cur_time; + if (ip->client->new->rebind < cur_time) + ip->client->new->rebind = TIME_MAX; + + bind_lease(ip); +} + +void +bind_lease(struct interface_info *ip) +{ + /* Remember the medium. */ + ip->client->new->medium = ip->client->medium; + + /* Write out the new lease. */ + write_client_lease(ip, ip->client->new, 0); + + /* Run the client script with the new parameters. */ + script_init((ip->client->state == S_REQUESTING ? "BOUND" : + (ip->client->state == S_RENEWING ? "RENEW" : + (ip->client->state == S_REBOOTING ? "REBOOT" : "REBIND"))), + ip->client->new->medium); + if (ip->client->active && ip->client->state != S_REBOOTING) + script_write_params("old_", ip->client->active); + script_write_params("new_", ip->client->new); + if (ip->client->alias) + script_write_params("alias_", ip->client->alias); + script_go(); + + /* Replace the old active lease with the new one. */ + if (ip->client->active) + free_client_lease(ip->client->active); + ip->client->active = ip->client->new; + ip->client->new = NULL; + + /* Set up a timeout to start the renewal process. */ + add_timeout(ip->client->active->renewal, state_bound, ip); + + note("bound to %s -- renewal in %d seconds.", + piaddr(ip->client->active->address), + ip->client->active->renewal - cur_time); + ip->client->state = S_BOUND; + reinitialize_interfaces(); +// go_daemon(); +} + +/* + * state_bound is called when we've successfully bound to a particular + * lease, but the renewal time on that lease has expired. We are + * expected to unicast a DHCPREQUEST to the server that gave us our + * original lease. + */ +void +state_bound(void *ipp) +{ + struct interface_info *ip = ipp; + [truncated at 1000 lines; 7424 more skipped]

19 years, 5 months

[hpoussin] 14495: Fix file properties

by hpoussin＠svn.reactos.com

Fix file properties Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/legacy.c _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:12:21 UTC (rev 14494) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:17:28 UTC (rev 14495) @@ -1,97 +1,97 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/dd/serial/circularbuffer.c - * PURPOSE: Operations on a circular buffer - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - */ - -#define NDEBUG -#include "serial.h" - -NTSTATUS -InitializeCircularBuffer( - IN PCIRCULAR_BUFFER pBuffer, - IN ULONG BufferSize) -{ - DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); - pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); - if (!pBuffer->Buffer) - return STATUS_INSUFFICIENT_RESOURCES; - pBuffer->Length = BufferSize; - pBuffer->ReadPosition = pBuffer->WritePosition = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -FreeCircularBuffer( - IN PCIRCULAR_BUFFER pBuffer) -{ - DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); - ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); - return STATUS_SUCCESS; -} - -BOOLEAN -IsCircularBufferEmpty( - IN PCIRCULAR_BUFFER pBuffer) -{ - DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); - return (pBuffer->ReadPosition == pBuffer->WritePosition); -} - -NTSTATUS -PushCircularBufferEntry( - IN PCIRCULAR_BUFFER pBuffer, - IN UCHAR Entry) -{ - ULONG NextPosition; - DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); - ASSERT(pBuffer->Length); - NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; - if (NextPosition == pBuffer->ReadPosition) - return STATUS_BUFFER_TOO_SMALL; - pBuffer->Buffer[pBuffer->WritePosition] = Entry; - pBuffer->WritePosition = NextPosition; - return STATUS_SUCCESS; -} - -NTSTATUS -PopCircularBufferEntry( - IN PCIRCULAR_BUFFER pBuffer, - OUT PUCHAR Entry) -{ - DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); - ASSERT(pBuffer->Length); - if (IsCircularBufferEmpty(pBuffer)) - return STATUS_ARRAY_BOUNDS_EXCEEDED; - *Entry = pBuffer->Buffer[pBuffer->ReadPosition]; - pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) % pBuffer->Length; - return STATUS_SUCCESS; -} - -NTSTATUS -IncreaseCircularBufferSize( - IN PCIRCULAR_BUFFER pBuffer, - IN ULONG NewBufferSize) -{ - PUCHAR NewBuffer; - - DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); - ASSERT(pBuffer->Length); - if (pBuffer->Length > NewBufferSize) - return STATUS_INVALID_PARAMETER; - else if (pBuffer->Length == NewBufferSize) - return STATUS_SUCCESS; - - NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, NewBufferSize * sizeof(UCHAR), SERIAL_TAG); - if (!NewBuffer) - return STATUS_INSUFFICIENT_RESOURCES; - RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length * sizeof(UCHAR)); - ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); - pBuffer->Buffer = NewBuffer; - pBuffer->Length = NewBufferSize; - return STATUS_SUCCESS; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/circularbuffer.c + * PURPOSE: Operations on a circular buffer + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS +InitializeCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer, + IN ULONG BufferSize) +{ + DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); + if (!pBuffer->Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + pBuffer->Length = BufferSize; + pBuffer->ReadPosition = pBuffer->WritePosition = 0; + return STATUS_SUCCESS; +} + +NTSTATUS +FreeCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer) +{ + DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); + ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); + return STATUS_SUCCESS; +} + +BOOLEAN +IsCircularBufferEmpty( + IN PCIRCULAR_BUFFER pBuffer) +{ + DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + return (pBuffer->ReadPosition == pBuffer->WritePosition); +} + +NTSTATUS +PushCircularBufferEntry( + IN PCIRCULAR_BUFFER pBuffer, + IN UCHAR Entry) +{ + ULONG NextPosition; + DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + ASSERT(pBuffer->Length); + NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; + if (NextPosition == pBuffer->ReadPosition) + return STATUS_BUFFER_TOO_SMALL; + pBuffer->Buffer[pBuffer->WritePosition] = Entry; + pBuffer->WritePosition = NextPosition; + return STATUS_SUCCESS; +} + +NTSTATUS +PopCircularBufferEntry( + IN PCIRCULAR_BUFFER pBuffer, + OUT PUCHAR Entry) +{ + DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer->Length); + if (IsCircularBufferEmpty(pBuffer)) + return STATUS_ARRAY_BOUNDS_EXCEEDED; + *Entry = pBuffer->Buffer[pBuffer->ReadPosition]; + pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) % pBuffer->Length; + return STATUS_SUCCESS; +} + +NTSTATUS +IncreaseCircularBufferSize( + IN PCIRCULAR_BUFFER pBuffer, + IN ULONG NewBufferSize) +{ + PUCHAR NewBuffer; + + DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + ASSERT(pBuffer->Length); + if (pBuffer->Length > NewBufferSize) + return STATUS_INVALID_PARAMETER; + else if (pBuffer->Length == NewBufferSize) + return STATUS_SUCCESS; + + NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, NewBufferSize * sizeof(UCHAR), SERIAL_TAG); + if (!NewBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length * sizeof(UCHAR)); + ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); + pBuffer->Buffer = NewBuffer; + pBuffer->Length = NewBufferSize; + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/dd/serial/circularbuffer.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/dd/serial/cleanup.c ___________________________________________________________________ Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/close.c ___________________________________________________________________ Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/create.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/devctrl.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/info.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-04-04 23:12:21 UTC (rev 14494) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-04-04 23:17:28 UTC (rev 14495) @@ -1,194 +1,194 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/bus/serial/legacy.c - * PURPOSE: Legacy serial port enumeration - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - * Mark Junker (mjscod(a)gmx.de) - */ - -#define NDEBUG -#include "serial.h" - -UART_TYPE -SerialDetectUartType( - IN PUCHAR BaseAddress) -{ - UCHAR Lcr, TestLcr; - UCHAR OldScr, Scr5A, ScrA5; - BOOLEAN FifoEnabled; - UCHAR NewFifoStatus; - - Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF); - TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF; - WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr); - - /* Accessing the LCR must work for a usable serial port */ - if (TestLcr != Lcr) - return UartUnknown; - - /* Ensure that all following accesses are done as required */ - READ_PORT_UCHAR(SER_RBR(BaseAddress)); - READ_PORT_UCHAR(SER_IER(BaseAddress)); - READ_PORT_UCHAR(SER_IIR(BaseAddress)); - READ_PORT_UCHAR(SER_LCR(BaseAddress)); - READ_PORT_UCHAR(SER_MCR(BaseAddress)); - READ_PORT_UCHAR(SER_LSR(BaseAddress)); - READ_PORT_UCHAR(SER_MSR(BaseAddress)); - READ_PORT_UCHAR(SER_SCR(BaseAddress)); - - /* Test scratch pad */ - OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A); - Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5); - ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr); - - /* When non-functional, we have a 8250 */ - if (Scr5A != 0x5A || ScrA5 != 0xA5) - return Uart8250; - - /* Test FIFO type */ - FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) != 0; - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO); - NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0; - if (!FifoEnabled) - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); - switch (NewFifoStatus) - { - case 0x00: - return Uart16450; - case 0x40: - case 0x80: - /* Not sure about this but the documentation says that 0x40 - * indicates an unusable FIFO but my tests only worked - * with 0x80 */ - return Uart16550; - } - - /* FIFO is only functional for 16550A+ */ - return Uart16550A; -} - -static NTSTATUS -DetectLegacyDevice( - IN PDRIVER_OBJECT DriverObject, - IN ULONG ComPortBase, - IN ULONG Irq, - IN PULONG pComPortNumber OPTIONAL) -{ - ULONG ResourceListSize; - PCM_RESOURCE_LIST ResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - BOOLEAN ConflictDetected; - UART_TYPE UartType; - PDEVICE_OBJECT Pdo = NULL; - PDEVICE_OBJECT Fdo; - KIRQL Dirql; - NTSTATUS Status; - - /* Create resource list */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); - if (!ResourceList) - return STATUS_INSUFFICIENT_RESOURCES; - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; - ResourceList->List[0].BusNumber = -1; /* unknown */ - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - ResourceDescriptor->u.Port.Start.u.HighPart = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; - ResourceDescriptor->u.Port.Length = 8; - - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; - ResourceDescriptor->Type = CmResourceTypeInterrupt; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, 0, Irq, - &Dirql, - &ResourceDescriptor->u.Interrupt.Affinity); - ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; - - /* Report resource list */ - Status = IoReportResourceForDetection( - DriverObject, ResourceList, ResourceListSize, - NULL, NULL, 0, - &ConflictDetected); - if (Status == STATUS_CONFLICTING_ADDRESSES) - { - DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return STATUS_DEVICE_NOT_CONNECTED; - } - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return Status; - } - - /* Test if port exists */ - UartType = SerialDetectUartType((PUCHAR)ComPortBase); - - /* Report device if detected... */ - if (UartType != UartUnknown) - { - Status = IoReportDetectedDevice( - DriverObject, - ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1 /* unknown */, - ResourceList, NULL, - TRUE, - &Pdo); - if (NT_SUCCESS(Status)) - { - Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); - if (NT_SUCCESS(Status)) - { - Status = SerialPnpStartDevice(Fdo, ResourceList); - } - } - } - else - { - /* Release resources */ - Status = IoReportResourceForDetection( - DriverObject, NULL, 0, - NULL, NULL, 0, - &ConflictDetected); - Status = STATUS_DEVICE_NOT_CONNECTED; - } - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return Status; -} - -NTSTATUS -DetectLegacyDevices( - IN PDRIVER_OBJECT DriverObject) -{ - ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; - ULONG Irq[] = { 4, 3, 4, 3 }; - ULONG ComPortNumber[] = { 1, 2, 3, 4 }; - ULONG i; - NTSTATUS Status; - NTSTATUS ReturnedStatus = STATUS_SUCCESS; - - for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) - { - Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i], &ComPortNumber[i]); - if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) - ReturnedStatus = Status; - DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); - } - - return ReturnedStatus; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/bus/serial/legacy.c + * PURPOSE: Legacy serial port enumeration + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * Mark Junker (mjscod(a)gmx.de) + */ + +#define NDEBUG +#include "serial.h" + +UART_TYPE +SerialDetectUartType( + IN PUCHAR BaseAddress) +{ + UCHAR Lcr, TestLcr; + UCHAR OldScr, Scr5A, ScrA5; + BOOLEAN FifoEnabled; + UCHAR NewFifoStatus; + + Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF); + TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF; + WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr); + + /* Accessing the LCR must work for a usable serial port */ + if (TestLcr != Lcr) + return UartUnknown; + + /* Ensure that all following accesses are done as required */ + READ_PORT_UCHAR(SER_RBR(BaseAddress)); + READ_PORT_UCHAR(SER_IER(BaseAddress)); + READ_PORT_UCHAR(SER_IIR(BaseAddress)); + READ_PORT_UCHAR(SER_LCR(BaseAddress)); + READ_PORT_UCHAR(SER_MCR(BaseAddress)); + READ_PORT_UCHAR(SER_LSR(BaseAddress)); + READ_PORT_UCHAR(SER_MSR(BaseAddress)); + READ_PORT_UCHAR(SER_SCR(BaseAddress)); + + /* Test scratch pad */ + OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A); + Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5); + ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr); + + /* When non-functional, we have a 8250 */ + if (Scr5A != 0x5A || ScrA5 != 0xA5) + return Uart8250; + + /* Test FIFO type */ + FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) != 0; + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO); + NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0; + if (!FifoEnabled) + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); + switch (NewFifoStatus) + { + case 0x00: + return Uart16450; + case 0x40: + case 0x80: + /* Not sure about this but the documentation says that 0x40 + * indicates an unusable FIFO but my tests only worked + * with 0x80 */ + return Uart16550; + } + + /* FIFO is only functional for 16550A+ */ + return Uart16550A; +} + +static NTSTATUS +DetectLegacyDevice( + IN PDRIVER_OBJECT DriverObject, + IN ULONG ComPortBase, + IN ULONG Irq, + IN PULONG pComPortNumber OPTIONAL) +{ + ULONG ResourceListSize; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + BOOLEAN ConflictDetected; + UART_TYPE UartType; + PDEVICE_OBJECT Pdo = NULL; + PDEVICE_OBJECT Fdo; + KIRQL Dirql; + NTSTATUS Status; + + /* Create resource list */ + ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); + if (!ResourceList) + return STATUS_INSUFFICIENT_RESOURCES; + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; + ResourceList->List[0].BusNumber = -1; /* unknown */ + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = 2; + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + ResourceDescriptor->u.Port.Start.u.HighPart = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; + ResourceDescriptor->u.Port.Length = 8; + + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; + ResourceDescriptor->Type = CmResourceTypeInterrupt; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( + Internal, 0, 0, Irq, + &Dirql, + &ResourceDescriptor->u.Interrupt.Affinity); + ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + + /* Report resource list */ + Status = IoReportResourceForDetection( + DriverObject, ResourceList, ResourceListSize, + NULL, NULL, 0, + &ConflictDetected); + if (Status == STATUS_CONFLICTING_ADDRESSES) + { + DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return STATUS_DEVICE_NOT_CONNECTED; + } + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return Status; + } + + /* Test if port exists */ + UartType = SerialDetectUartType((PUCHAR)ComPortBase); + + /* Report device if detected... */ + if (UartType != UartUnknown) + { + Status = IoReportDetectedDevice( + DriverObject, + ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1 /* unknown */, + ResourceList, NULL, + TRUE, + &Pdo); + if (NT_SUCCESS(Status)) + { + Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); + if (NT_SUCCESS(Status)) + { + Status = SerialPnpStartDevice(Fdo, ResourceList); + } + } + } + else + { + /* Release resources */ + Status = IoReportResourceForDetection( + DriverObject, NULL, 0, + NULL, NULL, 0, + &ConflictDetected); + Status = STATUS_DEVICE_NOT_CONNECTED; + } + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return Status; +} + +NTSTATUS +DetectLegacyDevices( + IN PDRIVER_OBJECT DriverObject) +{ + ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; + ULONG Irq[] = { 4, 3, 4, 3 }; + ULONG ComPortNumber[] = { 1, 2, 3, 4 }; + ULONG i; + NTSTATUS Status; + NTSTATUS ReturnedStatus = STATUS_SUCCESS; + + for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) + { + Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i], &ComPortNumber[i]); + if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) + ReturnedStatus = Status; + DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); + } + + return ReturnedStatus; +} Property changes on: trunk/reactos/drivers/dd/serial/legacy.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/dd/serial/makefile ___________________________________________________________________ Name: cleanup.c - close.c Property changes on: trunk/reactos/drivers/dd/serial/misc.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/pnp.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/power.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/rw.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/serial.c ___________________________________________________________________ Name: cleanup.c - close.c Property changes on: trunk/reactos/drivers/dd/serial/serial.h ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/serial.rc ___________________________________________________________________ Name: cleanup.c - close.c

19 years, 5 months

[hpoussin] 14494: Move variable declarations at the start of functions

by hpoussin＠svn.reactos.com

Move variable declarations at the start of functions Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/serial.c _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:11:19 UTC (rev 14493) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:12:21 UTC (rev 14494) @@ -47,9 +47,10 @@ IN PCIRCULAR_BUFFER pBuffer, IN UCHAR Entry) { + ULONG NextPosition; DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); ASSERT(pBuffer->Length); - ULONG NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; + NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; if (NextPosition == pBuffer->ReadPosition) return STATUS_BUFFER_TOO_SMALL; pBuffer->Buffer[pBuffer->WritePosition] = Entry; _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-04-04 23:11:19 UTC (rev 14493) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-04-04 23:12:21 UTC (rev 14494) @@ -26,6 +26,7 @@ IN PUNICODE_STRING RegPath) { ULONG i; + static BOOLEAN FirstTime = TRUE; DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SerialAddDevice; @@ -44,7 +45,6 @@ /* FIXME: It seems that DriverEntry function may be called more * than once. Do only legacy detection the first time. */ - static BOOLEAN FirstTime = TRUE; if (FirstTime) { FirstTime = FALSE;

19 years, 5 months

[hbirr] 14493: Check for an valid mdl pointer before calling IoFreeMdl in IoReadWriteCompletion.

by hbirr＠svn.reactos.com

Check for an valid mdl pointer before calling IoFreeMdl in IoReadWriteCompletion. Modified: trunk/reactos/ntoskrnl/io/cleanup.c _____ Modified: trunk/reactos/ntoskrnl/io/cleanup.c --- trunk/reactos/ntoskrnl/io/cleanup.c 2005-04-04 23:09:15 UTC (rev 14492) +++ trunk/reactos/ntoskrnl/io/cleanup.c 2005-04-04 23:11:19 UTC (rev 14493) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -109,7 +109,10 @@ if (DeviceObject->Flags & DO_DIRECT_IO) { - IoFreeMdl(Irp->MdlAddress); + if (Irp->MdlAddress) + { + IoFreeMdl(Irp->MdlAddress); + } } }

19 years, 5 months

← Newer
1
...
35
36
37
38
39
40
41
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005