Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [FASTFAT] Improvements for volume dismount + minor bugfixing.
by Hermès Bélusca-Maïto 25 Nov '18

25 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b77824a3759c70e905420… commit b77824a3759c70e9054207078ccce33ec435afcf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 11 17:17:48 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Nov 25 09:00:40 2018 +0100 [FASTFAT] Improvements for volume dismount + minor bugfixing. - Cache the RootFcb so that its cleanup can be handled separately during dismounting. - Force volume dismount at cleanup if the VCB_DISMOUNT_PENDING flag is set. - Actually dismount a volume if its VCB has been flagged as not good, or if we force dismounting. NOTE: In their *CheckForDismount() function, our 3rd-party FS drivers as well as MS' fastfat, perform a comparison check of the current VCB's VPB ReferenceCount with some sort of "dangling"/"residual" open count. It seems to be related to the fact that the volume root directory as well as auxiliary data stream(s) are still opened, and only these are allowed to be opened at that moment. After analysis it appears that for the ReactOS' fastfat, this number is equal to "3". - On dismounting, cleanup and destroy the RootFcb, VolumeFcb and the FATFileObject. Then cleanup the SpareVPB or the IoVPB members, and finish by removing the dismounted volume from the VolumeListEntry and cleaning up the notify synchronization object and the resources. - During dismounting, and on shutdown, flush the volume before resetting its dirty bit. - On shutdown, after volume flushing, try to unmount it without forcing. - Release the VCB resources only when we actually dismount the volume in VfatCheckForDismount(). - Initialize first the notify list and the synchronization object, before sending the FSRTL_VOLUME_MOUNT notification. - If we failed at mounting a volume but its VCB's FATFileObject was already initialized, first call CcUninitializeCacheMap() on it before dereferencing it. - Send FSRTL_VOLUME_LOCK, FSRTL_VOLUME_LOCK_FAILED and FSRTL_VOLUME_UNLOCK notifications during volume locking (and failure) and volume unlocking. - Flush the volume before locking it, and clean its dirty bit if needed. NOTE: In addition to checking for VCB_CLEAR_DIRTY, we also check for the presence of the VCB_IS_DIRTY flag before cleaning up the dirty bit: this allows us to not re-clean the bit if it has been previously cleaned. This is needed for instance in this scenario: - The volume is locked (it gets flushed and the dirty bit is possibly cleared); - The volume then gets formatted with a completely different FS, that possibly clears up the first sector (e.g. BTRFS ignores 1st sector); - The volume is then dismounted: if we didn't check whether VCB_IS_DIRTY was set prior to resetting it, we could attempt clearing it again! But now that the volume's filesystem has been completely changed, we would then try to modify the dirty bit on an erroneous position on disk! That's why it should not be touched in this case during dismounting. - The volume is unlocked (same comment as above), and later can be detected as being BTRFS. --- drivers/filesystems/fastfat/cleanup.c | 2 +- drivers/filesystems/fastfat/close.c | 4 +- drivers/filesystems/fastfat/fat.c | 6 -- drivers/filesystems/fastfat/fcb.c | 20 +++-- drivers/filesystems/fastfat/flush.c | 4 +- drivers/filesystems/fastfat/fsctl.c | 92 +++++++++++++-------- drivers/filesystems/fastfat/misc.c | 141 +++++++++++++++++++++++++++------ drivers/filesystems/fastfat/shutdown.c | 17 ++-- drivers/filesystems/fastfat/vfat.h | 15 +++- 9 files changed, 220 insertions(+), 81 deletions(-) diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index 291cd77a2f..d09df956ca 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -161,7 +161,7 @@ VfatCleanupFile( #ifdef ENABLE_SWAPOUT if (IsVolume && BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) { - VfatCheckForDismount(DeviceExt, FALSE); + VfatCheckForDismount(DeviceExt, TRUE); } #endif diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index d8f85a85a4..b6c250f92c 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -21,8 +21,8 @@ VfatCommonCloseFile( PDEVICE_EXTENSION DeviceExt, PVFATFCB pFcb) { - /* Nothing to do for volumes */ - if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + /* Nothing to do for volumes or for the FAT file object */ + if (BooleanFlagOn(pFcb->Flags, FCB_IS_FAT | FCB_IS_VOLUME)) { return; } diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/fastfat/fat.c index 8d4ecd9cde..591e60b4fd 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/fastfat/fat.c @@ -20,12 +20,6 @@ #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) -/* FIXME: because volume is not cached, we have to perform direct IOs - * The day this is fixed, just comment out that line, and check - * it still works (and delete old code ;-)) - */ -#define VOLUME_IS_NOT_CACHED_WORK_AROUND_IT - /* FUNCTIONS ****************************************************************/ /* diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index ed85ab277c..a791c27a40 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -277,6 +277,7 @@ vfatDestroyFCB( #endif FsRtlUninitializeFileLock(&pFCB->FileLock); + if (!vfatFCBIsRoot(pFCB) && !BooleanFlagOn(pFCB->Flags, FCB_IS_FAT) && !BooleanFlagOn(pFCB->Flags, FCB_IS_VOLUME)) { @@ -317,11 +318,15 @@ _vfatGrabFCB( { DPRINT1("Inc ref count (%d, oc: %d) for: %p (%wZ) at: %s(%d) %s\n", pFCB->RefCount, pFCB->OpenHandleCount, pFCB, &pFCB->PathNameU, File, Line, Func); } +#else + DPRINT("Grabbing FCB at %p: %wZ, refCount:%d\n", + pFCB, &pFCB->PathNameU, pFCB->RefCount); #endif ASSERT(ExIsResourceAcquiredExclusive(&pVCB->DirResource)); - ASSERT(pFCB != pVCB->VolumeFcb); + ASSERT(!BooleanFlagOn(pFCB->Flags, FCB_IS_FAT)); + ASSERT(pFCB != pVCB->VolumeFcb && !BooleanFlagOn(pFCB->Flags, FCB_IS_VOLUME)); ASSERT(pFCB->RefCount > 0); ++pFCB->RefCount; } @@ -350,7 +355,7 @@ _vfatReleaseFCB( DPRINT1("Dec ref count (%d, oc: %d) for: %p (%wZ) at: %s(%d) %s\n", pFCB->RefCount, pFCB->OpenHandleCount, pFCB, &pFCB->PathNameU, File, Line, Func); } #else - DPRINT("releasing FCB at %p: %wZ, refCount:%d\n", + DPRINT("Releasing FCB at %p: %wZ, refCount:%d\n", pFCB, &pFCB->PathNameU, pFCB->RefCount); #endif @@ -360,7 +365,8 @@ _vfatReleaseFCB( { ULONG RefCount; - ASSERT(pFCB != pVCB->VolumeFcb); + ASSERT(!BooleanFlagOn(pFCB->Flags, FCB_IS_FAT)); + ASSERT(pFCB != pVCB->VolumeFcb && !BooleanFlagOn(pFCB->Flags, FCB_IS_VOLUME)); ASSERT(pFCB->RefCount > 0); RefCount = --pFCB->RefCount; @@ -647,6 +653,8 @@ vfatMakeRootFCB( NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\"); + ASSERT(pVCB->RootFcb == NULL); + FCB = vfatNewFCB(pVCB, &NameU); if (vfatVolumeIsFatX(pVCB)) { @@ -690,6 +698,9 @@ vfatMakeRootFCB( vfatFCBInitializeCacheFromVolume(pVCB, FCB); vfatAddFCBToTable(pVCB, FCB); + /* Cache it */ + pVCB->RootFcb = FCB; + return FCB; } @@ -705,6 +716,7 @@ vfatOpenRootFCB( { FCB = vfatMakeRootFCB(pVCB); } + ASSERT(FCB == pVCB->RootFcb); return FCB; } @@ -747,8 +759,6 @@ vfatAttachFCBToFileObject( { PVFATCCB newCCB; - UNREFERENCED_PARAMETER(vcb); - #ifdef KDBG if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &fcb->LongNameU, FALSE, NULL)) { diff --git a/drivers/filesystems/fastfat/flush.c b/drivers/filesystems/fastfat/flush.c index 22a8c6d08f..2861998420 100644 --- a/drivers/filesystems/fastfat/flush.c +++ b/drivers/filesystems/fastfat/flush.c @@ -59,7 +59,9 @@ VfatFlushVolume( KEVENT Event; IO_STATUS_BLOCK IoStatusBlock; - DPRINT("VfatFlushVolume(DeviceExt %p, FatFcb %p)\n", DeviceExt, VolumeFcb); + DPRINT("VfatFlushVolume(DeviceExt %p, VolumeFcb %p)\n", DeviceExt, VolumeFcb); + + ASSERT(VolumeFcb == DeviceExt->VolumeFcb); ListEntry = DeviceExt->FcbListHead.Flink; while (ListEntry != &DeviceExt->FcbListHead) diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index 6523487368..d8394e46a7 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -531,7 +531,6 @@ VfatMount( NTSTATUS Status; PVFATFCB Fcb = NULL; PVFATFCB VolumeFcb = NULL; - PVFATCCB Ccb = NULL; PDEVICE_OBJECT DeviceToMount; PVPB Vpb; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); @@ -706,23 +705,14 @@ VfatMount( goto ByeBye; } - Ccb = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); - if (Ccb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = vfatAttachFCBToFileObject(DeviceExt, Fcb, DeviceExt->FATFileObject); + if (!NT_SUCCESS(Status)) goto ByeBye; - } - RtlZeroMemory(Ccb, sizeof (VFATCCB)); - DeviceExt->FATFileObject->FsContext = Fcb; - DeviceExt->FATFileObject->FsContext2 = Ccb; - DeviceExt->FATFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; DeviceExt->FATFileObject->PrivateCacheMap = NULL; - DeviceExt->FATFileObject->Vpb = DeviceObject->Vpb; Fcb->FileObject = DeviceExt->FATFileObject; - Fcb->Flags |= FCB_IS_FAT; - + Fcb->Flags = FCB_IS_FAT; Fcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector; Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; @@ -798,9 +788,15 @@ VfatMount( SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); } - FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); - FsRtlNotifyInitializeSync(&DeviceExt->NotifySync); + /* Initialize the notify list and synchronization object */ InitializeListHead(&DeviceExt->NotifyList); + FsRtlNotifyInitializeSync(&DeviceExt->NotifySync); + + /* The VCB is OK for usage */ + SetFlag(DeviceExt->Flags, VCB_GOOD); + + /* Send the mount notification */ + FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); DPRINT("Mount success\n"); @@ -811,15 +807,24 @@ ByeBye: { /* Cleanup */ if (DeviceExt && DeviceExt->FATFileObject) - ObDereferenceObject (DeviceExt->FATFileObject); + { + LARGE_INTEGER Zero = {{0,0}}; + PVFATCCB Ccb = (PVFATCCB)DeviceExt->FATFileObject->FsContext2; + + CcUninitializeCacheMap(DeviceExt->FATFileObject, + &Zero, + NULL); + ObDereferenceObject(DeviceExt->FATFileObject); + if (Ccb) + vfatDestroyCCB(Ccb); + DeviceExt->FATFileObject = NULL; + } + if (Fcb) + vfatDestroyFCB(Fcb); if (DeviceExt && DeviceExt->SpareVPB) ExFreePoolWithTag(DeviceExt->SpareVPB, TAG_VPB); if (DeviceExt && DeviceExt->Statistics) ExFreePoolWithTag(DeviceExt->Statistics, TAG_STATS); - if (Fcb) - vfatDestroyFCB(Fcb); - if (Ccb) - vfatDestroyCCB(Ccb); if (DeviceObject) IoDeleteDevice(DeviceObject); } @@ -1125,6 +1130,11 @@ VfatLockOrUnlockVolume( return STATUS_ACCESS_DENIED; } + if (Lock) + { + FsRtlNotifyVolumeEvent(IrpContext->Stack->FileObject, FSRTL_VOLUME_LOCK); + } + /* Deny locking if we're not alone */ if (Lock && DeviceExt->OpenHandleCount != 1) { @@ -1208,6 +1218,8 @@ VfatLockOrUnlockVolume( } } + FsRtlNotifyVolumeEvent(IrpContext->Stack->FileObject, FSRTL_VOLUME_LOCK_FAILED); + return STATUS_ACCESS_DENIED; #if 1 @@ -1225,6 +1237,18 @@ VfatLockOrUnlockVolume( /* Finally, proceed */ if (Lock) { + /* Flush volume & files */ + VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); + + /* The volume is now clean */ + if (BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_CLEAR_DIRTY) && + BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_IS_DIRTY)) + { + /* Drop the dirty bit */ + if (NT_SUCCESS(SetDirtyStatus(DeviceExt, FALSE))) + ClearFlag(DeviceExt->VolumeFcb->Flags, VCB_IS_DIRTY); + } + DeviceExt->Flags |= VCB_VOLUME_LOCKED; Vpb->Flags |= VPB_LOCKED; } @@ -1232,6 +1256,8 @@ VfatLockOrUnlockVolume( { DeviceExt->Flags &= ~VCB_VOLUME_LOCKED; Vpb->Flags &= ~VPB_LOCKED; + + FsRtlNotifyVolumeEvent(IrpContext->Stack->FileObject, FSRTL_VOLUME_UNLOCK); } return STATUS_SUCCESS; @@ -1277,25 +1303,35 @@ VfatDismountVolume( ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); - /* We're performing a clean shutdown */ - if (BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_CLEAR_DIRTY)) + /* Flush volume & files */ + VfatFlushVolume(DeviceExt, (PVFATFCB)FileObject->FsContext); + + /* The volume is now clean */ + if (BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_CLEAR_DIRTY) && + BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_IS_DIRTY)) { /* Drop the dirty bit */ if (NT_SUCCESS(SetDirtyStatus(DeviceExt, FALSE))) DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; } - /* Flush volume & files */ - VfatFlushVolume(DeviceExt, (PVFATFCB)FileObject->FsContext); - /* Rebrowse the FCB in order to free them now */ while (!IsListEmpty(&DeviceExt->FcbListHead)) { NextEntry = RemoveTailList(&DeviceExt->FcbListHead); Fcb = CONTAINING_RECORD(NextEntry, VFATFCB, FcbListEntry); + + if (Fcb == DeviceExt->RootFcb) + DeviceExt->RootFcb = NULL; + else if (Fcb == DeviceExt->VolumeFcb) + DeviceExt->VolumeFcb = NULL; + vfatDestroyFCB(Fcb); } + /* We are uninitializing, the VCB cannot be used anymore */ + ClearFlag(DeviceExt->Flags, VCB_GOOD); + /* Mark we're being dismounted */ DeviceExt->Flags |= VCB_DISMOUNT_PENDING; #ifndef ENABLE_SWAPOUT @@ -1304,12 +1340,6 @@ VfatDismountVolume( ExReleaseResourceLite(&DeviceExt->FatResource); - /* Release a few resources and quit, we're done */ - ExFreePoolWithTag(DeviceExt->Statistics, TAG_STATS); - ExDeleteResourceLite(&DeviceExt->DirResource); - ExDeleteResourceLite(&DeviceExt->FatResource); - ObDereferenceObject(DeviceExt->FATFileObject); - return STATUS_SUCCESS; } diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/fastfat/misc.c index ad5f4bcec3..2068e8b5e4 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/fastfat/misc.c @@ -416,23 +416,43 @@ VfatLockUserBuffer( BOOLEAN VfatCheckForDismount( IN PDEVICE_EXTENSION DeviceExt, - IN BOOLEAN Create) + IN BOOLEAN Force) { KIRQL OldIrql; + ULONG UnCleanCount; PVPB Vpb; BOOLEAN Delete; - DPRINT1("VfatCheckForDismount(%p, %u)\n", DeviceExt, Create); + DPRINT1("VfatCheckForDismount(%p, %u)\n", DeviceExt, Force); + + /* If the VCB is OK (not under uninitialization) and we don't force dismount, do nothing */ + if (BooleanFlagOn(DeviceExt->Flags, VCB_GOOD) && !Force) + { + return FALSE; + } + + /* + * NOTE: In their *CheckForDismount() function, our 3rd-party FS drivers + * as well as MS' fastfat, perform a comparison check of the current VCB's + * VPB ReferenceCount with some sort of "dangling"/"residual" open count, + * depending on whether or not we are in IRP_MJ_CREATE. + * It seems to be related to the fact that the volume root directory as + * well as auxiliary data stream(s) are still opened, and only these are + * allowed to be opened at that moment. After analysis it appears that for + * the ReactOS' fastfat, this number is equal to "3". + */ + UnCleanCount = 3; /* Lock VPB */ IoAcquireVpbSpinLock(&OldIrql); /* Reference it and check if a create is being done */ Vpb = DeviceExt->IoVPB; - if (Vpb->ReferenceCount != Create) + DPRINT("Vpb->ReferenceCount = %d\n", Vpb->ReferenceCount); + if (Vpb->ReferenceCount != UnCleanCount || DeviceExt->OpenHandleCount != 0) { - /* Copy the VPB to our local own to prepare later dismount */ - if (DeviceExt->SpareVPB != NULL) + /* If we force-unmount, copy the VPB to our local own to prepare later dismount */ + if (Force && Vpb->RealDevice->Vpb == Vpb && DeviceExt->SpareVPB != NULL) { RtlZeroMemory(DeviceExt->SpareVPB, sizeof(VPB)); DeviceExt->SpareVPB->Type = IO_TYPE_VPB; @@ -443,9 +463,12 @@ VfatCheckForDismount( DeviceExt->IoVPB->RealDevice->Vpb = DeviceExt->SpareVPB; DeviceExt->SpareVPB = NULL; DeviceExt->IoVPB->Flags |= VPB_PERSISTENT; + + /* We are uninitializing, the VCB cannot be used anymore */ + ClearFlag(DeviceExt->Flags, VCB_GOOD); } - /* Don't do anything */ + /* Don't do anything for now */ Delete = FALSE; } else @@ -453,12 +476,30 @@ VfatCheckForDismount( /* Otherwise, delete the volume */ Delete = TRUE; - /* Check if it has a VPB and unmount it */ - if (Vpb->RealDevice->Vpb == Vpb) + /* Swap the VPB with our local own */ + if (Vpb->RealDevice->Vpb == Vpb && DeviceExt->SpareVPB != NULL) { - Vpb->DeviceObject = NULL; - Vpb->Flags &= ~VPB_MOUNTED; + RtlZeroMemory(DeviceExt->SpareVPB, sizeof(VPB)); + DeviceExt->SpareVPB->Type = IO_TYPE_VPB; + DeviceExt->SpareVPB->Size = sizeof(VPB); + DeviceExt->SpareVPB->RealDevice = DeviceExt->IoVPB->RealDevice; + DeviceExt->SpareVPB->DeviceObject = NULL; + DeviceExt->SpareVPB->Flags = DeviceExt->IoVPB->Flags & VPB_REMOVE_PENDING; + DeviceExt->IoVPB->RealDevice->Vpb = DeviceExt->SpareVPB; + DeviceExt->SpareVPB = NULL; + DeviceExt->IoVPB->Flags |= VPB_PERSISTENT; + + /* We are uninitializing, the VCB cannot be used anymore */ + ClearFlag(DeviceExt->Flags, VCB_GOOD); } + + /* + * We defer setting the VPB's DeviceObject to NULL for later because + * we want to handle the closing of the internal opened meta-files. + */ + + /* Clear the mounted and locked flags in the VPB */ + ClearFlag(Vpb->Flags, VPB_MOUNTED | VPB_LOCKED); } /* Release lock and return status */ @@ -467,34 +508,82 @@ VfatCheckForDismount( /* If we were to delete, delete volume */ if (Delete) { - PVPB DelVpb; + LARGE_INTEGER Zero = {{0,0}}; + PVFATFCB Fcb; + + /* We are uninitializing, the VCB cannot be used anymore */ + ClearFlag(DeviceExt->Flags, VCB_GOOD); + + /* Invalidate and close the internal opened meta-files */ + if (DeviceExt->RootFcb) + { + Fcb = DeviceExt->RootFcb; + CcUninitializeCacheMap(Fcb->FileObject, + &Zero, + NULL); + ObDereferenceObject(Fcb->FileObject); + DeviceExt->RootFcb = NULL; + vfatDestroyFCB(Fcb); + } + if (DeviceExt->VolumeFcb) + { + Fcb = DeviceExt->VolumeFcb; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUninitializeCacheMap(Fcb->FileObject, + &Zero, + NULL); + ObDereferenceObject(Fcb->FileObject); +#endif + DeviceExt->VolumeFcb = NULL; + vfatDestroyFCB(Fcb); + } + if (DeviceExt->FATFileObject) + { + Fcb = (PVFATFCB)DeviceExt->FATFileObject->FsContext; + CcUninitializeCacheMap(DeviceExt->FATFileObject, + &Zero, + NULL); + ObDereferenceObject(DeviceExt->FATFileObject); + DeviceExt->FATFileObject->FsContext = NULL; + DeviceExt->FATFileObject = NULL; + vfatDestroyFCB(Fcb); + } + + /* + * Now that the closing of the internal opened meta-files has been + * handled, we can now set the VPB's DeviceObject to NULL. + */ + Vpb->DeviceObject = NULL; /* If we have a local VPB, we'll have to delete it * but we won't dismount us - something went bad before */ if (DeviceExt->SpareVPB) { - DelVpb = DeviceExt->SpareVPB; + ExFreePool(DeviceExt->SpareVPB); } - /* Otherwise, dismount our device if possible */ - else + /* Otherwise, delete any of the available VPB if its reference count is zero */ + else if (DeviceExt->IoVPB->ReferenceCount == 0) { - if (DeviceExt->IoVPB->ReferenceCount) - { - ObfDereferenceObject(DeviceExt->StorageDevice); - IoDeleteDevice(DeviceExt->VolumeDevice); - return Delete; - } - - DelVpb = DeviceExt->IoVPB; + ExFreePool(DeviceExt->IoVPB); } - /* Delete any of the available VPB and dismount */ - ExFreePool(DelVpb); + /* Remove the volume from the list */ + ExAcquireResourceExclusiveLite(&VfatGlobalData->VolumeListLock, TRUE); + RemoveEntryList(&DeviceExt->VolumeListEntry); + ExReleaseResourceLite(&VfatGlobalData->VolumeListLock); + + /* Uninitialize the notify synchronization object */ + FsRtlNotifyUninitializeSync(&DeviceExt->NotifySync); + + /* Release resources */ + ExFreePoolWithTag(DeviceExt->Statistics, TAG_STATS); + ExDeleteResourceLite(&DeviceExt->DirResource); + ExDeleteResourceLite(&DeviceExt->FatResource); + + /* Dismount our device if possible */ ObfDereferenceObject(DeviceExt->StorageDevice); IoDeleteDevice(DeviceExt->VolumeDevice); - - return Delete; } return Delete; diff --git a/drivers/filesystems/fastfat/shutdown.c b/drivers/filesystems/fastfat/shutdown.c index c9e2bd5431..8e36745335 100644 --- a/drivers/filesystems/fastfat/shutdown.c +++ b/drivers/filesystems/fastfat/shutdown.c @@ -74,15 +74,19 @@ VfatShutdown( ListEntry = ListEntry->Flink; ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); - /* It was a clean volume mounted */ - if (DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY) + + /* Flush volume & files */ + Status = VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); + + /* We're performing a clean shutdown */ + if (BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_CLEAR_DIRTY) && + BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_IS_DIRTY)) { - /* So, drop the dirty bit we set */ + /* Drop the dirty bit */ if (NT_SUCCESS(SetDirtyStatus(DeviceExt, FALSE))) DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; } - Status = VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); if (NT_SUCCESS(Status)) { Status = VfatDiskShutDown(DeviceExt); @@ -97,7 +101,10 @@ VfatShutdown( } ExReleaseResourceLite(&DeviceExt->DirResource); - /* FIXME: Unmount the logical volume */ + /* Unmount the logical volume */ +#ifdef ENABLE_SWAPOUT + VfatCheckForDismount(DeviceExt, FALSE); +#endif if (!NT_SUCCESS(Status)) Irp->IoStatus.Status = Status; diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index e6c7c73e1d..77b2998dad 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -16,12 +16,16 @@ #define INIT_SECTION /* Done via alloc_text for MSC */ #endif + #define USE_ROS_CC_AND_FS -#if 0 -#ifndef _MSC_VER #define ENABLE_SWAPOUT -#endif -#endif + +/* FIXME: because volume is not cached, we have to perform direct IOs + * The day this is fixed, just comment out that line, and check + * it still works (and delete old code ;-)) + */ +#define VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l)) @@ -244,6 +248,8 @@ typedef union _DIR_ENTRY DIR_ENTRY, *PDIR_ENTRY; #define VCB_IS_SYS_OR_HAS_PAGE 0x0008 #define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ #define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */ +/* VCB condition state */ +#define VCB_GOOD 0x0010 /* If not set, the VCB is improper for usage */ typedef struct { @@ -326,6 +332,7 @@ typedef struct DEVICE_EXTENSION BOOLEAN AvailableClustersValid; ULONG Flags; struct _VFATFCB *VolumeFcb; + struct _VFATFCB *RootFcb; PSTATISTICS Statistics; /* Pointers to functions for manipulating FAT. */

