Update otThreadDiscover() to include input argument for setting Joiner flag. (#1658)

This commit is contained in:
Abtin Keshavarzian
2017-04-26 11:10:51 -07:00
committed by Jonathan Hui
parent c73ba27878
commit f392421d2c
5 changed files with 10 additions and 6 deletions
+2 -1
View File
@@ -1335,6 +1335,7 @@ otThreadDiscover(
_In_ otInstance *aInstance,
uint32_t aScanChannels,
uint16_t aPanid,
bool aJoiner,
otHandleActiveScanResult aCallback,
void *aCallbackContext
)
@@ -1346,7 +1347,7 @@ otThreadDiscover(
aInstance->InterfaceGuid, aCallback, aCallbackContext
);
PackedBuffer3<GUID,uint32_t,uint16_t> Buffer(aInstance->InterfaceGuid, aScanChannels, aPanid);
PackedBuffer4<GUID,uint32_t,uint16_t, bool> Buffer(aInstance->InterfaceGuid, aScanChannels, aPanid, aJoiner);
return DwordToThreadError(SendIOCTL(aInstance->ApiHandle, IOCTL_OTLWF_OT_DISCOVER, &Buffer, sizeof(Buffer), nullptr, 0));
}
+3 -1
View File
@@ -904,15 +904,17 @@ otLwfIoCtl_otDiscover(
{
NTSTATUS status = STATUS_INVALID_PARAMETER;
if (InBufferLength >= sizeof(uint32_t) + sizeof(uint16_t))
if (InBufferLength >= sizeof(uint32_t) + sizeof(uint16_t) + sizeof(bool))
{
uint32_t aScanChannels = *(uint32_t*)InBuffer;
uint16_t aPanid = *(uint16_t*)(InBuffer + sizeof(uint32_t));
bool aJoiner = *(bool*)(InBuffer + sizeof(uint32_t) + sizeof(uint16_t));
status = ThreadErrorToNtstatus(
otThreadDiscover(
pFilter->otCtx,
aScanChannels,
aPanid,
aJoiner,
otLwfDiscoverCallback,
pFilter)
);