Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SetupPayload to include if Discriminator is short #23304

Merged
merged 14 commits into from
Nov 23, 2022
Merged

Update SetupPayload to include if Discriminator is short #23304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be75525
Update SetupPayload to include if Discriminator is short
cliffamzn Oct 21, 2022
7f411ac
Merge branch 'master' into shortDiscriminator
cliffamzn Oct 25, 2022
b666c4a
Restyled by google-java-format
restyled-commits Oct 25, 2022
4b8d160
Merge branch 'master' into shortDiscriminator
cliffamzn Oct 28, 2022
92aa49e
Adding flags to ignore deprecated warnings around pairDevice
cliffamzn Oct 31, 2022
e1b1f14
Restyled by whitespace
restyled-commits Oct 31, 2022
8d4eb3c
Restyled by clang-format
restyled-commits Oct 31, 2022
fcf71a4
Removing deprecation messages in MTR code
cliffamzn Nov 10, 2022
fcd58db
Merge branch 'master' into shortDiscriminator
cliffamzn Nov 10, 2022
6ff2f34
Merge branch 'master' into shortDiscriminator
cliffamzn Nov 15, 2022
343e2e9
Merge branch 'master' into shortDiscriminator
cliffamzn Nov 17, 2022
8fc56e9
Merge branch 'master' into shortDiscriminator
cliffamzn Nov 17, 2022
f3643d8
Merge branch 'master' into shortDiscriminator
cliffamzn Nov 18, 2022
32478aa
Merge branch 'master' into shortDiscriminator
cliffamzn Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions src/setup_payload/java/SetupPayloadParser-JNI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,17 @@ jobject TransformSetupPayload(JNIEnv * env, SetupPayload & payload)
jfieldID productId = env->GetFieldID(setupPayloadClass, "productId", "I");
jfieldID commissioningFlow = env->GetFieldID(setupPayloadClass, "commissioningFlow", "I");
jfieldID discriminator = env->GetFieldID(setupPayloadClass, "discriminator", "I");
jfieldID hasShortDiscriminator = env->GetFieldID(setupPayloadClass, "hasShortDiscriminator", "Z");
jfieldID setUpPinCode = env->GetFieldID(setupPayloadClass, "setupPinCode", "J");
jfieldID discoveryCapabilities = env->GetFieldID(setupPayloadClass, "discoveryCapabilities", "Ljava/util/Set;");

env->SetIntField(setupPayload, version, payload.version);
env->SetIntField(setupPayload, vendorId, payload.vendorID);
env->SetIntField(setupPayload, productId, payload.productID);
env->SetIntField(setupPayload, commissioningFlow, static_cast<int>(payload.commissioningFlow));
// TODO: The API we have here does not handle short discriminators in any
// sane way. Just do what we used to do, which is pretend that a short
// discriminator is actually a long discriminator with the low bits all 0.
uint16_t discriminatorValue;
if (payload.discriminator.IsShortDiscriminator())
bool isShortDiscriminator = payload.discriminator.IsShortDiscriminator();
if (isShortDiscriminator)
{
discriminatorValue = static_cast<uint16_t>(payload.discriminator.GetShortValue())
<< (SetupDiscriminator::kLongBits - SetupDiscriminator::kShortBits);
Expand All @@ -134,6 +133,7 @@ jobject TransformSetupPayload(JNIEnv * env, SetupPayload & payload)
discriminatorValue = payload.discriminator.GetLongValue();
}
env->SetIntField(setupPayload, discriminator, discriminatorValue);
env->SetBooleanField(setupPayload, hasShortDiscriminator, isShortDiscriminator);
env->SetLongField(setupPayload, setUpPinCode, payload.setUpPINCode);

