not configure discovery scan duration (#1502)

This commit is contained in:
rongli
2017-04-06 09:56:31 -07:00
committed by Jonathan Hui
parent 6064c03e63
commit 2ba9933882
10 changed files with 16 additions and 27 deletions
+1 -2
View File
@@ -1334,7 +1334,6 @@ OTCALL
otThreadDiscover(
_In_ otInstance *aInstance,
uint32_t aScanChannels,
uint16_t aScanDuration,
uint16_t aPanid,
otHandleActiveScanResult aCallback,
void *aCallbackContext
@@ -1347,7 +1346,7 @@ otThreadDiscover(
aInstance->InterfaceGuid, aCallback, aCallbackContext
);
PackedBuffer4<GUID,uint32_t,uint16_t,uint16_t> Buffer(aInstance->InterfaceGuid, aScanChannels, aScanDuration, aPanid);
PackedBuffer3<GUID,uint32_t,uint16_t> Buffer(aInstance->InterfaceGuid, aScanChannels, aPanid);
return DwordToThreadError(SendIOCTL(aInstance->ApiHandle, IOCTL_OTLWF_OT_DISCOVER, &Buffer, sizeof(Buffer), nullptr, 0));
}
+2 -4
View File
@@ -904,16 +904,14 @@ otLwfIoCtl_otDiscover(
{
NTSTATUS status = STATUS_INVALID_PARAMETER;
if (InBufferLength >= sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t))
if (InBufferLength >= sizeof(uint32_t) + sizeof(uint16_t))
{
uint32_t aScanChannels = *(uint32_t*)InBuffer;
uint16_t aScanDuration = *(uint16_t*)(InBuffer + sizeof(uint32_t));
uint16_t aPanid = *(uint16_t*)(InBuffer + sizeof(uint32_t) + sizeof(uint16_t));
uint16_t aPanid = *(uint16_t*)(InBuffer + sizeof(uint32_t));
status = ThreadErrorToNtstatus(
otThreadDiscover(
pFilter->otCtx,
aScanChannels,
aScanDuration,
aPanid,
otLwfDiscoverCallback,
pFilter)