1 0

[reactos] 01/01: [PSDK] Add missing NELOG_ error codes to lmerrlog.h.
by Eric Kohl 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2410eef6d2e1f5ab9e27d… commit 2410eef6d2e1f5ab9e27d98874c8e5f9dcf9dc50 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 24 22:21:04 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 24 22:29:02 2018 +0100 [PSDK] Add missing NELOG_ error codes to lmerrlog.h. --- sdk/include/psdk/lmerrlog.h | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/sdk/include/psdk/lmerrlog.h b/sdk/include/psdk/lmerrlog.h index cd63f9bbee..8563f93803 100644 --- a/sdk/include/psdk/lmerrlog.h +++ b/sdk/include/psdk/lmerrlog.h @@ -98,7 +98,7 @@ extern "C" { #define NELOG_NetlogonPasswdSetFailed (ERRLOG_BASE+124) #define NELOG_NetlogonTrackingError (ERRLOG_BASE+125) #define NELOG_NetlogonSyncError (ERRLOG_BASE+126) -#define NELOG_NetlogonRequireSignOrSealError (ERRLOG_BASE + 127) +#define NELOG_NetlogonRequireSignOrSealError (ERRLOG_BASE+127) #define NELOG_UPS_PowerOut (ERRLOG_BASE+130) #define NELOG_UPS_Shutdown (ERRLOG_BASE+131) #define NELOG_UPS_CmdFileError (ERRLOG_BASE+132) @@ -116,8 +116,8 @@ extern "C" { #define NELOG_System_Error (ERRLOG_BASE+157) #define NELOG_FT_ErrLog_Too_Large (ERRLOG_BASE+158) #define NELOG_FT_Update_In_Progress (ERRLOG_BASE+159) -#define NELOG_Joined_Domain (ERRLOG_BASE + 160) -#define NELOG_Joined_Workgroup (ERRLOG_BASE + 161) +#define NELOG_Joined_Domain (ERRLOG_BASE+160) +#define NELOG_Joined_Workgroup (ERRLOG_BASE+161) #define NELOG_OEM_Code (ERRLOG_BASE+199) #define NELOG_NetlogonSSIInitError ERRLOG2_BASE #define NELOG_NetlogonFailedToUpdateTrustList (ERRLOG2_BASE+1) @@ -190,6 +190,45 @@ extern "C" { #define NELOG_RplRestoreDatabaseSuccess (ERRLOG2_BASE+68) #define NELOG_RplInitRestoredDatabase (ERRLOG2_BASE+69) #define NELOG_NetlogonSessionTypeWrong (ERRLOG2_BASE+70) +#define NELOG_RplUpgradeDBTo40 (ERRLOG2_BASE+71) +#define NELOG_NetlogonLanmanBdcsNotAllowed (ERRLOG2_BASE+72) +#define NELOG_NetlogonNoDynamicDns (ERRLOG2_BASE+73) +#define NELOG_NetlogonDynamicDnsRegisterFailure (ERRLOG2_BASE+74) +#define NELOG_NetlogonDynamicDnsDeregisterFailure (ERRLOG2_BASE+75) +#define NELOG_NetlogonFailedFileCreate (ERRLOG2_BASE+76) +#define NELOG_NetlogonGetSubnetToSite (ERRLOG2_BASE+77) +#define NELOG_NetlogonNoSiteForClient (ERRLOG2_BASE+78) +#define NELOG_NetlogonBadSiteName (ERRLOG2_BASE+79) +#define NELOG_NetlogonBadSubnetName (ERRLOG2_BASE+80) +#define NELOG_NetlogonDynamicDnsServerFailure (ERRLOG2_BASE+81) +#define NELOG_NetlogonDynamicDnsFailure (ERRLOG2_BASE+82) +#define NELOG_NetlogonRpcCallCancelled (ERRLOG2_BASE+83) +#define NELOG_NetlogonDcSiteCovered (ERRLOG2_BASE+84) +#define NELOG_NetlogonDcSiteNotCovered (ERRLOG2_BASE+85) +#define NELOG_NetlogonGcSiteCovered (ERRLOG2_BASE+86) +#define NELOG_NetlogonGcSiteNotCovered (ERRLOG2_BASE+87) +#define NELOG_NetlogonFailedSpnUpdate (ERRLOG2_BASE+88) +#define NELOG_NetlogonFailedDnsHostNameUpdate (ERRLOG2_BASE+89) +#define NELOG_NetlogonAuthNoUplevelDomainController (ERRLOG2_BASE+90) +#define NELOG_NetlogonAuthDomainDowngraded (ERRLOG2_BASE+91) +#define NELOG_NetlogonNdncSiteCovered (ERRLOG2_BASE+92) +#define NELOG_NetlogonNdncSiteNotCovered (ERRLOG2_BASE+93) +#define NELOG_NetlogonDcOldSiteCovered (ERRLOG2_BASE+94) +#define NELOG_NetlogonDcSiteNotCoveredAuto (ERRLOG2_BASE+95) +#define NELOG_NetlogonGcOldSiteCovered (ERRLOG2_BASE+96) +#define NELOG_NetlogonGcSiteNotCoveredAuto (ERRLOG2_BASE+97) +#define NELOG_NetlogonNdncOldSiteCovered (ERRLOG2_BASE+98) +#define NELOG_NetlogonNdncSiteNotCoveredAuto (ERRLOG2_BASE+99) +#define NELOG_NetlogonSpnMultipleSamAccountNames (ERRLOG2_BASE+100) +#define NELOG_NetlogonSpnCrackNamesFailure (ERRLOG2_BASE+101) +#define NELOG_NetlogonNoAddressToSiteMapping (ERRLOG2_BASE+102) +#define NELOG_NetlogonInvalidGenericParameterValue (ERRLOG2_BASE+103) +#define NELOG_NetlogonInvalidDwordParameterValue (ERRLOG2_BASE+104) +#define NELOG_NetlogonServerAuthFailedNoAccount (ERRLOG2_BASE+105) +#define NELOG_NetlogonNoDynamicDnsManual (ERRLOG2_BASE+106) +#define NELOG_NetlogonNoSiteForClients (ERRLOG2_BASE+107) +#define NELOG_NetlogonDnsDeregAborted (ERRLOG2_BASE+108) +#define NELOG_NetlogonRpcPortRequestFailure (ERRLOG2_BASE+109) #define REVISED_ERROR_LOG_STRUCT typedef struct _ERROR_LOG { DWORD el_len;

1 0

[reactos] 01/01: [TCPIP] Properly display local information for established connections
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ec92100bcaaf01fe3d82… commit 0ec92100bcaaf01fe3d824eeae20835c75d16e59 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 22:25:32 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 22:26:06 2018 +0100 [TCPIP] Properly display local information for established connections --- drivers/network/tcpip/tcpip/ninfo.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 06eddd4baf..74d5b86266 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -190,8 +190,6 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TI_DbgPrint(DEBUG_INFO, ("Called.\n")); - TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; - TcpRow.dwLocalPort = AddrFile->Port; TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; if (Extended) { @@ -209,6 +207,8 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, EndPoint = AddrFile->Listener->AddressFile; TcpRow.dwState = MIB_TCP_STATE_LISTEN; + TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; + TcpRow.dwLocalPort = AddrFile->Port; TcpRow.dwRemoteAddr = EndPoint->Address.Address.IPv4Address; TcpRow.dwRemotePort = EndPoint->Port; } @@ -217,17 +217,26 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, { TA_IP_ADDRESS EndPoint; - Status = TCPGetSockAddress(AddrFile->Connection, (PTRANSPORT_ADDRESS)&EndPoint, TRUE); + Status = TCPGetSockAddress(AddrFile->Connection, (PTRANSPORT_ADDRESS)&EndPoint, FALSE); if (NT_SUCCESS(Status)) { ASSERT(EndPoint.TAAddressCount >= 1); ASSERT(EndPoint.Address[0].AddressLength == TDI_ADDRESS_LENGTH_IP); - TcpRow.dwRemoteAddr = EndPoint.Address[0].Address[0].in_addr; - TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port); + TcpRow.dwLocalAddr = EndPoint.Address[0].Address[0].in_addr; + TcpRow.dwLocalPort = ntohs(EndPoint.Address[0].Address[0].sin_port); + + Status = TCPGetSockAddress(AddrFile->Connection, (PTRANSPORT_ADDRESS)&EndPoint, TRUE); + if (NT_SUCCESS(Status)) + { + ASSERT(EndPoint.TAAddressCount >= 1); + ASSERT(EndPoint.Address[0].AddressLength == TDI_ADDRESS_LENGTH_IP); + TcpRow.dwRemoteAddr = EndPoint.Address[0].Address[0].in_addr; + TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port); + + Status = TCPGetSocketStatus(AddrFile->Connection, &TcpRow.dwState); + ASSERT(NT_SUCCESS(Status)); + } } - - Status = TCPGetSocketStatus(AddrFile->Connection, &TcpRow.dwState); - ASSERT(NT_SUCCESS(Status)); } else {

1 0

[reactos] 01/01: [MC] Add message 5300-5381 to netmsg.dll.
by Eric Kohl 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41f991b1be132db8f7d62… commit 41f991b1be132db8f7d62fb07db53ef1810a6dbe Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 24 15:12:09 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 24 22:07:28 2018 +0100 [MC] Add message 5300-5381 to netmsg.dll. --- sdk/include/reactos/mc/netmsgmsg.mc | 604 ++++++++++++++++++++++++++++++++++++ 1 file changed, 604 insertions(+) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index e6f73fbd93..59b4a32ab9 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -7838,6 +7838,610 @@ NetWare compatible logon ; ncberr.h (non-public) nessage definitions (5300 - 5499 NRCERR_BASE) ; +MessageId=5300 +Severity=Success +Facility=System +SymbolicName=NRCERR_5300 +Language=English +The network control block (NCB) request completed successfully.\n +The NCB is the data. +. +Language=Russian +The network control block (NCB) request completed successfully.\n +The NCB is the data. +. + +MessageId=5301 +Severity=Success +Facility=System +SymbolicName=NRCERR_5301 +Language=English +Illegal network control block (NCB) buffer length on SEND DATAGRAM,\n +SEND BROADCAST, ADAPTER STATUS, or SESSION STATUS.\n +The NCB is the data. +. +Language=Russian +Illegal network control block (NCB) buffer length on SEND DATAGRAM,\n +SEND BROADCAST, ADAPTER STATUS, or SESSION STATUS.\n +The NCB is the data. +. + +MessageId=5302 +Severity=Success +Facility=System +SymbolicName=NRCERR_5302 +Language=English +The data descriptor array specified in the network control block (NCB) is\n +invalid. The NCB is the data. +. +Language=Russian +The data descriptor array specified in the network control block (NCB) is\n +invalid. The NCB is the data. +. + +MessageId=5303 +Severity=Success +Facility=System +SymbolicName=NRCERR_5303 +Language=English +The command specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. +Language=Russian +The command specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. + +MessageId=5304 +Severity=Success +Facility=System +SymbolicName=NRCERR_5304 +Language=English +The message correlator specified in the network control block (NCB) is\n +invalid. The NCB is the data. +. +Language=Russian +The message correlator specified in the network control block (NCB) is\n +invalid. The NCB is the data. +. + +MessageId=5305 +Severity=Success +Facility=System +SymbolicName=NRCERR_5305 +Language=English +A network control block (NCB) command timed-out. The session may have\n +terminated abnormally. The NCB is the data. +. +Language=Russian +A network control block (NCB) command timed-out. The session may have\n +terminated abnormally. The NCB is the data. +. + +MessageId=5306 +Severity=Success +Facility=System +SymbolicName=NRCERR_5306 +Language=English +An incomplete network control block (NCB) message was received.\n +The NCB is the data. +. +Language=Russian +An incomplete network control block (NCB) message was received.\n +The NCB is the data. +. + +MessageId=5307 +Severity=Success +Facility=System +SymbolicName=NRCERR_5307 +Language=English +The buffer address specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. +Language=Russian +The buffer address specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. + +MessageId=5308 +Severity=Success +Facility=System +SymbolicName=NRCERR_5308 +Language=English +The session number specified in the network control block (NCB) is not active.\n +The NCB is the data. +. +Language=Russian +The session number specified in the network control block (NCB) is not active.\n +The NCB is the data. +. + +MessageId=5309 +Severity=Success +Facility=System +SymbolicName=NRCERR_5309 +Language=English +No resource was available in the network adapter.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +No resource was available in the network adapter.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5310 +Severity=Success +Facility=System +SymbolicName=NRCERR_5310 +Language=English +The session specified in the network control block (NCB) was closed.\n +The NCB is the data. +. +Language=Russian +The session specified in the network control block (NCB) was closed.\n +The NCB is the data. +. + +MessageId=5311 +Severity=Success +Facility=System +SymbolicName=NRCERR_5311 +Language=English +The network control block (NCB) command was canceled.\n +The NCB is the data. +. +Language=Russian +The network control block (NCB) command was canceled.\n +The NCB is the data. +. + +MessageId=5312 +Severity=Success +Facility=System +SymbolicName=NRCERR_5312 +Language=English +The message segment specified in the network control block (NCB) is\n +illogical. The NCB is the data. +. +Language=Russian +The message segment specified in the network control block (NCB) is\n +illogical. The NCB is the data. +. + +MessageId=5313 +Severity=Success +Facility=System +SymbolicName=NRCERR_5313 +Language=English +The name already exists in the local adapter name table.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +The name already exists in the local adapter name table.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5314 +Severity=Success +Facility=System +SymbolicName=NRCERR_5314 +Language=English +The network adapter name table is full.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +The network adapter name table is full.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5315 +Severity=Success +Facility=System +SymbolicName=NRCERR_5315 +Language=English +The network name has active sessions and is now de-registered.\n +The network control block (NCB) command completed. The NCB is the data. +. +Language=Russian +The network name has active sessions and is now de-registered.\n +The network control block (NCB) command completed. The NCB is the data. +. + +MessageId=5316 +Severity=Success +Facility=System +SymbolicName=NRCERR_5316 +Language=English +A previously issued Receive Lookahead command is active\n +for this session. The network control block (NCB) command was rejected.\n +The NCB is the data. +. +Language=Russian +A previously issued Receive Lookahead command is active\n +for this session. The network control block (NCB) command was rejected.\n +The NCB is the data. +. + +MessageId=5317 +Severity=Success +Facility=System +SymbolicName=NRCERR_5317 +Language=English +The local session table is full. The network control block (NCB) request was refused.\n +The NCB is the data. +. +Language=Russian +The local session table is full. The network control block (NCB) request was refused.\n +The NCB is the data. +. + +MessageId=5318 +Severity=Success +Facility=System +SymbolicName=NRCERR_5318 +Language=English +A network control block (NCB) session open was rejected. No LISTEN is outstanding\n +on the remote computer. The NCB is the data. +. +Language=Russian +A network control block (NCB) session open was rejected. No LISTEN is outstanding\n +on the remote computer. The NCB is the data. +. + +MessageId=5319 +Severity=Success +Facility=System +SymbolicName=NRCERR_5319 +Language=English +The name number specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. +Language=Russian +The name number specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. + +MessageId=5320 +Severity=Success +Facility=System +SymbolicName=NRCERR_5320 +Language=English +The call name specified in the network control block (NCB) cannot be found or\n +did not answer. The NCB is the data. +. +Language=Russian +The call name specified in the network control block (NCB) cannot be found or\n +did not answer. The NCB is the data. +. + +MessageId=5321 +Severity=Success +Facility=System +SymbolicName=NRCERR_5321 +Language=English +The name specified in the network control block (NCB) was not found. Cannot put '*' or\n +00h in the NCB name. The NCB is the data. +. +Language=Russian +The name specified in the network control block (NCB) was not found. Cannot put '*' or\n +00h in the NCB name. The NCB is the data. +. + +MessageId=5322 +Severity=Success +Facility=System +SymbolicName=NRCERR_5322 +Language=English +The name specified in the network control block (NCB) is in use on a remote adapter.\n +The NCB is the data. +. +Language=Russian +The name specified in the network control block (NCB) is in use on a remote adapter.\n +The NCB is the data. +. + +MessageId=5323 +Severity=Success +Facility=System +SymbolicName=NRCERR_5323 +Language=English +The name specified in the network control block (NCB) has been deleted.\n +The NCB is the data. +. +Language=Russian +The name specified in the network control block (NCB) has been deleted.\n +The NCB is the data. +. + +MessageId=5324 +Severity=Success +Facility=System +SymbolicName=NRCERR_5324 +Language=English +The session specified in the network control block (NCB) ended abnormally.\n +The NCB is the data. +. +Language=Russian +The session specified in the network control block (NCB) ended abnormally.\n +The NCB is the data. +. + +MessageId=5325 +Severity=Success +Facility=System +SymbolicName=NRCERR_5325 +Language=English +The network protocol has detected two or more identical\n +names on the network.\tThe network control block (NCB) is the data. +. +Language=Russian +The network protocol has detected two or more identical\n +names on the network.\tThe network control block (NCB) is the data. +. + +MessageId=5326 +Severity=Success +Facility=System +SymbolicName=NRCERR_5326 +Language=English +An unexpected protocol packet was received. There may be an\n +incompatible remote device. The network control block (NCB) is the data." +. +Language=Russian +An unexpected protocol packet was received. There may be an\n +incompatible remote device. The network control block (NCB) is the data." +. + +MessageId=5333 +Severity=Success +Facility=System +SymbolicName=NRCERR_5333 +Language=English +The NetBIOS interface is busy.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +The NetBIOS interface is busy.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5334 +Severity=Success +Facility=System +SymbolicName=NRCERR_5334 +Language=English +There are too many network control block (NCB) commands outstanding.\n +The NCB request was refused. The NCB is the data. +. +Language=Russian +There are too many network control block (NCB) commands outstanding.\n +The NCB request was refused. The NCB is the data. +. + +MessageId=5335 +Severity=Success +Facility=System +SymbolicName=NRCERR_5335 +Language=English +The adapter number specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. +Language=Russian +The adapter number specified in the network control block (NCB) is illegal.\n +The NCB is the data. +. + +MessageId=5336 +Severity=Success +Facility=System +SymbolicName=NRCERR_5336 +Language=English +The network control block (NCB) command completed while a cancel was occurring.\n +The NCB is the data. +. +Language=Russian +The network control block (NCB) command completed while a cancel was occurring.\n +The NCB is the data. +. + +MessageId=5337 +Severity=Success +Facility=System +SymbolicName=NRCERR_5337 +Language=English +The name specified in the network control block (NCB) is reserved.\n +The NCB is the data. +. +Language=Russian +The name specified in the network control block (NCB) is reserved.\n +The NCB is the data. +. + +MessageId=5338 +Severity=Success +Facility=System +SymbolicName=NRCERR_5338 +Language=English +The network control block (NCB) command is not valid to cancel.\n +The NCB is the data. +. +Language=Russian +The network control block (NCB) command is not valid to cancel.\n +The NCB is the data. +. + +MessageId=5351 +Severity=Success +Facility=System +SymbolicName=NRCERR_5351 +Language=English +There are multiple network control block (NCB) requests for the same session.\n +The NCB request was refused. The NCB is the data. +. +Language=Russian +There are multiple network control block (NCB) requests for the same session.\n +The NCB request was refused. The NCB is the data. +. + +MessageId=5352 +Severity=Success +Facility=System +SymbolicName=NRCERR_5352 +Language=English +There has been a network adapter error. The only NetBIOS\n +command that may be issued is an NCB RESET. The network control block (NCB) is\n +the data. +. +Language=Russian +There has been a network adapter error. The only NetBIOS\n +command that may be issued is an NCB RESET. The network control block (NCB) is\n +the data. +. + +MessageId=5354 +Severity=Success +Facility=System +SymbolicName=NRCERR_5354 +Language=English +The maximum number of applications was exceeded.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +The maximum number of applications was exceeded.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5356 +Severity=Success +Facility=System +SymbolicName=NRCERR_5356 +Language=English +The requested resources are not available.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +The requested resources are not available.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5364 +Severity=Success +Facility=System +SymbolicName=NRCERR_5364 +Language=English +A system error has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +A system error has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5365 +Severity=Success +Facility=System +SymbolicName=NRCERR_5365 +Language=English +A ROM checksum failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +A ROM checksum failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5366 +Severity=Success +Facility=System +SymbolicName=NRCERR_5366 +Language=English +A RAM test failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +A RAM test failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5367 +Severity=Success +Facility=System +SymbolicName=NRCERR_5367 +Language=English +A digital loopback failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +A digital loopback failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5368 +Severity=Success +Facility=System +SymbolicName=NRCERR_5368 +Language=English +An analog loopback failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +An analog loopback failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5369 +Severity=Success +Facility=System +SymbolicName=NRCERR_5369 +Language=English +An interface failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +An interface failure has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5370 +Severity=Success +Facility=System +SymbolicName=NRCERR_5370 +Language=English +An unrecognized network control block (NCB) return code was received.\n +The NCB is the data. +. +Language=Russian +An unrecognized network control block (NCB) return code was received.\n +The NCB is the data. +. + +MessageId=5380 +Severity=Success +Facility=System +SymbolicName=NRCERR_5380 +Language=English +A network adapter malfunction has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. +Language=Russian +A network adapter malfunction has occurred.\n +The network control block (NCB) request was refused. The NCB is the data. +. + +MessageId=5381 +Severity=Success +Facility=System +SymbolicName=NRCERR_5381 +Language=English +The network control block (NCB) command is still pending.\n +The NCB is the data. +. +Language=Russian +The network control block (NCB) command is still pending.\n +The NCB is the data. +. + ; ; alertmsg.h (non-public) message definitions (5500 - 5549 ALERT2_BASE)

1 0

[reactos] 01/01: [RDBSS] Fix a typo
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aac38dfed801e843711b3… commit aac38dfed801e843711b3a9d7d8402704820e506 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 22:00:09 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 22:00:09 2018 +0100 [RDBSS] Fix a typo Spotted by Hermès --- sdk/lib/drivers/rdbsslib/rdbss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 5cf02a1e66..8822d03155 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -8445,7 +8445,7 @@ RxRemoveOverflowEntry( /* Return head */ Entry = RemoveHeadList(&DeviceObject->OverflowQueue[Queue]); Context = CONTAINING_RECORD(Entry, RX_CONTEXT, OverflowListEntry); - ClearFlag(Context->Flags, ~(RX_CONTEXT_FLAG_FSP_DELAYED_OVERFLOW_QUEUE | RX_CONTEXT_FLAG_FSP_CRITICAL_OVERFLOW_QUEUE)); + ClearFlag(Context->Flags, (RX_CONTEXT_FLAG_FSP_DELAYED_OVERFLOW_QUEUE | RX_CONTEXT_FLAG_FSP_CRITICAL_OVERFLOW_QUEUE)); Context->OverflowListEntry.Flink = NULL; } KeReleaseSpinLock(&DeviceObject->OverflowQueueSpinLock, OldIrql);

1 0

[reactos] 14/14: [NETSTAT] Add support for displaying UDP connections owning process
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29c883e2a5595228a7773… commit 29c883e2a5595228a7773912df1006ddd2504de6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 21:36:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:11 2018 +0100 [NETSTAT] Add support for displaying UDP connections owning process Our netstat can basically look like this now: https://twitter.com/HeisSpiter/status/1066430887208919040 --- base/applications/network/netstat/netstat.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index 6695777d62..aedbf5336e 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -496,23 +496,24 @@ VOID ShowTcpTable() VOID ShowUdpTable() { - PMIB_UDPTABLE udpTable; + PMIB_UDPTABLE_OWNER_PID udpTable; DWORD error, dwSize; DWORD i; CHAR HostIp[HOSTNAMELEN], HostPort[PORTNAMELEN]; CHAR Host[ADDRESSLEN]; + CHAR PID[64]; /* Get the table of UDP endpoints */ dwSize = 0; - error = GetUdpTable(NULL, &dwSize, TRUE); + error = GetExtendedUdpTable(NULL, &dwSize, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0); if (error != ERROR_INSUFFICIENT_BUFFER) { printf("Failed to snapshot UDP endpoints.\n"); DoFormatMessage(error); exit(EXIT_FAILURE); } - udpTable = (PMIB_UDPTABLE) HeapAlloc(GetProcessHeap(), 0, dwSize); - error = GetUdpTable(udpTable, &dwSize, TRUE); + udpTable = (PMIB_UDPTABLE_OWNER_PID) HeapAlloc(GetProcessHeap(), 0, dwSize); + error = GetExtendedUdpTable(udpTable, &dwSize, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0); if (error) { printf("Failed to snapshot UDP endpoints table.\n"); @@ -531,7 +532,16 @@ VOID ShowUdpTable() sprintf(Host, "%s:%s", HostIp, HostPort); - _tprintf(_T(" %-6s %-22s %-22s\n"), _T("UDP"), Host, _T("*:*")); + if (bDoShowProcessId) + { + sprintf(PID, "%ld", udpTable->table[i].dwOwningPid); + } + else + { + PID[0] = 0; + } + + _tprintf(_T(" %-6s %-22s %-34s %s\n"), _T("UDP"), Host, _T("*:*"), PID); } HeapFree(GetProcessHeap(), 0, udpTable);

1 0

[reactos] 13/14: [SDK] Add GetExtendedUdpTable()
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbdfe7bd4067b2ea83033… commit fbdfe7bd4067b2ea83033a0080cecd214c51437a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 21:30:28 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:10 2018 +0100 [SDK] Add GetExtendedUdpTable() --- sdk/include/psdk/iphlpapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/iphlpapi.h b/sdk/include/psdk/iphlpapi.h index c6ce686047..a31ecf228f 100644 --- a/sdk/include/psdk/iphlpapi.h +++ b/sdk/include/psdk/iphlpapi.h @@ -27,6 +27,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO,PULONG); DWORD WINAPI GetBestInterface(IPAddr,PDWORD); DWORD WINAPI GetBestRoute(DWORD,DWORD,PMIB_IPFORWARDROW); DWORD WINAPI GetExtendedTcpTable(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); +DWORD WINAPI GetExtendedUdpTable(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); DWORD WINAPI GetFriendlyIfIndex(DWORD); DWORD WINAPI GetIcmpStatistics(PMIB_ICMP); DWORD WINAPI GetIfEntry(PMIB_IFROW);

