Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[arty] 14653: Don't set a zero timeout for a lease. Zero here is taken to mean infinite.

by arty＠svn.reactos.com

Don't set a zero timeout for a lease. Zero here is taken to mean infinite. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-17 18:53:55 UTC (rev 14652) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-17 19:16:39 UTC (rev 14653) @@ -682,7 +682,11 @@ ip->client->new = NULL; /* Set up a timeout to start the renewal process. */ - add_timeout(ip->client->active->renewal, state_bound, ip); + /* Timeout of zero means no timeout (some implementations seem to use + * one day). + */ + if( ip->client->active->renewal ) + add_timeout(ip->client->active->renewal, state_bound, ip); note("bound to %s -- renewal in %d seconds.", piaddr(ip->client->active->address),

19 years, 8 months

[gvg] 14652: Implement table grant mechanism for block devices

by gvg＠svn.reactos.com

Implement table grant mechanism for block devices Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c Modified: branches/xen/reactos/include/xen3/public/dom0_ops.h Modified: branches/xen/reactos/include/xen3/public/trace.h Modified: branches/xen/reactos/include/xen3/rosxen.h _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-17 17:50:48 UTC (rev 14651) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-17 18:53:55 UTC (rev 14652) @@ -73,6 +73,7 @@ ULONG XenMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); VOID XenMemInit(start_info_t *StartInfo); u32 XenMemVirtualToMachine(void *VirtualAddress); +int XenMemGrantForeignAccess(domid_t DomId, void *VirtAddr, BOOL ReadOnly); BOOL XenDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOL XenDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c 2005-04-17 17:50:48 UTC (rev 14651) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c 2005-04-17 18:53:55 UTC (rev 14652) @@ -80,6 +80,9 @@ static void *XenDiskScratchPage; static u32 XenDiskScratchMachine; +#ifdef CONFIG_XEN_BLKDEV_GRANT +static int XenDiskScratchGrantRef; +#endif /* CONFIG_XEN_BLKDEV_GRANT */ static void * XenDiskAllocatePageAlignedMemory(unsigned Size) @@ -163,8 +166,10 @@ XenEvtchnRegisterDisk(XenDiskEvtchn); #ifdef CONFIG_XEN_BLKDEV_GRANT - rdomid = status->domid; -#endif + XenDiskScratchGrantRef = XenMemGrantForeignAccess(Status->domid, + XenDiskScratchPage, + FALSE); +#endif /* CONFIG_XEN_BLKDEV_GRANT */ XenDiskState = DISK_STATE_CONNECTED; } @@ -377,17 +382,16 @@ Req.operation = BLKIF_OP_PROBE; Req.nr_segments = 1; #ifdef CONFIG_XEN_BLKDEV_GRANT - blkif_control_probe_send(&req, &rsp, - (unsigned long)(virt_to_machine(buf))); -#else + Req.frame_and_sects[0] = (((u32) XenDiskScratchGrantRef) << 16) | 7; +#else /* CONFIG_XEN_BLKDEV_GRANT */ Req.frame_and_sects[0] = XenDiskScratchMachine | 7; +#endif /* CONFIG_XEN_BLKDEV_GRANT */ if (! XenDiskControlSend(&Req, &Rsp)) { printf("Unexpected disk disconnect\n"); XenDie(); } -#endif if (Rsp.status <= 0) { @@ -497,16 +501,16 @@ Req.id = 0; Req.sector_number = SectorNumber; #ifdef CONFIG_XEN_BLKDEV_GRANT - blkif_control_probe_send(&req, &rsp, - (unsigned long)(virt_to_machine(buf))); -#else + Req.frame_and_sects[0] = (((u32) XenDiskScratchGrantRef) << 16) + | (Count - 1); +#else /* CONFIG_XEN_BLKDEV_GRANT */ Req.frame_and_sects[0] = XenDiskScratchMachine | (Count - 1); +#endif /* CONFIG_XEN_BLKDEV_GRANT */ if (! XenDiskControlSend(&Req, &Rsp)) { return FALSE; } -#endif if (BLKIF_RSP_OKAY != Rsp.status) { return FALSE; _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c 2005-04-17 17:50:48 UTC (rev 14651) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c 2005-04-17 18:53:55 UTC (rev 14652) @@ -23,6 +23,10 @@ #include <xen.h> #include <hypervisor.h> +#ifdef CONFIG_XEN_BLKDEV_GRANT +#include <grant_table.h> +#endif /* CONFIG_XEN_BLKDEV_GRANT */ + /* Page Directory Entry */ typedef struct _PDE { @@ -40,9 +44,9 @@ #define PTRS_PER_PT (PAGE_SIZE / sizeof(PTE)) /* Page Directory Index of a given virtual address */ -#define PD_IDX(Va) (((Va) >> PGDIR_SHIFT) & (PTRS_PER_PD - 1)) +#define PD_IDX(Va) ((((ULONG_PTR) Va) >> PGDIR_SHIFT) & (PTRS_PER_PD - 1)) /* Page Table Index of a give virtual address */ -#define PT_IDX(Va) (((Va) >> PAGE_SHIFT) & (PTRS_PER_PT - 1)) +#define PT_IDX(Va) ((((ULONG_PTR) Va) >> PAGE_SHIFT) & (PTRS_PER_PT - 1)) /* Convert a Page Directory or Page Table entry to a (machine) address */ #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -79,6 +83,10 @@ HYPERVISOR_mmu_update((req), (count), (success), (domid)) #endif /* XEN_VER */ +#ifdef CONFIG_XEN_BLKDEV_GRANT +static grant_entry_t *XenMemBlkdevGrantShared; +#endif /* CONFIG_XEN_BLKDEV_GRANT */ + ULONG XenMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize) { @@ -173,6 +181,10 @@ memory */ unsigned long PageNumber; /* Index of current page */ PPTE PageTable; /* Page table containing current page */ +#ifdef CONFIG_XEN_BLKDEV_GRANT + gnttab_setup_table_t Setup; /* Grant table setup request */ + unsigned long Frame; /* Grant table frame */ +#endif /* CONFIG_XEN_BLKDEV_GRANT */ PageDir = (PPDE) StartInfo->pt_base; PageTableForPageDir = (PPTE)((char *) StartInfo->pt_base @@ -184,8 +196,13 @@ StartPfn = ROUND_DOWN((unsigned long) &start, PAGE_SIZE) / PAGE_SIZE; /* First, lets connect all our page tables */ +#ifdef CONFIG_XEN_BLKDEV_GRANT + PageTablesRequired = ROUND_UP(StartInfo->nr_pages + 2, PTRS_PER_PT) + / PTRS_PER_PT; +#else /* CONFIG_XEN_BLKDEV_GRANT */ PageTablesRequired = ROUND_UP(StartInfo->nr_pages + 1, PTRS_PER_PT) / PTRS_PER_PT; +#endif /* CONFIG_XEN_BLKDEV_GRANT */ for (PageTableNumber = 0; PageTableNumber < PageTablesRequired; PageTableNumber++) { @@ -306,6 +323,33 @@ HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); XenDie(); } + +#ifdef CONFIG_XEN_BLKDEV_GRANT + /* If we're using grant tables, setup a single shared grant table page + * following the shared_info page */ + Setup.dom = DOMID_SELF; + Setup.nr_frames = 1; + Setup.frame_list = &Frame; + + if (0 != HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &Setup, 1) + || 0 != Setup.status) + { + HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); + XenDie(); + } + XenMemBlkdevGrantShared = (grant_entry_t *)((XenStartInfo->nr_pages + 1) + * PAGE_SIZE); + MmuReq.ptr = (XenPageDir[PD_IDX(XenMemBlkdevGrantShared)].Pde + & PAGE_MASK) + + PT_IDX(XenMemBlkdevGrantShared) * sizeof(PTE); + MmuReq.val = (Frame << PAGE_SHIFT) + | (PA_PRESENT | PA_READWRITE | PA_USER); + if (0 != XEN_MMU_UPDATE(&MmuReq, 1, NULL, DOMID_SELF)) + { + HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); + XenDie(); + } +#endif /* CONFIG_XEN_BLKDEV_GRANT */ } u32 @@ -319,4 +363,21 @@ & PAGE_MASK; } +#ifdef CONFIG_XEN_BLKDEV_GRANT +int +XenMemGrantForeignAccess(domid_t DomId, void *VirtualAddress, BOOL ReadOnly) +{ + int Ref = 0; /* We only do 1 page at the moment */ + + XenMemBlkdevGrantShared[Ref].frame = (XenMemVirtualToMachine(VirtualAddress) + >> PAGE_SHIFT); + XenMemBlkdevGrantShared[Ref].domid = DomId; + wmb(); + XenMemBlkdevGrantShared[Ref].flags = GTF_permit_access + | (ReadOnly ? GTF_readonly : 0); + + return Ref; +} +#endif /* CONFIG_XEN_BLKDEV_GRANT */ + /* EOF */ _____ Modified: branches/xen/reactos/include/xen3/public/dom0_ops.h --- branches/xen/reactos/include/xen3/public/dom0_ops.h 2005-04-17 17:50:48 UTC (rev 14651) +++ branches/xen/reactos/include/xen3/public/dom0_ops.h 2005-04-17 18:53:55 UTC (rev 14652) @@ -242,6 +242,7 @@ #define DOM0_SHADOW_CONTROL_OP_OFF 0 #define DOM0_SHADOW_CONTROL_OP_ENABLE_TEST 1 #define DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY 2 +#define DOM0_SHADOW_CONTROL_OP_ENABLE_TRANSLATE 3 #define DOM0_SHADOW_CONTROL_OP_FLUSH 10 /* table ops */ #define DOM0_SHADOW_CONTROL_OP_CLEAN 11 _____ Modified: branches/xen/reactos/include/xen3/public/trace.h --- branches/xen/reactos/include/xen3/public/trace.h 2005-04-17 17:50:48 UTC (rev 14651) +++ branches/xen/reactos/include/xen3/public/trace.h 2005-04-17 18:53:55 UTC (rev 14652) @@ -8,8 +8,6 @@ #ifndef __XEN_PUBLIC_TRACE_H__ #define __XEN_PUBLIC_TRACE_H__ -#include <asm/atomic.h> - /* Trace classes */ #define TRC_GEN 0x00010000 /* General trace */ #define TRC_SCHED 0x00020000 /* Xen Scheduler trace */ _____ Modified: branches/xen/reactos/include/xen3/rosxen.h --- branches/xen/reactos/include/xen3/rosxen.h 2005-04-17 17:50:48 UTC (rev 14651) +++ branches/xen/reactos/include/xen3/rosxen.h 2005-04-17 18:53:55 UTC (rev 14652) @@ -5,6 +5,9 @@ #ifndef ROSXEN_H_INCLUDED #define ROSXEN_H_INCLUDED +/* Match this with your dom0 Linux .config */ +#define CONFIG_XEN_BLKDEV_GRANT + typedef unsigned char u8; typedef unsigned short u16; typedef unsigned long u32;

