@@ -301,7 +301,7 @@ CHIP_ERROR convertTargetVideoPlayerInfoToJVideoPlayer(TargetVideoPlayerInfo * ta
301
301
}
302
302
303
303
CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData (jobject jDiscoveredNodeData,
304
- chip::Dnssd::DiscoveredNodeData & outCppDiscoveredNodeData)
304
+ chip::Dnssd::CommissionNodeData & outCppDiscoveredNodeData)
305
305
{
306
306
ChipLogProgress (AppServer, " convertJDiscoveredNodeDataToCppDiscoveredNodeData called" );
307
307
VerifyOrReturnError (jDiscoveredNodeData != nullptr , CHIP_ERROR_INVALID_ARGUMENT);
@@ -316,69 +316,66 @@ CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscovered
316
316
jstring jHostName = static_cast <jstring>(env->GetObjectField (jDiscoveredNodeData, getHostNameField));
317
317
if (jHostName != nullptr )
318
318
{
319
- chip::Platform::CopyString (outCppDiscoveredNodeData.resolutionData . hostName , chip::Dnssd::kHostNameMaxLength + 1 ,
319
+ chip::Platform::CopyString (outCppDiscoveredNodeData.hostName , chip::Dnssd::kHostNameMaxLength + 1 ,
320
320
env->GetStringUTFChars (jHostName, 0 ));
321
321
}
322
322
323
323
jfieldID getInstanceNameField = env->GetFieldID (jDiscoveredNodeDataClass, " instanceName" , " Ljava/lang/String;" );
324
324
jstring jInstanceName = static_cast <jstring>(env->GetObjectField (jDiscoveredNodeData, getInstanceNameField));
325
325
if (jInstanceName != nullptr )
326
326
{
327
- chip::Platform::CopyString (outCppDiscoveredNodeData.nodeData . instanceName ,
328
- chip::Dnssd::Commission:: kInstanceNameMaxLength + 1 , env->GetStringUTFChars (jInstanceName, 0 ));
327
+ chip::Platform::CopyString (outCppDiscoveredNodeData.instanceName , chip::Dnssd::Commission:: kInstanceNameMaxLength + 1 ,
328
+ env->GetStringUTFChars (jInstanceName, 0 ));
329
329
}
330
330
331
- jfieldID jLongDiscriminatorField = env->GetFieldID (jDiscoveredNodeDataClass, " longDiscriminator" , " J" );
332
- outCppDiscoveredNodeData.nodeData .vendorId =
333
- static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jLongDiscriminatorField));
331
+ jfieldID jLongDiscriminatorField = env->GetFieldID (jDiscoveredNodeDataClass, " longDiscriminator" , " J" );
332
+ outCppDiscoveredNodeData.vendorId = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jLongDiscriminatorField));
334
333
335
- jfieldID jVendorIdField = env->GetFieldID (jDiscoveredNodeDataClass, " vendorId" , " J" );
336
- outCppDiscoveredNodeData.nodeData . vendorId = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jVendorIdField));
334
+ jfieldID jVendorIdField = env->GetFieldID (jDiscoveredNodeDataClass, " vendorId" , " J" );
335
+ outCppDiscoveredNodeData.vendorId = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jVendorIdField));
337
336
338
- jfieldID jProductIdField = env->GetFieldID (jDiscoveredNodeDataClass, " productId" , " J" );
339
- outCppDiscoveredNodeData.nodeData . productId = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jProductIdField));
337
+ jfieldID jProductIdField = env->GetFieldID (jDiscoveredNodeDataClass, " productId" , " J" );
338
+ outCppDiscoveredNodeData.productId = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jProductIdField));
340
339
341
340
jfieldID jCommissioningModeField = env->GetFieldID (jDiscoveredNodeDataClass, " commissioningMode" , " B" );
342
- outCppDiscoveredNodeData.nodeData . commissioningMode =
341
+ outCppDiscoveredNodeData.commissioningMode =
343
342
static_cast <uint8_t >(env->GetByteField (jDiscoveredNodeData, jCommissioningModeField));
344
343
345
- jfieldID jDeviceTypeField = env->GetFieldID (jDiscoveredNodeDataClass, " deviceType" , " J" );
346
- outCppDiscoveredNodeData.nodeData . deviceType = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jDeviceTypeField));
344
+ jfieldID jDeviceTypeField = env->GetFieldID (jDiscoveredNodeDataClass, " deviceType" , " J" );
345
+ outCppDiscoveredNodeData.deviceType = static_cast <uint16_t >(env->GetLongField (jDiscoveredNodeData, jDeviceTypeField));
347
346
348
347
jfieldID getDeviceNameField = env->GetFieldID (jDiscoveredNodeDataClass, " deviceName" , " Ljava/lang/String;" );
349
348
jstring jDeviceName = static_cast <jstring>(env->GetObjectField (jDiscoveredNodeData, getDeviceNameField));
350
349
if (jDeviceName != nullptr )
351
350
{
352
- chip::Platform::CopyString (outCppDiscoveredNodeData.nodeData . deviceName , chip::Dnssd::kMaxDeviceNameLen + 1 ,
351
+ chip::Platform::CopyString (outCppDiscoveredNodeData.deviceName , chip::Dnssd::kMaxDeviceNameLen + 1 ,
353
352
env->GetStringUTFChars (jDeviceName, 0 ));
354
353
}
355
354
356
355
// TODO: map rotating ID
357
- jfieldID jRotatingIdLenField = env->GetFieldID (jDiscoveredNodeDataClass, " rotatingIdLen" , " I" );
358
- outCppDiscoveredNodeData.nodeData .rotatingIdLen =
359
- static_cast <size_t >(env->GetIntField (jDiscoveredNodeData, jRotatingIdLenField));
356
+ jfieldID jRotatingIdLenField = env->GetFieldID (jDiscoveredNodeDataClass, " rotatingIdLen" , " I" );
357
+ outCppDiscoveredNodeData.rotatingIdLen = static_cast <size_t >(env->GetIntField (jDiscoveredNodeData, jRotatingIdLenField));
360
358
361
- jfieldID jPairingHintField = env->GetFieldID (jDiscoveredNodeDataClass, " pairingHint" , " S" );
362
- outCppDiscoveredNodeData.nodeData .pairingHint =
363
- static_cast <uint16_t >(env->GetShortField (jDiscoveredNodeData, jPairingHintField));
359
+ jfieldID jPairingHintField = env->GetFieldID (jDiscoveredNodeDataClass, " pairingHint" , " S" );
360
+ outCppDiscoveredNodeData.pairingHint = static_cast <uint16_t >(env->GetShortField (jDiscoveredNodeData, jPairingHintField));
364
361
365
362
jfieldID getPairingInstructionField = env->GetFieldID (jDiscoveredNodeDataClass, " pairingInstruction" , " Ljava/lang/String;" );
366
363
jstring jPairingInstruction = static_cast <jstring>(env->GetObjectField (jDiscoveredNodeData, getPairingInstructionField));
367
364
if (jPairingInstruction != nullptr )
368
365
{
369
- chip::Platform::CopyString (outCppDiscoveredNodeData.nodeData . pairingInstruction , chip::Dnssd::kMaxPairingInstructionLen + 1 ,
366
+ chip::Platform::CopyString (outCppDiscoveredNodeData.pairingInstruction , chip::Dnssd::kMaxPairingInstructionLen + 1 ,
370
367
env->GetStringUTFChars (jPairingInstruction, 0 ));
371
368
}
372
369
373
- jfieldID jPortField = env->GetFieldID (jDiscoveredNodeDataClass, " port" , " I" );
374
- outCppDiscoveredNodeData.resolutionData . port = static_cast <uint16_t >(env->GetIntField (jDiscoveredNodeData, jPortField));
370
+ jfieldID jPortField = env->GetFieldID (jDiscoveredNodeDataClass, " port" , " I" );
371
+ outCppDiscoveredNodeData.port = static_cast <uint16_t >(env->GetIntField (jDiscoveredNodeData, jPortField));
375
372
376
- jfieldID jNumIpsField = env->GetFieldID (jDiscoveredNodeDataClass, " numIPs" , " I" );
377
- outCppDiscoveredNodeData.resolutionData . numIPs = static_cast <size_t >(env->GetIntField (jDiscoveredNodeData, jNumIpsField));
373
+ jfieldID jNumIpsField = env->GetFieldID (jDiscoveredNodeDataClass, " numIPs" , " I" );
374
+ outCppDiscoveredNodeData.numIPs = static_cast <size_t >(env->GetIntField (jDiscoveredNodeData, jNumIpsField));
378
375
379
376
jfieldID jIPAddressesField = env->GetFieldID (jDiscoveredNodeDataClass, " ipAddresses" , " Ljava/util/List;" );
380
377
jobject jIPAddresses = env->GetObjectField (jDiscoveredNodeData, jIPAddressesField);
381
- if (jIPAddresses == nullptr && outCppDiscoveredNodeData.resolutionData . numIPs > 0 )
378
+ if (jIPAddresses == nullptr && outCppDiscoveredNodeData.numIPs > 0 )
382
379
{
383
380
return CHIP_ERROR_INVALID_ARGUMENT;
384
381
}
@@ -400,11 +397,11 @@ CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscovered
400
397
chip::Inet::IPAddress addressInet;
401
398
chip::JniUtfString addressJniString (env, jIPAddressStr);
402
399
VerifyOrReturnError (chip::Inet::IPAddress::FromString (addressJniString.c_str (), addressInet), CHIP_ERROR_INVALID_ARGUMENT);
403
- outCppDiscoveredNodeData.resolutionData . ipAddress [ipAddressCount] = addressInet;
400
+ outCppDiscoveredNodeData.ipAddress [ipAddressCount] = addressInet;
404
401
405
402
if (ipAddressCount == 0 )
406
403
{
407
- outCppDiscoveredNodeData.resolutionData . interfaceId = chip::Inet::InterfaceId::FromIPAddress (addressInet);
404
+ outCppDiscoveredNodeData.interfaceId = chip::Inet::InterfaceId::FromIPAddress (addressInet);
408
405
}
409
406
ipAddressCount++;
410
407
}
0 commit comments