1 0

[reactos] 12/14: [IPHLPAPI] Reimplement GetUdpTable() using GetExtendedUdpTable()
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=370b03b5235aa6e087d1d… commit 370b03b5235aa6e087d1de7aa8f3c2ea6ad280f5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 21:25:59 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:10 2018 +0100 [IPHLPAPI] Reimplement GetUdpTable() using GetExtendedUdpTable() --- dll/win32/iphlpapi/iphlpapi_main.c | 73 +++++++++----------------------------- 1 file changed, 16 insertions(+), 57 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index d1333cbf47..299a29a238 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -1095,7 +1095,21 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U } -static int UdpTableSorter(const void *a, const void *b); +static int UdpTableSorter(const void *a, const void *b) +{ + int ret; + + if (a && b) { + PMIB_UDPROW rowA = (PMIB_UDPROW)a, rowB = (PMIB_UDPROW)b; + + ret = rowA->dwLocalAddr - rowB->dwLocalAddr; + if (ret == 0) + ret = rowA->dwLocalPort - rowB->dwLocalPort; + } + else + ret = 0; + return ret; +} /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) @@ -2203,23 +2217,6 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) } -static int UdpTableSorter(const void *a, const void *b) -{ - int ret; - - if (a && b) { - PMIB_UDPROW rowA = (PMIB_UDPROW)a, rowB = (PMIB_UDPROW)b; - - ret = rowA->dwLocalAddr - rowB->dwLocalAddr; - if (ret == 0) - ret = rowA->dwLocalPort - rowB->dwLocalPort; - } - else - ret = 0; - return ret; -} - - /****************************************************************** * GetUdpTable (IPHLPAPI.@) * @@ -2237,45 +2234,7 @@ static int UdpTableSorter(const void *a, const void *b) */ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret; - - TRACE("pUdpTable %p, pdwSize %p, bOrder %ld\n", pUdpTable, pdwSize, - (DWORD)bOrder); - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numEntries = getNumUdpEntries(); - ULONG size = sizeof(MIB_UDPTABLE) + (numEntries - 1) * sizeof(MIB_UDPROW); - - if (!pUdpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - PMIB_UDPTABLE table = getUdpTable(); - - if (table) { - size = sizeof(MIB_UDPTABLE) + (table->dwNumEntries - 1) * - sizeof(MIB_UDPROW); - if (*pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - memcpy(pUdpTable, table, size); - if (bOrder) - qsort(pUdpTable->table, pUdpTable->dwNumEntries, - sizeof(MIB_UDPROW), UdpTableSorter); - ret = NO_ERROR; - } - free(table); - } - else - ret = ERROR_OUTOFMEMORY; - } - } - TRACE("returning %ld\n", ret); - return ret; + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, AF_INET, UDP_TABLE_BASIC, 0); }