19 years, 8 months

[ea] 14651: sm info ssid - implemented

by ea＠svn.reactos.com

sm info ssid - implemented Modified: trunk/reactos/subsys/system/sm/sm.c _____ Modified: trunk/reactos/subsys/system/sm/sm.c --- trunk/reactos/subsys/system/sm/sm.c 2005-04-17 16:26:44 UTC (rev 14650) +++ trunk/reactos/subsys/system/sm/sm.c 2005-04-17 17:50:48 UTC (rev 14651) @@ -148,32 +148,64 @@ { int rc = EXIT_SUCCESS; NTSTATUS Status = STATUS_SUCCESS; - SM_BASIC_INFORMATION bi = {0,}; - ULONG ReturnDataLength = sizeof bi; + SM_INFORMATION_CLASS InformationClass = SmBasicInformation; + union { + SM_BASIC_INFORMATION bi; + SM_SUBSYSTEM_INFORMATION ssi; + } Info; + ULONG DataLength = 0; + ULONG ReturnDataLength = 0; + INT i = 0; + RtlZeroMemory (& Info, sizeof Info); + switch (argc) + { + case 2: /* sm info */ + InformationClass = SmBasicInformation; + DataLength = sizeof Info.bi; + break; + case 3: /* sm info id */ + InformationClass = SmSubSystemInformation; + DataLength = sizeof Info.ssi; + Info.ssi.SubSystemId = atol(argv[2]); + break; + default: + return EXIT_FAILURE; + break; + } Status = SmQueryInformation (hSmApiPort, - SmBasicInformation, - & bi, - sizeof bi, + InformationClass, + & Info, + DataLength, & ReturnDataLength); - if (STATUS_SUCCESS == Status) + if (STATUS_SUCCESS != Status) { - int i = 0; - + printf ("Status 0x%08lx\n", Status); + return EXIT_FAILURE; + } + switch (argc) + { + case 2: + printf ("SM SubSystem Directory\n\n"); printf ("SSID PID Flags\n"); - for (i = 0; i < bi.SubSystemCount; i ++) + printf ("---- -------- ------------\n"); + for (i = 0; i < Info.bi.SubSystemCount; i ++) { printf ("%04x %08lx %04x\n", - bi.SubSystem[i].Id, - bi.SubSystem[i].ProcessId, - bi.SubSystem[i].Flags); + Info.bi.SubSystem[i].Id, + Info.bi.SubSystem[i].ProcessId, + Info.bi.SubSystem[i].Flags); } + break; + case 3: + printf ("SubSystem ID: %d\n", Info.ssi.SubSystemId); + printf (" Flags: %04x\n", Info.ssi.Flags); + printf (" Process ID: %ld\n", Info.ssi.ProcessId); + wprintf(L" NSRootNode: '%s'\n", Info.ssi.NameSpaceRootNode); + break; + default: + break; } - else - { - printf ("Status 0x%08lx\n", Status); - rc = EXIT_FAILURE; - } return rc; }

19 years, 8 months

[ion] 14650: Put in alphabetical order, remove IopCreateDevice, and remove incorrect implementation tag for EFi functions

by ion＠svn.reactos.com

