Skip to content

Commit

Permalink
Add extension attribute to access control cluster (#17008)
Browse files Browse the repository at this point in the history
* Add extension attribute to access control cluster

Includes attribute. Does not include events, or fabric removal.

Part of issue #10252

* Remove temp log

* Add extension event support

Also change the keys for storing extensions based on review feedback.

* Relax VerifyOrDie

Use CHIP_ERROR_INCORRECT_STATE instead.

* Update src/app/clusters/access-control-server/access-control-server.cpp

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Change some error codes

For invalid octstr length and invalid list length, instead use
constraint error.

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
  • Loading branch information
2 people authored and pull[bot] committed Oct 2, 2023
1 parent aed6469 commit 1401370
Show file tree
Hide file tree
Showing 21 changed files with 171 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ client cluster AccessControl = 31 {
}

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

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ client cluster AccessControl = 31 {
}

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

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/pump-common/pump-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/tv-common/tv-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ server cluster AccessControl = 31 {
}

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

Expand Down
Loading

0 comments on commit 1401370

Please sign in to comment.