env->SetObjectField(setupPayload, discoveryCapabilities,
Expand Down Expand Up @@ -275,19 +275,28 @@ void TransformSetupPayloadFromJobject(JNIEnv * env, jobject jPayload, SetupPaylo
{
jclass setupPayloadClass = env->FindClass("chip/setuppayload/SetupPayload");

jfieldID version = env->GetFieldID(setupPayloadClass, "version", "I");
jfieldID vendorId = env->GetFieldID(setupPayloadClass, "vendorId", "I");
jfieldID productId = env->GetFieldID(setupPayloadClass, "productId", "I");
jfieldID commissioningFlow = env->GetFieldID(setupPayloadClass, "commissioningFlow", "I");
jfieldID discriminator = env->GetFieldID(setupPayloadClass, "discriminator", "I");
jfieldID setUpPinCode = env->GetFieldID(setupPayloadClass, "setupPinCode", "J");
jfieldID discoveryCapabilities = env->GetFieldID(setupPayloadClass, "discoveryCapabilities", "Ljava/util/Set;");

payload.version = env->GetIntField(jPayload, version);
payload.vendorID = env->GetIntField(jPayload, vendorId);
payload.productID = env->GetIntField(jPayload, productId);
payload.commissioningFlow = static_cast<CommissioningFlow>(env->GetIntField(jPayload, commissioningFlow));
payload.discriminator.SetLongValue(env->GetIntField(jPayload, discriminator));
jfieldID version = env->GetFieldID(setupPayloadClass, "version", "I");
jfieldID vendorId = env->GetFieldID(setupPayloadClass, "vendorId", "I");
jfieldID productId = env->GetFieldID(setupPayloadClass, "productId", "I");
jfieldID commissioningFlow = env->GetFieldID(setupPayloadClass, "commissioningFlow", "I");
jfieldID discriminator = env->GetFieldID(setupPayloadClass, "discriminator", "I");
jfieldID hasShortDiscriminatorFieldId = env->GetFieldID(setupPayloadClass, "hasShortDiscriminator", "Z");
jfieldID setUpPinCode = env->GetFieldID(setupPayloadClass, "setupPinCode", "J");
jfieldID discoveryCapabilities = env->GetFieldID(setupPayloadClass, "discoveryCapabilities", "Ljava/util/Set;");

payload.version = env->GetIntField(jPayload, version);
payload.vendorID = env->GetIntField(jPayload, vendorId);
payload.productID = env->GetIntField(jPayload, productId);
payload.commissioningFlow = static_cast<CommissioningFlow>(env->GetIntField(jPayload, commissioningFlow));
jboolean hasShortDiscriminator = env->GetBooleanField(jPayload, hasShortDiscriminatorFieldId);
if (hasShortDiscriminator)
{
payload.discriminator.SetShortValue(env->GetShortField(jPayload, discriminator));
}
else
{
payload.discriminator.SetLongValue(env->GetIntField(jPayload, discriminator));
}
payload.setUpPINCode = static_cast<uint32_t>(env->GetLongField(jPayload, setUpPinCode));

jobject discoveryCapabilitiesObj = env->GetObjectField(jPayload, discoveryCapabilities);
Expand Down
27 changes: 27 additions & 0 deletions src/setup_payload/java/src/chip/setuppayload/SetupPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ public class SetupPayload {
public Set<DiscoveryCapability> discoveryCapabilities;
/** The CHIP device discriminator: */
public int discriminator;
/**
* If hasShortDiscriminator is true, the discriminator value contains just the high 4 bits of the
* full discriminator. For example, if hasShortDiscriminator is true and discriminator is 0xA,
* then the full discriminator can be anything in the range 0xA00 t0 0xAFF.
*/
public boolean hasShortDiscriminator;
/**
* The CHIP device setup PIN code: setupPINCode SHALL be greater than 0. Also invalid setupPINCode
* is {000000000, 11111111, 22222222, 33333333, 44444444, 55555555, 66666666, 77777777, 88888888,
Expand All @@ -41,12 +47,33 @@ public SetupPayload(
Set<DiscoveryCapability> discoveryCapabilities,
int discriminator,
long setupPinCode) {
this(
version,
vendorId,
productId,
commissioningFlow,
discoveryCapabilities,
discriminator,
false,
setupPinCode);
}

public SetupPayload(
int version,
int vendorId,
int productId,
int commissioningFlow,
Set<DiscoveryCapability> discoveryCapabilities,
int discriminator,
boolean hasShortDiscriminator,
long setupPinCode) {
this.version = version;
this.vendorId = vendorId;
this.productId = productId;
this.commissioningFlow = commissioningFlow;
this.discoveryCapabilities = discoveryCapabilities;
this.discriminator = discriminator;
this.hasShortDiscriminator = hasShortDiscriminator;
this.setupPinCode = setupPinCode;
this.optionalQRCodeInfo = new HashMap<Integer, OptionalQRCodeInfo>();
}
Expand Down