Put in alphabetical order, remove IopCreateDevice, and remove incorrect implementation tag for EFi functions Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/efi.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-04-17 15:09:15 UTC (rev 14649) +++ trunk/reactos/ntoskrnl/io/device.c 2005-04-17 16:26:44 UTC (rev 14650) @@ -113,22 +113,6 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL -IopCreateDevice( - PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - DPRINT("IopCreateDevice(ObjectBody %x, Parent %x, RemainingPath %S)\n", - ObjectBody, Parent, RemainingPath); - - if (RemainingPath != NULL && wcschr(RemainingPath + 1, '\\') != NULL) - return STATUS_OBJECT_PATH_NOT_FOUND; - - return STATUS_SUCCESS; -} - NTSTATUS STDCALL IopGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, @@ -238,36 +222,11 @@ } /* - * IoAttachDeviceToDeviceStack - * - * Status - * @implemented - */ -PDEVICE_OBJECT -STDCALL -IoAttachDeviceToDeviceStack(PDEVICE_OBJECT SourceDevice, - PDEVICE_OBJECT TargetDevice) -{ - NTSTATUS Status; - PDEVICE_OBJECT LocalAttach; - - /* Attach it safely */ - DPRINT("IoAttachDeviceToDeviceStack\n"); - Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, - TargetDevice, - &LocalAttach); - - /* Return it */ - DPRINT("IoAttachDeviceToDeviceStack DONE: %x\n", LocalAttach); - return LocalAttach; -} -/* * IoAttachDeviceByPointer * * Status * @implemented */ - NTSTATUS STDCALL IoAttachDeviceByPointer(IN PDEVICE_OBJECT SourceDevice, @@ -288,6 +247,31 @@ } /* + * IoAttachDeviceToDeviceStack + * + * Status + * @implemented + */ +PDEVICE_OBJECT +STDCALL +IoAttachDeviceToDeviceStack(PDEVICE_OBJECT SourceDevice, + PDEVICE_OBJECT TargetDevice) +{ + NTSTATUS Status; + PDEVICE_OBJECT LocalAttach; + + /* Attach it safely */ + DPRINT("IoAttachDeviceToDeviceStack\n"); + Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, + TargetDevice, + &LocalAttach); + + /* Return it */ + DPRINT("IoAttachDeviceToDeviceStack DONE: %x\n", LocalAttach); + return LocalAttach; +} + +/* * @implemented */ NTSTATUS @@ -334,12 +318,210 @@ } /* + * IoCreateDevice + * + * Allocates memory for and intializes a device object for use for + * a driver. + * + * Parameters + * DriverObject + * Driver object passed by IO Manager when the driver was loaded. + * + * DeviceExtensionSize + * Number of bytes for the device extension. + * + * DeviceName + * Unicode name of device. + * + * DeviceType + * Device type of the new device. + * + * DeviceCharacteristics + * Bit mask of device characteristics. + * + * Exclusive + * TRUE if only one thread can access the device at a time. + * + * DeviceObject + * On successful return this parameter is filled by pointer to + * allocated device object. + * + * Status + * @implemented + */ +NTSTATUS +STDCALL +IoCreateDevice(PDRIVER_OBJECT DriverObject, + ULONG DeviceExtensionSize, + PUNICODE_STRING DeviceName, + DEVICE_TYPE DeviceType, + ULONG DeviceCharacteristics, + BOOLEAN Exclusive, + PDEVICE_OBJECT *DeviceObject) +{ + WCHAR AutoNameBuffer[20]; + UNICODE_STRING AutoName; + PDEVICE_OBJECT CreatedDeviceObject; + PDEVOBJ_EXTENSION DeviceObjectExtension; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + ULONG AlignedDeviceExtensionSize; + ULONG TotalSize; + HANDLE TempHandle; + + ASSERT_IRQL(PASSIVE_LEVEL); + DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject); + + /* Generate a name if we have to */ + if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) + { + swprintf(AutoNameBuffer, + L"\\Device\\%08lx", + InterlockedIncrementUL(&IopDeviceObjectNumber)); + RtlInitUnicodeString(&AutoName, AutoNameBuffer); + DeviceName = &AutoName; + } + + /* Initialize the Object Attributes */ + InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); + + /* Honour exclusive flag */ + ObjectAttributes.Attributes |= OBJ_EXCLUSIVE; + + /* Align the Extension Size to 8-bytes */ + AlignedDeviceExtensionSize = (DeviceExtensionSize + 7) &~ 7; + DPRINT("AlignedDeviceExtensionSize %x\n", AlignedDeviceExtensionSize); + + /* Total Size */ + TotalSize = AlignedDeviceExtensionSize + + sizeof(DEVICE_OBJECT) + sizeof(DEVOBJ_EXTENSION); + DPRINT("TotalSize %x\n", TotalSize); + + /* Create the Device Object */ + Status = ObCreateObject(KernelMode, + IoDeviceObjectType, + &ObjectAttributes, + KernelMode, + NULL, + TotalSize, + 0, + 0, + (PVOID*)&CreatedDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() ObCreateObject failed, status: 0x%08X\n", Status); + return Status; + } + + /* Clear the whole Object and extension so we don't null stuff manually */ + RtlZeroMemory(CreatedDeviceObject, TotalSize); + DPRINT("CreatedDeviceObject %x\n", CreatedDeviceObject); + + /* + * Setup the Type and Size. Note that we don't use the aligned size, + * because that's only padding for the DevObjExt and not part of the Object. + */ + CreatedDeviceObject->Type = IO_TYPE_DEVICE; + CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + DeviceExtensionSize; + + /* The kernel extension is after the driver internal extension */ + DeviceObjectExtension = (PDEVOBJ_EXTENSION) + ((ULONG_PTR)(CreatedDeviceObject + 1) + + AlignedDeviceExtensionSize); + + /* Set the Type and Size. Question: why is Size 0 on Windows? */ + DPRINT("DeviceObjectExtension %x\n", DeviceObjectExtension); + DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; + DeviceObjectExtension->Size = 0; + + /* Link the Object and Extension */ + DeviceObjectExtension->DeviceObject = CreatedDeviceObject; + CreatedDeviceObject->DeviceObjectExtension = DeviceObjectExtension; + + /* Set Device Object Data */ + CreatedDeviceObject->DeviceType = DeviceType; + CreatedDeviceObject->Characteristics = DeviceCharacteristics; + CreatedDeviceObject->DeviceExtension = CreatedDeviceObject + 1; + CreatedDeviceObject->StackSize = 1; + CreatedDeviceObject->AlignmentRequirement = 1; /* FIXME */ + + /* Set the Flags */ + /* FIXME: After the Driver is Loaded, the flag below should be removed */ + CreatedDeviceObject->Flags = DO_DEVICE_INITIALIZING; + if (Exclusive) CreatedDeviceObject->Flags |= DO_EXCLUSIVE; + if (DeviceName) CreatedDeviceObject->Flags |= DO_DEVICE_HAS_NAME; + + /* Attach a Vpb for Disks and Tapes, and create the Device Lock */ + if (CreatedDeviceObject->DeviceType == FILE_DEVICE_DISK || + CreatedDeviceObject->DeviceType == FILE_DEVICE_VIRTUAL_DISK || + CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE) + { + /* Create Vpb */ + IopAttachVpb(CreatedDeviceObject); + + /* Initialize Lock Event */ + KeInitializeEvent(&CreatedDeviceObject->DeviceLock, + SynchronizationEvent, + TRUE); + } + + /* Set the right Sector Size */ + switch (DeviceType) + { + case FILE_DEVICE_DISK_FILE_SYSTEM: + case FILE_DEVICE_DISK: + case FILE_DEVICE_VIRTUAL_DISK: + CreatedDeviceObject->SectorSize = 512; + break; + + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + CreatedDeviceObject->SectorSize = 2048; + break; + } + + /* Create the Device Queue */ + KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); + + /* Insert the Object */ + Status = ObInsertObject(CreatedDeviceObject, + NULL, + FILE_READ_DATA | FILE_WRITE_DATA, + 0, + NULL, + &TempHandle); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot insert Device Object into Handle Table\n"); + *DeviceObject = NULL; + return Status; + } + + /* Now do the final linking */ + ObReferenceObject(DriverObject); + CreatedDeviceObject->DriverObject = DriverObject; + CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; + DriverObject->DeviceObject = CreatedDeviceObject; + + /* Close the temporary handle, but do an extra reference first so it doesn't die */ + ObReferenceObject(CreatedDeviceObject); + NtClose(TempHandle); + + /* Return to caller */ + *DeviceObject = CreatedDeviceObject; + return STATUS_SUCCESS; +} + +/* * IoDeleteDevice * * Status * @implemented */ -VOID STDCALL +VOID +STDCALL IoDeleteDevice(PDEVICE_OBJECT DeviceObject) { PDEVICE_OBJECT Previous; @@ -373,6 +555,23 @@ } /* + * IoDetachDevice + * + * Status + * @implemented + */ +VOID +STDCALL +IoDetachDevice(PDEVICE_OBJECT TargetDevice) +{ + DPRINT("IoDetachDevice(TargetDevice %x)\n", TargetDevice); + + /* Remove the attachment */ + TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; + TargetDevice->AttachedDevice = NULL; +} + +/* * @implemented */ NTSTATUS @@ -430,6 +629,45 @@ } /* + * IoGetAttachedDevice + * + * Status + * @implemented + */ +PDEVICE_OBJECT +STDCALL +IoGetAttachedDevice(PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT Current = DeviceObject; + + /* Get the last attached device */ + while (Current->AttachedDevice) + { + Current = Current->AttachedDevice; + } + + /* Return it */ + return Current; +} + +/* + * IoGetAttachedDeviceReference + * + * Status + * @implemented + */ +PDEVICE_OBJECT +STDCALL +IoGetAttachedDeviceReference(PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT Current = IoGetAttachedDevice(DeviceObject); + + /* Reference the ATtached Device */ + ObReferenceObject(Current); + return Current; +} + +/* * @implemented */ PDEVICE_OBJECT @@ -441,6 +679,27 @@ } /* + * IoGetDeviceObjectPointer + * + * Status + * @implemented + */ +NTSTATUS +STDCALL +IoGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, + IN ACCESS_MASK DesiredAccess, + OUT PFILE_OBJECT *FileObject, + OUT PDEVICE_OBJECT *DeviceObject) +{ + /* Call the helper routine for a normal operation */ + return IopGetDeviceObjectPointer(ObjectName, + DesiredAccess, + FileObject, + DeviceObject, + 0); +} + +/* * @implemented */ NTSTATUS @@ -539,280 +798,6 @@ } /* - * IoGetDeviceObjectPointer - * - * Status - * @implemented - */ -NTSTATUS -STDCALL -IoGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, - IN ACCESS_MASK DesiredAccess, - OUT PFILE_OBJECT *FileObject, - OUT PDEVICE_OBJECT *DeviceObject) -{ - /* Call the helper routine for a normal operation */ - return IopGetDeviceObjectPointer(ObjectName, - DesiredAccess, - FileObject, - DeviceObject, - 0); -} - -/* - * IoDetachDevice - * - * Status - * @implemented - */ -VOID -STDCALL -IoDetachDevice(PDEVICE_OBJECT TargetDevice) -{ - DPRINT("IoDetachDevice(TargetDevice %x)\n", TargetDevice); - - /* Remove the attachment */ - TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; - TargetDevice->AttachedDevice = NULL; -} - -/* - * IoGetAttachedDevice - * - * Status - * @implemented - */ -PDEVICE_OBJECT -STDCALL -IoGetAttachedDevice(PDEVICE_OBJECT DeviceObject) -{ - PDEVICE_OBJECT Current = DeviceObject; - - /* Get the last attached device */ - while (Current->AttachedDevice) - { - Current = Current->AttachedDevice; - } - - /* Return it */ - return Current; -} - -/* - * IoGetAttachedDeviceReference - * - * Status - * @implemented - */ -PDEVICE_OBJECT -STDCALL -IoGetAttachedDeviceReference(PDEVICE_OBJECT DeviceObject) -{ - PDEVICE_OBJECT Current = IoGetAttachedDevice(DeviceObject); - - /* Reference the ATtached Device */ - ObReferenceObject(Current); - return Current; -} - -/* - * IoCreateDevice - * - * Allocates memory for and intializes a device object for use for - * a driver. - * - * Parameters - * DriverObject - * Driver object passed by IO Manager when the driver was loaded. - * - * DeviceExtensionSize - * Number of bytes for the device extension. - * - * DeviceName - * Unicode name of device. - * - * DeviceType - * Device type of the new device. - * - * DeviceCharacteristics - * Bit mask of device characteristics. - * - * Exclusive - * TRUE if only one thread can access the device at a time. - * - * DeviceObject - * On successful return this parameter is filled by pointer to - * allocated device object. - * - * Status - * @implemented - */ -NTSTATUS -STDCALL -IoCreateDevice(PDRIVER_OBJECT DriverObject, - ULONG DeviceExtensionSize, - PUNICODE_STRING DeviceName, - DEVICE_TYPE DeviceType, - ULONG DeviceCharacteristics, - BOOLEAN Exclusive, - PDEVICE_OBJECT *DeviceObject) -{ - WCHAR AutoNameBuffer[20]; - UNICODE_STRING AutoName; - PDEVICE_OBJECT CreatedDeviceObject; - PDEVOBJ_EXTENSION DeviceObjectExtension; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - ULONG AlignedDeviceExtensionSize; - ULONG TotalSize; - HANDLE TempHandle; - - ASSERT_IRQL(PASSIVE_LEVEL); - DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject); - - /* Generate a name if we have to */ - if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) - { - swprintf(AutoNameBuffer, - L"\\Device\\%08lx", - InterlockedIncrementUL(&IopDeviceObjectNumber)); - RtlInitUnicodeString(&AutoName, AutoNameBuffer); - DeviceName = &AutoName; - } - - /* Initialize the Object Attributes */ - InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); - - /* Honour exclusive flag */ - ObjectAttributes.Attributes |= OBJ_EXCLUSIVE; - - /* Align the Extension Size to 8-bytes */ - AlignedDeviceExtensionSize = (DeviceExtensionSize + 7) &~ 7; - DPRINT("AlignedDeviceExtensionSize %x\n", AlignedDeviceExtensionSize); - - /* Total Size */ - TotalSize = AlignedDeviceExtensionSize + - sizeof(DEVICE_OBJECT) + sizeof(DEVOBJ_EXTENSION); - DPRINT("TotalSize %x\n", TotalSize); - - /* Create the Device Object */ - Status = ObCreateObject(KernelMode, - IoDeviceObjectType, - &ObjectAttributes, - KernelMode, - NULL, - TotalSize, - 0, - 0, - (PVOID*)&CreatedDeviceObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoCreateDevice() ObCreateObject failed, status: 0x%08X\n", Status); - return Status; - } - - /* Clear the whole Object and extension so we don't null stuff manually */ - RtlZeroMemory(CreatedDeviceObject, TotalSize); - DPRINT("CreatedDeviceObject %x\n", CreatedDeviceObject); - - /* - * Setup the Type and Size. Note that we don't use the aligned size, - * because that's only padding for the DevObjExt and not part of the Object. - */ - CreatedDeviceObject->Type = IO_TYPE_DEVICE; - CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + DeviceExtensionSize; - - /* The kernel extension is after the driver internal extension */ - DeviceObjectExtension = (PDEVOBJ_EXTENSION) - ((ULONG_PTR)(CreatedDeviceObject + 1) + - AlignedDeviceExtensionSize); - - /* Set the Type and Size. Question: why is Size 0 on Windows? */ - DPRINT("DeviceObjectExtension %x\n", DeviceObjectExtension); - DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; - DeviceObjectExtension->Size = 0; - - /* Link the Object and Extension */ - DeviceObjectExtension->DeviceObject = CreatedDeviceObject; - CreatedDeviceObject->DeviceObjectExtension = DeviceObjectExtension; - - /* Set Device Object Data */ - CreatedDeviceObject->DeviceType = DeviceType; - CreatedDeviceObject->Characteristics = DeviceCharacteristics; - CreatedDeviceObject->DeviceExtension = CreatedDeviceObject + 1; - CreatedDeviceObject->StackSize = 1; - CreatedDeviceObject->AlignmentRequirement = 1; /* FIXME */ - - /* Set the Flags */ - /* FIXME: After the Driver is Loaded, the flag below should be removed */ - CreatedDeviceObject->Flags = DO_DEVICE_INITIALIZING; - if (Exclusive) CreatedDeviceObject->Flags |= DO_EXCLUSIVE; - if (DeviceName) CreatedDeviceObject->Flags |= DO_DEVICE_HAS_NAME; - - /* Attach a Vpb for Disks and Tapes, and create the Device Lock */ - if (CreatedDeviceObject->DeviceType == FILE_DEVICE_DISK || - CreatedDeviceObject->DeviceType == FILE_DEVICE_VIRTUAL_DISK || - CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM || - CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE) - { - /* Create Vpb */ - IopAttachVpb(CreatedDeviceObject); - - /* Initialize Lock Event */ - KeInitializeEvent(&CreatedDeviceObject->DeviceLock, - SynchronizationEvent, - TRUE); - } - - /* Set the right Sector Size */ - switch (DeviceType) - { - case FILE_DEVICE_DISK_FILE_SYSTEM: - case FILE_DEVICE_DISK: - case FILE_DEVICE_VIRTUAL_DISK: - CreatedDeviceObject->SectorSize = 512; - break; - - case FILE_DEVICE_CD_ROM_FILE_SYSTEM: - CreatedDeviceObject->SectorSize = 2048; - break; - } - - /* Create the Device Queue */ - KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); - - /* Insert the Object */ - Status = ObInsertObject(CreatedDeviceObject, - NULL, - FILE_READ_DATA | FILE_WRITE_DATA, - 0, - NULL, - &TempHandle); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Cannot insert Device Object into Handle Table\n"); - *DeviceObject = NULL; - return Status; - } - - /* Now do the final linking */ - ObReferenceObject(DriverObject); - CreatedDeviceObject->DriverObject = DriverObject; - CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; - DriverObject->DeviceObject = CreatedDeviceObject; - - /* Close the temporary handle, but do an extra reference first so it doesn't die */ - ObReferenceObject(CreatedDeviceObject); - NtClose(TempHandle); - - /* Return to caller */ - *DeviceObject = CreatedDeviceObject; - return STATUS_SUCCESS; -} - -/* * @unimplemented */ NTSTATUS @@ -852,7 +837,6 @@ UNIMPLEMENTED; } - /* * @unimplemented */ _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-04-17 15:09:15 UTC (rev 14649) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-04-17 16:26:44 UTC (rev 14650) @@ -1649,6 +1649,7 @@ PDRIVER_OBJECT DriverObject; UNICODE_STRING ServiceKeyName; HANDLE hDriver; + ULONG i; /* First, create a unique name for the driver if we don't have one */ if (!DriverName) { @@ -1695,7 +1696,12 @@ DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; - /* FIXME: Invalidate all Major Functions b/c now they are NULL and might crash */ + + /* Invalidate all Major Functions */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + DriverObject->MajorFunction[i] = IopInvalidDeviceRequest; + } /* Set up the Service Key Name */ ServiceKeyName.Buffer = ExAllocatePool(PagedPool, LocalDriverName.Length + sizeof(WCHAR)); _____ Modified: trunk/reactos/ntoskrnl/io/efi.c --- trunk/reactos/ntoskrnl/io/efi.c 2005-04-17 15:09:15 UTC (rev 14649) +++ trunk/reactos/ntoskrnl/io/efi.c 2005-04-17 16:26:44 UTC (rev 14650) @@ -1,5 +1,4 @@ -/* $Id:$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/efi.c @@ -15,9 +14,6 @@ /* FUNCTIONS *****************************************************************/ -/* - * @unimplemented - */ NTSTATUS STDCALL NtAddBootEntry( @@ -28,9 +24,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ + NTSTATUS STDCALL NtDeleteBootEntry( @@ -41,9 +35,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ + NTSTATUS STDCALL NtEnumerateBootEntries( @@ -54,9 +46,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ + NTSTATUS STDCALL NtQueryBootEntryOrder( @@ -67,9 +57,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ + NTSTATUS STDCALL NtQueryBootOptions( @@ -80,9 +68,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ + NTSTATUS STDCALL NtSetBootEntryOrder( @@ -93,10 +79,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - -/* - * @unimplemented - */ + NTSTATUS STDCALL NtSetBootOptions( @@ -106,12 +89,8 @@ { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ +} + NTSTATUS STDCALL NtTranslateFilePath( @@ -124,5 +103,4 @@ return STATUS_NOT_IMPLEMENTED; } - /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-04-17 15:09:15 UTC (rev 14649) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-04-17 16:26:44 UTC (rev 14650) @@ -417,7 +417,7 @@ IoDeviceObjectType->Security = NULL; IoDeviceObjectType->QueryName = NULL; IoDeviceObjectType->OkayToClose = NULL; - IoDeviceObjectType->Create = IopCreateDevice; + IoDeviceObjectType->Create = NULL; IoDeviceObjectType->DuplicationNotify = NULL; RtlInitUnicodeString(&IoDeviceObjectType->TypeName, L"Device");

19 years, 8 months

[weiden] 14649: svn maintainance: ignore generated files

by weiden＠svn.reactos.com

svn maintainance: ignore generated files Property changes on: trunk/reactos/drivers/bus/pci ___________________________________________________________________ Name: svn:ignore - pci.coff *.d *.o *.a *.sym *.sys *.map + *.coff *.d *.o *.a *.sym *.sys *.map Property changes on: trunk/reactos/drivers/bus/serenum ___________________________________________________________________ Name: svn:ignore + *.coff *.d *.o *.a *.sym *.sys *.map Property changes on: trunk/reactos/drivers/storage/floppy ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp *.coff *.o *.a *.sys *.sym *.map + base.tmp junk.tmp temp.exp *.coff *.o *.a *.d *.sys *.sym *.map Property changes on: trunk/reactos/lib/dhcpcapi ___________________________________________________________________ Name: svn:ignore + temp.exp *.a *.dll *.lib *.sym *.coff *.map *.tmp *.o *.gch *.d Property changes on: trunk/reactos/lib/kbdru ___________________________________________________________________ Name: svn:ignore + *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.map *.d Property changes on: trunk/reactos/lib/riched20 ___________________________________________________________________ Name: svn:ignore + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.spec.def *.stubs.c Makefile.ros Property changes on: trunk/reactos/lib/serialui ___________________________________________________________________ Name: svn:ignore + *.d *.tmp *.lib *.sym *.coff *.dll *.o *.a *.map Property changes on: trunk/reactos/lib/setupapi ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.spec.def *.stubs.c Makefile.ros + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.spec.def *.stubs.c Makefile.ros pnp.h pnp_c.c Property changes on: trunk/reactos/lib/smlib ___________________________________________________________________ Name: svn:ignore + *.d *.o Property changes on: trunk/reactos/services/umpnpmgr ___________________________________________________________________ Name: svn:ignore - umpnpmgr.a umpnpmgr.coff umpnpmgr.map umpnpmgr.nostrip.exe umpnpmgr.exe + *.coff *.map *.exe *.a *.d pnp.h pnp_s.c Property changes on: trunk/reactos/subsys/system/dhcp ___________________________________________________________________ Name: svn:ignore + *.coff *.map *.exe *.a *.d Property changes on: trunk/reactos/subsys/system/explorer/services ___________________________________________________________________ Name: svn:ignore + *.d *.o Property changes on: trunk/reactos/subsys/system/services ___________________________________________________________________ Name: svn:ignore - services.coff services.exe services.nostrip.exe *.d *.o *.a *.sym *.map + *.coff *.exe *.d *.o *.a *.sym *.map svcctl_s.c svcctl_s.h Property changes on: trunk/reactos/tools/widl ___________________________________________________________________ Name: svn:ignore + *.o *.d *.exe *.coff *.sym *.map

19 years, 8 months

[weiden] 14648: svn-ignore svcctl_c.c and svcctl_c.h

by weiden＠svn.reactos.com

svn-ignore svcctl_c.c and svcctl_c.h Property changes on: trunk/reactos/lib/advapi32/service ___________________________________________________________________ Name: svn:ignore - *.o .*.d + *.o .*.d svcctl_c.c svcctl_c.h

19 years, 8 months

[ekohl] 14647: - Move generated files to the top of the file list.

by ekohl＠svn.reactos.com

- Move generated files to the top of the file list. - Rename generated file svcctl.h to svcctl_c.h. Modified: trunk/reactos/lib/advapi32/makefile Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/makefile --- trunk/reactos/lib/advapi32/makefile 2005-04-17 08:00:01 UTC (rev 14646) +++ trunk/reactos/lib/advapi32/makefile 2005-04-17 11:01:00 UTC (rev 14647) @@ -48,11 +48,11 @@ sec/trustee.o SERVICE_OBJECTS = \ + service/svcctl_c.o \ service/eventlog.o \ service/scm.o \ service/sctrl.o \ - service/undoc.o \ - service/svcctl_c.o + service/undoc.o TOKEN_OBJECTS = \ token/privilege.o \ @@ -68,7 +68,7 @@ DEP_OBJECTS = $(TARGET_OBJECTS) -TARGET_CLEAN = service/svcctl_c.c service/svcctl.h +TARGET_CLEAN = service/svcctl_c.c service/svcctl_c.h include $(PATH_TO_TOP)/rules.mak @@ -81,4 +81,4 @@ -I $(PATH_TO_TOP)/w32api/include service/svcctl_c.c service/svcctl.h: $(PATH_TO_TOP)/include/idl/svcctl.idl - $(WIDL) $(WIDL_FLAGS) -h -H service/svcctl.h -c -C service/svcctl_c.c $(PATH_TO_TOP)/include/idl/svcctl.idl + $(WIDL) $(WIDL_FLAGS) -h -H service/svcctl_c.h -c -C service/svcctl_c.c $(PATH_TO_TOP)/include/idl/svcctl.idl _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-17 08:00:01 UTC (rev 14646) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-17 11:01:00 UTC (rev 14647) @@ -13,7 +13,7 @@ /* INCLUDES ******************************************************************/ #include "advapi32.h" -#include "svcctl.h" +#include "svcctl_c.h" #define NDEBUG #include <debug.h> @@ -187,6 +187,8 @@ return FALSE; } + DPRINT1("ControlService() done\n"); + return TRUE; #endif

19 years, 8 months

[arty] 14646: Add sufficient permission to the TCP handle to configure the IP address.

by arty＠svn.reactos.com

Add sufficient permission to the TCP handle to configure the IP address. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-04-17 07:58:24 UTC (rev 14645) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-04-17 08:00:01 UTC (rev 14646) @@ -77,7 +77,8 @@ NULL ); status = ZwCreateFile( tcpFile, - SYNCHRONIZE | GENERIC_EXECUTE, + SYNCHRONIZE | GENERIC_EXECUTE | + GENERIC_READ | GENERIC_WRITE, &objectAttributes, &ioStatusBlock, NULL,

19 years, 8 months

[arty] 14645: More cleaning. Mostly working DHCP. IP address is automatically discovered

by arty＠svn.reactos.com

More cleaning. Mostly working DHCP. IP address is automatically discovered and configured on the first ethernet adapter. Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/dispatch.c Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Modified: trunk/reactos/subsys/system/dhcp/util.c _____ Modified: trunk/reactos/subsys/system/dhcp/adapter.c --- trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-17 07:55:24 UTC (rev 14644) +++ trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-17 07:58:24 UTC (rev 14645) @@ -62,10 +62,11 @@ 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)); + DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", + Table->table[i].dwIndex)); Adapter = calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); - if( Adapter ) { + if( Adapter && Table->table[i].dwType ) { memcpy( &Adapter->IfMib, &Table->table[i], sizeof(Adapter->IfMib) ); GetAddress( Adapter ); @@ -93,6 +94,7 @@ Adapter->DhclientInfo.wfdesc = DhcpSocket; } Adapter->DhclientState.config = &Adapter->DhclientConfig; + Adapter->DhclientConfig.timeout = DHCP_PANIC_TIMEOUT; Adapter->DhclientConfig.initial_interval = DHCP_DISCOVER_INTERVAL; Adapter->DhclientConfig.retry_interval = DHCP_DISCOVER_INTERVAL; Adapter->DhclientConfig.select_interval = 1; @@ -154,6 +156,20 @@ return NULL; } +PDHCP_ADAPTER AdapterFindInfo( struct interface_info *ip ) { + PDHCP_ADAPTER Adapter; + PLIST_ENTRY ListEntry; + + for( ListEntry = AdapterList.Flink; + ListEntry != &AdapterList; + ListEntry = ListEntry->Flink ) { + Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); + if( ip == &Adapter->DhclientInfo ) return Adapter; + } + + return NULL; +} + PDHCP_ADAPTER AdapterGetFirst() { if( IsListEmpty( &AdapterList ) ) return NULL; else { return CONTAINING_RECORD _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-17 07:55:24 UTC (rev 14644) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-17 07:58:24 UTC (rev 14645) @@ -85,6 +85,7 @@ struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } }; struct in_addr inaddr_any; struct sockaddr_in sockaddr_broadcast; +unsigned long old_default_route = 0; /* * ASSERT_STATE() does nothing now; it used to be @@ -437,20 +438,22 @@ /* 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; + 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 0 /* XXX Later check ARP. For now, trust leases */ + if (script_go()) { + make_decline(ip, lp); + send_decline(ip); + goto freeit; + } +#endif + picked = lp; + picked->next = NULL; } else { freeit: free_client_lease(lp); @@ -580,42 +583,121 @@ bind_lease(ip); } +void set_name_servers( struct client_lease *new_lease ) { + if( new_lease->options[DHO_NAME_SERVERS].len ) { + HKEY RegKey; + struct iaddr nameserver; + char *nsbuf; + int i, addrs = + new_lease->options[DHO_NAME_SERVERS].len / sizeof(ULONG); + + nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); + nsbuf[0] = 0; + + if( nsbuf && !RegOpenKeyEx + ( HKEY_LOCAL_MACHINE, + "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, KEY_WRITE, &RegKey ) ) { + for( i = 0; i < addrs; i++ ) { + memcpy( nameserver.iabuf, + new_lease->options[DHO_NAME_SERVERS].data + + (addrs * sizeof(ULONG)), sizeof(ULONG) ); + strcat( nsbuf, piaddr(nameserver) ); + if( i != addrs-1 ) strcat( nsbuf, "," ); + } + + DH_DbgPrint(MID_TRACE,("Setting Nameservers: %s\n", nsbuf)); + + RegSetValueEx( RegKey, "NameServer", 0, REG_SZ, + nsbuf, strlen(nsbuf) ); + + free( nsbuf ); + } + } +} + +void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) { + struct iaddr netmask; + + if( Adapter->NteContext ) + DeleteIPAddress( Adapter->NteContext ); + + if( new_lease->options[DHO_SUBNET_MASK].len ) { + NTSTATUS Status; + + memcpy( netmask.iabuf, + new_lease->options[DHO_SUBNET_MASK].data, + new_lease->options[DHO_SUBNET_MASK].len ); + + Status = AddIPAddress + ( *((ULONG*)new_lease->address.iabuf), + *((ULONG*)netmask.iabuf), + Adapter->IfMib.dwIndex, + &Adapter->NteContext, + &Adapter->NteInstance ); + + if( !NT_SUCCESS(Status) ) + warning("AddIPAddress: %x\n", Status); + } + + if( new_lease->options[DHO_ROUTERS].len ) { + MIB_IPFORWARDROW RouterMib; + NTSTATUS Status; + struct iaddr router; + + memcpy( netmask.iabuf, + new_lease->options[DHO_ROUTERS].data, + new_lease->options[DHO_ROUTERS].len ); + + RouterMib.dwForwardDest = 0; /* Default route */ + RouterMib.dwForwardMask = 0; + RouterMib.dwForwardMetric1 = 1; + + if( old_default_route ) { + RouterMib.dwForwardDest = old_default_route; + DeleteIpForwardEntry( &RouterMib ); + } + + RouterMib.dwForwardNextHop = *((ULONG*)router.iabuf); + + Status = CreateIpForwardEntry( &RouterMib ); + + if( !NT_SUCCESS(Status) ) + warning("CreateIpForwardEntry: %x\n", Status); + else + old_default_route = RouterMib.dwForwardNextHop; + } +} + + void bind_lease(struct interface_info *ip) { - /* Remember the medium. */ - ip->client->new->medium = ip->client->medium; + PDHCP_ADAPTER Adapter; + struct client_lease *new_lease = ip->client->new; - /* Write out the new lease. */ - write_client_lease(ip, ip->client->new, 0); + /* Remember the medium. */ + ip->client->new->medium = ip->client->medium; + ip->client->active = ip->client->new; + ip->client->new = NULL; - /* 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(); + /* Set up a timeout to start the renewal process. */ + add_timeout(ip->client->active->renewal, state_bound, ip); - /* 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; + note("bound to %s -- renewal in %d seconds.", + piaddr(ip->client->active->address), + ip->client->active->renewal - cur_time); - /* Set up a timeout to start the renewal process. */ - add_timeout(ip->client->active->renewal, state_bound, ip); + ip->client->state = S_BOUND; + + Adapter = AdapterFindInfo( 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(); + if( Adapter ) setup_adapter( Adapter, new_lease ); + else warning("Could not find adapter for info %p\n", ip); + + set_name_servers( new_lease ); + + reinitialize_interfaces(); } /* @@ -1588,8 +1670,6 @@ write_client_lease(ifi, ifi->client->active, 1); fflush(leaseFile); -// ftruncate(fileno(leaseFile), ftello(leaseFile)); -// fsync(fileno(leaseFile)); } void _____ Modified: trunk/reactos/subsys/system/dhcp/dispatch.c --- trunk/reactos/subsys/system/dhcp/dispatch.c 2005-04-17 07:55:24 UTC (rev 14644) +++ trunk/reactos/subsys/system/dhcp/dispatch.c 2005-04-17 07:58:24 UTC (rev 14645) @@ -206,27 +206,16 @@ FD_ZERO(&fds); -// fds = malloc(nfds * sizeof(struct pollfd)); -// if (fds == NULL) -// error("Can't allocate poll structures."); - do { - DH_DbgPrint(MID_TRACE,("Cycling dispatch()\n")); /* * Call any expired timeouts, and then if there's still * a timeout registered, time out the select call then. */ another: if (timeouts) { - DH_DbgPrint(MID_TRACE,("Some timeouts are available\n")); - struct timeout *t; if (timeouts->when <= cur_time) { - DH_DbgPrint(MID_TRACE,("Calling timeout %x %p %x\n", - timeouts->when, - timeouts->func, - timeouts->what)); t = timeouts; timeouts = timeouts->next; (*(t->func))(t->what); @@ -253,12 +242,7 @@ struct interface_info *ip = l->local; if (ip && (l->handler != got_one || !ip->dead)) { - DH_DbgPrint(MID_TRACE,("l->fd %d\n", l->fd)); - FD_SET(l->fd, &fds); -// fds[i].fd = l->fd; -// fds[i].events = POLLIN; -// fds[i].revents = 0; i++; } } @@ -269,14 +253,27 @@ /* Wait for a packet or a timeout... XXX */ timeval.tv_sec = to_msec / 1000; timeval.tv_usec = (to_msec % 1000) * 1000; - DH_DbgPrint(MID_TRACE,("select(%d,%d.%03d) =>\n", - nfds,timeval.tv_sec,timeval.tv_usec/1000)); ApiUnlock(); count = select(nfds, &fds, NULL, NULL, &timeval); - DH_DbgPrint(MID_TRACE,(" => %d\n", count)); + DH_DbgPrint(MID_TRACE,("Select: %d\n", count)); + + /* Review poll output */ + for (i = 0, l = protocols; l; l = l->next) { + struct interface_info *ip = l->local; + + if (ip && (l->handler != got_one || !ip->dead)) { + DH_DbgPrint + (MID_TRACE, + ("set(%d) -> %s\n", + l->fd, FD_ISSET(l->fd, &fds) ? "true" : "false")); + i++; + } + } + + ApiLock(); /* Not likely to be transitory... */ @@ -295,9 +292,7 @@ for (l = protocols; l; l = l->next) { struct interface_info *ip; ip = l->local; - if (!FD_ISSET(l->fd, &fds)) { -//.revents & (POLLIN | POLLHUP))) { -// fds[i].revents = 0; + if (FD_ISSET(l->fd, &fds)) { if (ip && (l->handler != got_one || !ip->dead)) { DH_DbgPrint(MID_TRACE,("Handling %x\n", l)); @@ -309,7 +304,6 @@ } interfaces_invalidated = 0; } - DH_DbgPrint(MID_TRACE,("Done\n")); } while (1); ApiUnlock(); /* Not reached currently */ _____ Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h --- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-04-17 07:55:24 UTC (rev 14644) +++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-04-17 07:58:24 UTC (rev 14645) @@ -21,6 +21,7 @@ #undef PREFER #define DHCP_DISCOVER_INTERVAL 15 #define DHCP_REBOOT_TIMEOUT 300 +#define DHCP_PANIC_TIMEOUT DHCP_REBOOT_TIMEOUT * 3 #define DHCP_BACKOFF_MAX 300 #define _PATH_DHCLIENT_PID "\\systemroot\\system32\\drivers\\etc\\dhclient.pid" @@ -59,6 +60,7 @@ #define srandom srand extern PDHCP_ADAPTER AdapterFindIndex( unsigned int AdapterIndex ); +extern PDHCP_ADAPTER AdapterFindInfo( struct interface_info *info ); extern VOID ApiInit(); extern VOID ApiLock(); extern VOID ApiUnlock(); _____ Modified: trunk/reactos/subsys/system/dhcp/util.c --- trunk/reactos/subsys/system/dhcp/util.c 2005-04-17 07:55:24 UTC (rev 14644) +++ trunk/reactos/subsys/system/dhcp/util.c 2005-04-17 07:58:24 UTC (rev 14645) @@ -2,8 +2,9 @@ #include "rosdhcp.h" char *piaddr( struct iaddr addr ) { - struct sockaddr_in *sa = (struct sockaddr_in *)addr.iabuf; - return inet_ntoa( sa->sin_addr ); + struct sockaddr_in sa; + memcpy(&sa.sin_addr,addr.iabuf,sizeof(sa.sin_addr)); + return inet_ntoa( sa.sin_addr ); } int note( char *format, ... ) {

19 years, 8 months

[arty] 14644: Needed infrastructure for DHCP:

by arty＠svn.reactos.com

Needed infrastructure for DHCP: Corrected adapter index problem in iinfo.c. Now the index returned is from IF->Index. ninfo: ditto. ip.c: Expose IPAddInterfaceRoute and IPRemoveInterfaceRoute for use by set ip address IOCTL. if.c: Allow deleting of TCP context. main.c: Turn off debugging in CVS. Modified: trunk/reactos/drivers/lib/ip/network/ip.c Modified: trunk/reactos/drivers/lib/ip/transport/tcp/if.c Modified: trunk/reactos/drivers/net/tcpip/include/ip.h Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c _____ Modified: trunk/reactos/drivers/lib/ip/network/ip.c --- trunk/reactos/drivers/lib/ip/network/ip.c 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/lib/ip/network/ip.c 2005-04-17 07:55:24 UTC (rev 14644) @@ -232,7 +232,28 @@ exFreePool(IF); } +VOID IPAddInterfaceRoute( PIP_INTERFACE IF ) { + PNEIGHBOR_CACHE_ENTRY NCE; + IP_ADDRESS NetworkAddress; + /* Add a permanent neighbor for this NTE */ + NCE = NBAddNeighbor(IF, &IF->Unicast, + IF->Address, IF->AddressLength, + NUD_PERMANENT); + if (!NCE) { + TI_DbgPrint(MIN_TRACE, ("Could not create NCE.\n")); + } + + AddrWidenAddress( &NetworkAddress, &IF->Unicast, &IF->Netmask ); + + if (!RouterAddRoute(&NetworkAddress, &IF->Netmask, NCE, 1)) { + TI_DbgPrint(MIN_TRACE, ("Could not add route due to insufficient resources.\n")); + } + + /* Allow TCP to hang some configuration on this interface */ + IF->TCPContext = TCPPrepareInterface( IF ); +} + BOOLEAN IPRegisterInterface( PIP_INTERFACE IF) /* @@ -246,8 +267,6 @@ KIRQL OldIrql; UINT ChosenIndex = 1; BOOLEAN IndexHasBeenChosen; - IP_ADDRESS NetworkAddress; - PNEIGHBOR_CACHE_ENTRY NCE; IF_LIST_ITER(Interface); TI_DbgPrint(MID_TRACE, ("Called. IF (0x%X).\n", IF)); @@ -264,39 +283,38 @@ } } EndFor(Interface); } while( !IndexHasBeenChosen ); - + IF->Index = ChosenIndex; - /* Add a permanent neighbor for this NTE */ - NCE = NBAddNeighbor(IF, &IF->Unicast, - IF->Address, IF->AddressLength, - NUD_PERMANENT); - if (!NCE) { - TI_DbgPrint(MIN_TRACE, ("Could not create NCE.\n")); - TcpipReleaseSpinLock(&IF->Lock, OldIrql); - return FALSE; - } + IPAddInterfaceRoute( IF ); - AddrWidenAddress( &NetworkAddress, &IF->Unicast, &IF->Netmask ); - - if (!RouterAddRoute(&NetworkAddress, &IF->Netmask, NCE, 1)) { - TI_DbgPrint(MIN_TRACE, ("Could not add route due to insufficient resources.\n")); - } - /* Add interface to the global interface list */ TcpipInterlockedInsertTailList(&InterfaceListHead, &IF->ListEntry, &InterfaceListLock); - /* Allow TCP to hang some configuration on this interface */ - IF->TCPContext = TCPPrepareInterface( IF ); - TcpipReleaseSpinLock(&IF->Lock, OldIrql); return TRUE; } +VOID IPRemoveInterfaceRoute( PIP_INTERFACE IF ) { + PNEIGHBOR_CACHE_ENTRY NCE; + IP_ADDRESS GeneralRoute; + TCPDisposeInterfaceData( IF->TCPContext ); + IF->TCPContext = NULL; + + AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); + RouterRemoveRoute(&GeneralRoute, &IF->Unicast); + + /* Remove permanent NCE, but first we have to find it */ + NCE = NBLocateNeighbor(&IF->Unicast); + if (NCE) + NBRemoveNeighbor(NCE); + +} + VOID IPUnregisterInterface( PIP_INTERFACE IF) /* @@ -306,15 +324,11 @@ */ { KIRQL OldIrql3; - PNEIGHBOR_CACHE_ENTRY NCE; TI_DbgPrint(DEBUG_IP, ("Called. IF (0x%X).\n", IF)); - /* Remove permanent NCE, but first we have to find it */ - NCE = NBLocateNeighbor(&IF->Unicast); - if (NCE) - NBRemoveNeighbor(NCE); - + IPRemoveInterfaceRoute( IF ); + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql3); RemoveEntryList(&IF->ListEntry); TcpipReleaseSpinLock(&InterfaceListLock, OldIrql3); _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/if.c --- trunk/reactos/drivers/lib/ip/transport/tcp/if.c 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/lib/ip/transport/tcp/if.c 2005-04-17 07:55:24 UTC (rev 14644) @@ -65,6 +65,10 @@ return ifaddr; } +VOID TCPDisposeInterfaceData( PVOID Ptr ) { + exFreePool( Ptr ); +} + POSK_IFADDR TCPFindInterface( void *ClientData, OSK_UINT AddrType, OSK_UINT FindType, _____ Modified: trunk/reactos/drivers/net/tcpip/include/ip.h --- trunk/reactos/drivers/net/tcpip/include/ip.h 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/net/tcpip/include/ip.h 2005-04-17 07:55:24 UTC (rev 14644) @@ -207,6 +207,12 @@ PIP_INTERFACE IPCreateInterface( PLLIP_BIND_INFO BindInfo); +VOID IPAddInterfaceRoute( + PIP_INTERFACE IF); + +VOID IPRemoveInterfaceRoute( + PIP_INTERFACE IF); + VOID IPDestroyInterface( PIP_INTERFACE IF); _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-04-17 07:55:24 UTC (rev 14644) @@ -156,6 +156,8 @@ PVOID TCPPrepareInterface( PIP_INTERFACE IF ); +VOID TCPDisposeInterfaceData( PVOID Data ); + NTSTATUS TCPTranslateError( int OskitError ); VOID TCPTimeout(); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-04-17 07:55:24 UTC (rev 14644) @@ -1483,10 +1483,20 @@ break; } if( IF->Index == IpAddrChange->NteIndex ) { + IPRemoveInterfaceRoute( IF ); + IF->Unicast.Type = IP_ADDRESS_V4; IF->Unicast.Address.IPv4Address = IpAddrChange->Address; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = IpAddrChange->Netmask; + + TI_DbgPrint(MID_TRACE,("New Unicast Address: %x\n", + IF->Unicast.Address.IPv4Address)); + TI_DbgPrint(MID_TRACE,("New Netmask : %x\n", + IF->Netmask.Address.IPv4Address)); + + IPAddInterfaceRoute( IF ); + IpAddrChange->Address = IF->Index; Status = STATUS_SUCCESS; Irp->IoStatus.Information = IF->Index; _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c --- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-04-17 07:55:24 UTC (rev 14644) @@ -9,7 +9,7 @@ */ #include "precomp.h" -//#define NDEBUG +#define NDEBUG #ifndef NDEBUG DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c --- trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2005-04-17 04:20:16 UTC (rev 14643) +++ trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2005-04-17 07:55:24 UTC (rev 14644) @@ -30,7 +30,7 @@ TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); ForEachInterface(CurrentIF) { - IpCurrent->Index = Count; + IpCurrent->Index = CurrentIF->Index; IpCurrent->Addr = 0; IpCurrent->BcastAddr = 0; IpCurrent->Mask = 0;

19 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
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