1 0

[reactos] 11/14: [IPHLPAPI] Implement GetExtendedUdpTable() We only support IPv4 and UDP_TABLE_BASIC, UDP_TABLE_OWNER_PID for now
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58cef01422060fc69d790… commit 58cef01422060fc69d790d49c60df69b737e69c9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 21:22:42 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:10 2018 +0100 [IPHLPAPI] Implement GetExtendedUdpTable() We only support IPv4 and UDP_TABLE_BASIC, UDP_TABLE_OWNER_PID for now CORE-5126 --- dll/win32/iphlpapi/iphlpapi.spec | 2 +- dll/win32/iphlpapi/iphlpapi_main.c | 103 ++++++++++++++++++++++++++++++++++++- dll/win32/iphlpapi/ipstats.h | 5 ++ 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi.spec b/dll/win32/iphlpapi/iphlpapi.spec index 76b5fb30d3..ee112c6c91 100644 --- a/dll/win32/iphlpapi/iphlpapi.spec +++ b/dll/win32/iphlpapi/iphlpapi.spec @@ -33,7 +33,7 @@ @ stdcall GetBestRoute( long long long ) @ stub GetBestRouteFromStack @ stdcall GetExtendedTcpTable( ptr ptr long long long long ) -@ stdcall -stub GetExtendedUdpTable( ptr ptr long long long long ) +@ stdcall GetExtendedUdpTable( ptr ptr long long long long ) @ stdcall GetFriendlyIfIndex( long ) @ stdcall GetIcmpStatistics( ptr ) @ stdcall GetIcmpStatisticsEx(ptr long) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index a0e83aee4d..d1333cbf47 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -1091,7 +1091,108 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U break; } - return ret; + return ret; +} + + +static int UdpTableSorter(const void *a, const void *b); + +/****************************************************************** + * GetExtendedUdpTable (IPHLPAPI.@) + * + * Get the table of UDP endpoints available to the application. + * + * PARAMS + * pUdpTable [Out] table struct with the filtered UDP endpoints available to application + * pdwSize [In/Out] estimated size of the structure returned in pUdpTable, in bytes + * bOrder [In] whether to order the table + * ulAf [in] version of IP used by the UDP endpoints + * TableClass [in] type of the UDP table structure from UDP_TABLE_CLASS + * Reserved [in] reserved - this value must be zero + * + * RETURNS + * Success: NO_ERROR + * Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER + * + * NOTES + */ + +DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, UDP_TABLE_CLASS TableClass, ULONG Reserved) +{ + DWORD ret = NO_ERROR; + + if (!pdwSize) + { + return ERROR_INVALID_PARAMETER; + } + + if (ulAf != AF_INET) + { + UNIMPLEMENTED; + return ERROR_INVALID_PARAMETER; + } + + switch (TableClass) + { + case UDP_TABLE_BASIC: + { + PMIB_UDPTABLE pOurUdpTable = getUdpTable(); + PMIB_UDPTABLE pTheirUdpTable = pUdpTable; + + if (pOurUdpTable) + { + if (sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW) > *pdwSize || !pTheirUdpTable) + { + *pdwSize = sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTheirUdpTable, pOurUdpTable, sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_PID)); + + if (bOrder) + qsort(pTheirUdpTable->table, pTheirUdpTable->dwNumEntries, + sizeof(MIB_UDPROW), UdpTableSorter); + } + + free(pOurUdpTable); + } + } + break; + + case UDP_TABLE_OWNER_PID: + { + PMIB_UDPTABLE_OWNER_PID pOurUdpTable = getOwnerUdpTable(); + PMIB_UDPTABLE_OWNER_PID pTheirUdpTable = pUdpTable; + + if (pOurUdpTable) + { + if (sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_PID) > *pdwSize || !pTheirUdpTable) + { + *pdwSize = sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_PID); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTheirUdpTable, pOurUdpTable, sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_PID)); + + if (bOrder) + qsort(pTheirUdpTable->table, pTheirUdpTable->dwNumEntries, + sizeof(MIB_UDPROW_OWNER_PID), UdpTableSorter); + } + + free(pOurUdpTable); + } + } + break; + + default: + UNIMPLEMENTED; + ret = ERROR_INVALID_PARAMETER; + break; + } + + return ret; } diff --git a/dll/win32/iphlpapi/ipstats.h b/dll/win32/iphlpapi/ipstats.h index 1fd51574c3..da49d2b1d3 100644 --- a/dll/win32/iphlpapi/ipstats.h +++ b/dll/win32/iphlpapi/ipstats.h @@ -97,6 +97,11 @@ DWORD getNumUdpEntries(void); */ PMIB_UDPTABLE getUdpTable(void); +/* Allocates and returns to you the UDP state table with owner PID, + * or NULL if it can't allocate enough memory. free() the returned table. + */ +PMIB_UDPTABLE_OWNER_PID getOwnerUdpTable(void); + /* Returns the number of entries in the TCP state table. */ DWORD getNumTcpEntries(void);

