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

Expose array size limit in IDL where size limit seems intentional #13699

Merged
merged 10 commits into from
Jan 21, 2022
Merged

Expose array size limit in IDL where size limit seems intentional #13699

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7896df1
Expose array size limit in IDL where size limit seems intentional
andy31415 Jan 19, 2022
0442520
Only use sizes for strings and place it together with the data type
andy31415 Jan 19, 2022
750fb43
Remove if_valid_list_size usage
andy31415 Jan 20, 2022
e6617f9
ZAP regen
andy31415 Jan 20, 2022
4a94ff5
Merge branch 'master' into attribute_list_sizes
andy31415 Jan 20, 2022
2bc7509
Fix removal of list sizes - had an extra maxLength remaining, now rem…
andy31415 Jan 20, 2022
64d9419
Add unless check in structure member for string size. Not that no out…
andy31415 Jan 20, 2022
d4289f0
Merge branch 'master' into attribute_list_sizes
andy31415 Jan 20, 2022
4fd91c6
Add size info for attribute string types as well
andy31415 Jan 21, 2022
917e524
Merge branch 'master' into attribute_list_sizes
andy31415 Jan 21, 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
46 changes: 23 additions & 23 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// It is for view/code review purposes only.

struct LabelStruct {
CHAR_STRING label = 0;
CHAR_STRING value = 1;
CHAR_STRING<16> label = 0;
CHAR_STRING<16> value = 1;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -43,7 +43,7 @@ server cluster AccessControl = 31 {

struct ExtensionEntry {
fabric_idx fabricIndex = 0;
OCTET_STRING data = 1;
OCTET_STRING<254> data = 1;
}

info event AccessControlEntryChanged = 0 {
Expand Down Expand Up @@ -154,7 +154,7 @@ server cluster AudioOutput = 1291 {
struct OutputInfo {
INT8U index = 0;
OutputTypeEnum outputType = 1;
CHAR_STRING name = 2;
CHAR_STRING<32> name = 2;
}

readonly attribute OutputInfo audioOutputList[] = 0;
Expand Down Expand Up @@ -284,7 +284,7 @@ server cluster BridgedActions = 37 {

struct ActionStruct {
INT16U actionID = 0;
CHAR_STRING name = 1;
CHAR_STRING<32> name = 1;
ActionTypeEnum type = 2;
INT16U endpointListID = 3;
INT16U supportedCommands = 4;
Expand All @@ -293,7 +293,7 @@ server cluster BridgedActions = 37 {

struct EndpointListStruct {
INT16U endpointListID = 0;
CHAR_STRING name = 1;
CHAR_STRING<32> name = 1;
EndpointListTypeEnum type = 2;
ENDPOINT_NO endpoints[] = 3;
}
Expand Down Expand Up @@ -334,9 +334,9 @@ server cluster Channel = 1284 {
struct ChannelInfo {
INT16U majorNumber = 0;
INT16U minorNumber = 1;
CHAR_STRING name = 2;
CHAR_STRING callSign = 3;
CHAR_STRING affiliateCallSign = 4;
CHAR_STRING<32> name = 2;
CHAR_STRING<32> callSign = 3;
CHAR_STRING<32> affiliateCallSign = 4;
}

readonly attribute ChannelInfo channelList[] = 0;
Expand Down Expand Up @@ -1233,11 +1233,11 @@ server cluster GeneralDiagnostics = 51 {
}

struct NetworkInterfaceType {
CHAR_STRING name = 0;
CHAR_STRING<32> name = 0;
BOOLEAN fabricConnected = 1;
BOOLEAN offPremiseServicesReachableIPv4 = 2;
BOOLEAN offPremiseServicesReachableIPv6 = 3;
OCTET_STRING hardwareAddress = 4;
OCTET_STRING<8> hardwareAddress = 4;
InterfaceType type = 5;
}

Expand Down Expand Up @@ -1287,17 +1287,17 @@ server cluster GroupKeyManagement = 63 {
INT16U fabricIndex = 0;
INT16U groupId = 1;
INT16U endpoints[] = 2;
CHAR_STRING groupName = 3;
CHAR_STRING<16> groupName = 3;
}

struct GroupKeySet {
INT16U groupKeySetID = 0;
GroupKeySecurityPolicy securityPolicy = 1;
OCTET_STRING epochKey0 = 2;
OCTET_STRING<16> epochKey0 = 2;
INT64U epochStartTime0 = 3;
OCTET_STRING epochKey1 = 4;
OCTET_STRING<16> epochKey1 = 4;
INT64U epochStartTime1 = 5;
OCTET_STRING epochKey2 = 6;
OCTET_STRING<16> epochKey2 = 6;
INT64U epochStartTime2 = 7;
}

Expand Down Expand Up @@ -1716,8 +1716,8 @@ server cluster MediaInput = 1287 {
struct InputInfo {
INT8U index = 0;
InputTypeEnum inputType = 1;
CHAR_STRING name = 2;
CHAR_STRING description = 3;
CHAR_STRING<32> name = 2;
CHAR_STRING<32> description = 3;
}

readonly attribute InputInfo mediaInputList[] = 0;
Expand Down Expand Up @@ -1753,7 +1753,7 @@ server cluster MediaPlayback = 1286 {

server cluster ModeSelect = 80 {
struct ModeOptionStruct {
CHAR_STRING label = 0;
CHAR_STRING<32> label = 0;
INT8U mode = 1;
INT32U semanticTag = 2;
}
Expand Down Expand Up @@ -2092,11 +2092,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down Expand Up @@ -2412,7 +2412,7 @@ server cluster Scenes = 5 {
server cluster SoftwareDiagnostics = 52 {
struct ThreadMetrics {
INT64U id = 0;
CHAR_STRING name = 1;
CHAR_STRING<8> name = 1;
INT32U stackFreeCurrent = 2;
INT32U stackFreeMinimum = 3;
INT32U stackSize = 4;
Expand Down Expand Up @@ -2479,7 +2479,7 @@ server cluster TargetNavigator = 1285 {

struct TargetInfo {
INT8U identifier = 0;
CHAR_STRING name = 1;
CHAR_STRING<32> name = 1;
}

readonly attribute TargetInfo targetNavigatorList[] = 0;
Expand All @@ -2505,7 +2505,7 @@ server cluster TestCluster = 1295 {

struct TestListStructOctet {
INT64U fabricIndex = 0;
OCTET_STRING operationalCert = 1;
OCTET_STRING<32> operationalCert = 1;
}

struct NullablesAndOptionalsStruct {
Expand Down
14 changes: 7 additions & 7 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// It is for view/code review purposes only.

struct LabelStruct {
CHAR_STRING label = 0;
CHAR_STRING value = 1;
CHAR_STRING<16> label = 0;
CHAR_STRING<16> value = 1;
}

server cluster AdministratorCommissioning = 60 {
Expand Down Expand Up @@ -255,11 +255,11 @@ server cluster GeneralDiagnostics = 51 {
}

struct NetworkInterfaceType {
CHAR_STRING name = 0;
CHAR_STRING<32> name = 0;
BOOLEAN fabricConnected = 1;
BOOLEAN offPremiseServicesReachableIPv4 = 2;
BOOLEAN offPremiseServicesReachableIPv6 = 3;
OCTET_STRING hardwareAddress = 4;
OCTET_STRING<8> hardwareAddress = 4;
InterfaceType type = 5;
}

Expand Down Expand Up @@ -544,11 +544,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down Expand Up @@ -634,7 +634,7 @@ server cluster OperationalCredentials = 62 {
server cluster SoftwareDiagnostics = 52 {
struct ThreadMetrics {
INT64U id = 0;
CHAR_STRING name = 1;
CHAR_STRING<8> name = 1;
INT32U stackFreeCurrent = 2;
INT32U stackFreeMinimum = 3;
INT32U stackSize = 4;
Expand Down
14 changes: 7 additions & 7 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// It is for view/code review purposes only.

struct LabelStruct {
CHAR_STRING label = 0;
CHAR_STRING value = 1;
CHAR_STRING<16> label = 0;
CHAR_STRING<16> value = 1;
}

server cluster AdministratorCommissioning = 60 {
Expand Down Expand Up @@ -588,11 +588,11 @@ server cluster GeneralDiagnostics = 51 {
}

struct NetworkInterfaceType {
CHAR_STRING name = 0;
CHAR_STRING<32> name = 0;
BOOLEAN fabricConnected = 1;
BOOLEAN offPremiseServicesReachableIPv4 = 2;
BOOLEAN offPremiseServicesReachableIPv6 = 3;
OCTET_STRING hardwareAddress = 4;
OCTET_STRING<8> hardwareAddress = 4;
InterfaceType type = 5;
}

Expand Down Expand Up @@ -772,11 +772,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down Expand Up @@ -880,7 +880,7 @@ server cluster PowerSourceConfiguration = 46 {
server cluster SoftwareDiagnostics = 52 {
struct ThreadMetrics {
INT64U id = 0;
CHAR_STRING name = 1;
CHAR_STRING<8> name = 1;
INT32U stackFreeCurrent = 2;
INT32U stackFreeMinimum = 3;
INT32U stackSize = 4;
Expand Down
14 changes: 7 additions & 7 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// It is for view/code review purposes only.

struct LabelStruct {
CHAR_STRING label = 0;
CHAR_STRING value = 1;
CHAR_STRING<16> label = 0;
CHAR_STRING<16> value = 1;
}

server cluster AdministratorCommissioning = 60 {
Expand Down Expand Up @@ -504,11 +504,11 @@ server cluster GeneralDiagnostics = 51 {
}

struct NetworkInterfaceType {
CHAR_STRING name = 0;
CHAR_STRING<32> name = 0;
BOOLEAN fabricConnected = 1;
BOOLEAN offPremiseServicesReachableIPv4 = 2;
BOOLEAN offPremiseServicesReachableIPv6 = 3;
OCTET_STRING hardwareAddress = 4;
OCTET_STRING<8> hardwareAddress = 4;
InterfaceType type = 5;
}

Expand Down Expand Up @@ -1029,11 +1029,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down Expand Up @@ -1119,7 +1119,7 @@ server cluster OperationalCredentials = 62 {
server cluster SoftwareDiagnostics = 52 {
struct ThreadMetrics {
INT64U id = 0;
CHAR_STRING name = 1;
CHAR_STRING<8> name = 1;
INT32U stackFreeCurrent = 2;
INT32U stackFreeMinimum = 3;
INT32U stackSize = 4;
Expand Down
14 changes: 7 additions & 7 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// It is for view/code review purposes only.

struct LabelStruct {
CHAR_STRING label = 0;
CHAR_STRING value = 1;
CHAR_STRING<16> label = 0;
CHAR_STRING<16> value = 1;
}

server cluster AdministratorCommissioning = 60 {
Expand Down Expand Up @@ -255,11 +255,11 @@ server cluster GeneralDiagnostics = 51 {
}

struct NetworkInterfaceType {
CHAR_STRING name = 0;
CHAR_STRING<32> name = 0;
BOOLEAN fabricConnected = 1;
BOOLEAN offPremiseServicesReachableIPv4 = 2;
BOOLEAN offPremiseServicesReachableIPv6 = 3;
OCTET_STRING hardwareAddress = 4;
OCTET_STRING<8> hardwareAddress = 4;
InterfaceType type = 5;
}

Expand Down Expand Up @@ -468,11 +468,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down Expand Up @@ -576,7 +576,7 @@ server cluster PowerSourceConfiguration = 46 {
server cluster SoftwareDiagnostics = 52 {
struct ThreadMetrics {
INT64U id = 0;
CHAR_STRING name = 1;
CHAR_STRING<8> name = 1;
INT32U stackFreeCurrent = 2;
INT32U stackFreeMinimum = 3;
INT32U stackSize = 4;
Expand Down
4 changes: 2 additions & 2 deletions examples/log-source-app/log-source-common/log-source-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute FabricDescriptor fabricsList[] = 1;
Expand Down
8 changes: 4 additions & 4 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// It is for view/code review purposes only.

struct LabelStruct {
CHAR_STRING label = 0;
CHAR_STRING value = 1;
CHAR_STRING<16> label = 0;
CHAR_STRING<16> value = 1;
}

server cluster FixedLabel = 64 {
Expand Down Expand Up @@ -280,11 +280,11 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
CHAR_STRING<32> label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
Expand Down
Loading