1 0

[reactos] 10/14: [IPHLPAPI] Implement getOwnerUdoTable(), to get UDP connections with owner PID
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fb6c7b50b7f7b65737b3… commit 6fb6c7b50b7f7b65737b373553ca0d400d924f36 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 21:12:44 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:10 2018 +0100 [IPHLPAPI] Implement getOwnerUdoTable(), to get UDP connections with owner PID --- dll/win32/iphlpapi/ipstats_reactos.c | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index d117a5f4ce..8c1c842c9c 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -700,6 +700,67 @@ PMIB_UDPTABLE getUdpTable(void) return IpUdpTable; } +PMIB_UDPTABLE_OWNER_PID getOwnerUdpTable(void) +{ + DWORD numEntities, returnSize; + TDIEntityID *entitySet; + HANDLE tcpFile; + int i, totalNumber, TmpIdx, CurrIdx = 0; + NTSTATUS status; + PMIB_UDPTABLE_OWNER_PID IpOwnerUdpTable = NULL; + PMIB_UDPROW_OWNER_PID AdapterOwnerUdpTable = NULL; + + TRACE("called.\n"); + + totalNumber = getNumUdpEntries(); + + status = openTcpFile( &tcpFile, FILE_READ_DATA ); + if( !NT_SUCCESS(status) ) { + ERR("openTcpFile returned 0x%08lx\n", status); + return 0; + } + + IpOwnerUdpTable = HeapAlloc + ( GetProcessHeap(), 0, + sizeof(DWORD) + (sizeof(MIB_UDPROW_OWNER_PID) * totalNumber) ); + if (!IpOwnerUdpTable) { + closeTcpFile(tcpFile); + return NULL; + } + + status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); + + for( i = 0; i < numEntities; i++ ) { + if( entitySet[i].tei_entity == CL_TL_ENTITY && + hasArp( tcpFile, &entitySet[i] ) ) { + + status = tdiGetSetOfThings( tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ADDRTABLE_ENTRY_ID, + CL_TL_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_UDPROW_OWNER_PID), + (PVOID *)&AdapterOwnerUdpTable, + &returnSize ); + + if( status == STATUS_SUCCESS ) { + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpOwnerUdpTable->table[CurrIdx] = AdapterOwnerUdpTable[TmpIdx]; + tdiFreeThingSet( AdapterOwnerUdpTable ); + } + } + } + + closeTcpFile( tcpFile ); + + tdiFreeThingSet( entitySet ); + IpOwnerUdpTable->dwNumEntries = CurrIdx; + + return IpOwnerUdpTable; +} + DWORD getNumTcpEntries(void) { DWORD numEntities;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs