Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0b36f71

Browse files
lazarkovlazarkov
authoredFeb 7, 2024
Merge branch 'master' into feature/fix-cluster-revisions
2 parents 39822fd + 0ba1b7c commit 0b36f71

File tree

6 files changed

+145
-108
lines changed

6 files changed

+145
-108
lines changed
 

‎src/app/BUILD.gn

+1-88
Original file line numberDiff line numberDiff line change
@@ -110,93 +110,6 @@ source_set("subscription-manager") {
110110
public_deps = [ "${chip_root}/src/lib/core" ]
111111
}
112112

113-
source_set("message-def") {
114-
sources = [
115-
"MessageDef/ArrayBuilder.cpp",
116-
"MessageDef/ArrayParser.cpp",
117-
"MessageDef/AttributeDataIB.cpp",
118-
"MessageDef/AttributeDataIB.h",
119-
"MessageDef/AttributeDataIBs.cpp",
120-
"MessageDef/AttributeDataIBs.h",
121-
"MessageDef/AttributePathIB.cpp",
122-
"MessageDef/AttributePathIB.h",
123-
"MessageDef/AttributePathIBs.cpp",
124-
"MessageDef/AttributePathIBs.h",
125-
"MessageDef/AttributeReportIB.cpp",
126-
"MessageDef/AttributeReportIB.h",
127-
"MessageDef/AttributeReportIBs.cpp",
128-
"MessageDef/AttributeReportIBs.h",
129-
"MessageDef/AttributeStatusIB.cpp",
130-
"MessageDef/AttributeStatusIB.h",
131-
"MessageDef/AttributeStatusIBs.cpp",
132-
"MessageDef/AttributeStatusIBs.h",
133-
"MessageDef/Builder.cpp",
134-
"MessageDef/Builder.h",
135-
"MessageDef/ClusterPathIB.cpp",
136-
"MessageDef/ClusterPathIB.h",
137-
"MessageDef/CommandDataIB.cpp",
138-
"MessageDef/CommandPathIB.cpp",
139-
"MessageDef/CommandStatusIB.cpp",
140-
"MessageDef/DataVersionFilterIB.cpp",
141-
"MessageDef/DataVersionFilterIB.h",
142-
"MessageDef/DataVersionFilterIBs.cpp",
143-
"MessageDef/DataVersionFilterIBs.h",
144-
"MessageDef/EventDataIB.cpp",
145-
"MessageDef/EventDataIB.h",
146-
"MessageDef/EventFilterIB.cpp",
147-
"MessageDef/EventFilterIBs.cpp",
148-
"MessageDef/EventPathIB.cpp",
149-
"MessageDef/EventPathIB.h",
150-
"MessageDef/EventPathIBs.cpp",
151-
"MessageDef/EventPathIBs.h",
152-
"MessageDef/EventReportIB.cpp",
153-
"MessageDef/EventReportIB.h",
154-
"MessageDef/EventReportIBs.cpp",
155-
"MessageDef/EventReportIBs.h",
156-
"MessageDef/EventStatusIB.cpp",
157-
"MessageDef/EventStatusIB.h",
158-
"MessageDef/InvokeRequestMessage.cpp",
159-
"MessageDef/InvokeRequests.cpp",
160-
"MessageDef/InvokeResponseIB.cpp",
161-
"MessageDef/InvokeResponseIBs.cpp",
162-
"MessageDef/InvokeResponseMessage.cpp",
163-
"MessageDef/ListBuilder.cpp",
164-
"MessageDef/ListParser.cpp",
165-
"MessageDef/MessageBuilder.cpp",
166-
"MessageDef/MessageBuilder.h",
167-
"MessageDef/MessageDefHelper.cpp",
168-
"MessageDef/MessageDefHelper.h",
169-
"MessageDef/MessageParser.cpp",
170-
"MessageDef/MessageParser.h",
171-
"MessageDef/Parser.cpp",
172-
"MessageDef/Parser.h",
173-
"MessageDef/ReadRequestMessage.cpp",
174-
"MessageDef/ReadRequestMessage.h",
175-
"MessageDef/ReportDataMessage.cpp",
176-
"MessageDef/ReportDataMessage.h",
177-
"MessageDef/StatusIB.cpp",
178-
"MessageDef/StatusIB.h",
179-
"MessageDef/StatusResponseMessage.cpp",
180-
"MessageDef/StructBuilder.cpp",
181-
"MessageDef/StructParser.cpp",
182-
"MessageDef/SubscribeRequestMessage.cpp",
183-
"MessageDef/SubscribeResponseMessage.cpp",
184-
"MessageDef/TimedRequestMessage.cpp",
185-
"MessageDef/WriteRequestMessage.cpp",
186-
"MessageDef/WriteResponseMessage.cpp",
187-
]
188-
189-
deps = [
190-
":app_config",
191-
":paths",
192-
":revision_info",
193-
"${chip_root}/src/lib/core",
194-
"${chip_root}/src/lib/support",
195-
"${chip_root}/src/protocols/interaction_model",
196-
"${chip_root}/src/protocols/secure_channel",
197-
]
198-
}
199-
200113
config("config-controller-dynamic-server") {
201114
defines = [
202115
"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
@@ -241,9 +154,9 @@ static_library("interaction-model") {
241154

242155
public_deps = [
243156
":app_config",
244-
":message-def",
245157
":paths",
246158
":subscription-manager",
159+
"${chip_root}/src/app/MessageDef",
247160
"${chip_root}/src/app/icd/server:icd-server-config",
248161
"${chip_root}/src/app/icd/server:observer",
249162
"${chip_root}/src/lib/address_resolve",

‎src/app/EventManagement.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ void EventManagement::VendEventNumber()
413413
CHIP_ERROR EventManagement::LogEvent(EventLoggingDelegate * apDelegate, const EventOptions & aEventOptions,
414414
EventNumber & aEventNumber)
415415
{
416+
assertChipStackLockedByCurrentThread();
416417
VerifyOrReturnError(mState != EventManagementStates::Shutdown, CHIP_ERROR_INCORRECT_STATE);
417418
return LogEventPrivate(apDelegate, aEventOptions, aEventNumber);
418419
}

‎src/app/MessageDef/BUILD.gn

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# Copyright (c) 2024 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
import("//build_overrides/chip.gni")
15+
16+
source_set("MessageDef") {
17+
sources = [
18+
"ArrayBuilder.cpp",
19+
"ArrayBuilder.h",
20+
"ArrayParser.cpp",
21+
"ArrayParser.h",
22+
"AttributeDataIB.cpp",
23+
"AttributeDataIB.h",
24+
"AttributeDataIBs.cpp",
25+
"AttributeDataIBs.h",
26+
"AttributePathIB.cpp",
27+
"AttributePathIB.h",
28+
"AttributePathIBs.cpp",
29+
"AttributePathIBs.h",
30+
"AttributeReportIB.cpp",
31+
"AttributeReportIB.h",
32+
"AttributeReportIBs.cpp",
33+
"AttributeReportIBs.h",
34+
"AttributeStatusIB.cpp",
35+
"AttributeStatusIB.h",
36+
"AttributeStatusIBs.cpp",
37+
"AttributeStatusIBs.h",
38+
"Builder.cpp",
39+
"Builder.h",
40+
"ClusterPathIB.cpp",
41+
"ClusterPathIB.h",
42+
"CommandDataIB.cpp",
43+
"CommandDataIB.h",
44+
"CommandPathIB.cpp",
45+
"CommandPathIB.h",
46+
"CommandStatusIB.cpp",
47+
"CommandStatusIB.h",
48+
"DataVersionFilterIB.cpp",
49+
"DataVersionFilterIB.h",
50+
"DataVersionFilterIBs.cpp",
51+
"DataVersionFilterIBs.h",
52+
"EventDataIB.cpp",
53+
"EventDataIB.h",
54+
"EventFilterIB.cpp",
55+
"EventFilterIB.h",
56+
"EventFilterIBs.cpp",
57+
"EventFilterIBs.h",
58+
"EventPathIB.cpp",
59+
"EventPathIB.h",
60+
"EventPathIBs.cpp",
61+
"EventPathIBs.h",
62+
"EventReportIB.cpp",
63+
"EventReportIB.h",
64+
"EventReportIBs.cpp",
65+
"EventReportIBs.h",
66+
"EventStatusIB.cpp",
67+
"EventStatusIB.h",
68+
"InvokeRequestMessage.cpp",
69+
"InvokeRequestMessage.h",
70+
"InvokeRequests.cpp",
71+
"InvokeRequests.h",
72+
"InvokeResponseIB.cpp",
73+
"InvokeResponseIB.h",
74+
"InvokeResponseIBs.cpp",
75+
"InvokeResponseIBs.h",
76+
"InvokeResponseMessage.cpp",
77+
"InvokeResponseMessage.h",
78+
"ListBuilder.cpp",
79+
"ListBuilder.h",
80+
"ListParser.cpp",
81+
"ListParser.h",
82+
"MessageBuilder.cpp",
83+
"MessageBuilder.h",
84+
"MessageDefHelper.cpp",
85+
"MessageDefHelper.h",
86+
"MessageParser.cpp",
87+
"MessageParser.h",
88+
"Parser.cpp",
89+
"Parser.h",
90+
"ReadRequestMessage.cpp",
91+
"ReadRequestMessage.h",
92+
"ReportDataMessage.cpp",
93+
"ReportDataMessage.h",
94+
"StatusIB.cpp",
95+
"StatusIB.h",
96+
"StatusResponseMessage.cpp",
97+
"StatusResponseMessage.h",
98+
"StructBuilder.cpp",
99+
"StructBuilder.h",
100+
"StructParser.cpp",
101+
"StructParser.h",
102+
"SubscribeRequestMessage.cpp",
103+
"SubscribeRequestMessage.h",
104+
"SubscribeResponseMessage.cpp",
105+
"SubscribeResponseMessage.h",
106+
"TimedRequestMessage.cpp",
107+
"TimedRequestMessage.h",
108+
"WriteRequestMessage.cpp",
109+
"WriteRequestMessage.h",
110+
"WriteResponseMessage.cpp",
111+
"WriteResponseMessage.h",
112+
]
113+
114+
deps = [
115+
"${chip_root}/src/app:app_config",
116+
"${chip_root}/src/app:paths",
117+
"${chip_root}/src/app:revision_info",
118+
"${chip_root}/src/lib/core",
119+
"${chip_root}/src/lib/support",
120+
"${chip_root}/src/protocols/interaction_model",
121+
"${chip_root}/src/protocols/secure_channel",
122+
]
123+
}

‎src/app/tests/suites/certification/Test_TC_S_2_3.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ tests:
8686
GroupKeySet fields are as follows: 1)GroupKeySetID: 0x01a1
8787
2)GroupKeySecurityPolicy: TrustFirst (0) 3)EpochKey0:
8888
a0a1a2a3a4a5a6a7a8a9aaabacadaeaf 4)EpochStartTime0: 1110000
89-
5)EpochKey1: a1a1a2a3a4a5a6a7a8a9aaabacadaeaf 6)EpochStartTime1:
90-
1110001 7)EpochKey2: a2a1a2a3a4a5a6a7a8a9aaabacadaeaf
89+
5)EpochKey1: b0b1b2b3b4b5b6b7b8b9babbbcbdbebf 6)EpochStartTime1:
90+
1110001 7)EpochKey2: c0c1c2c3c4c5c6c7c8c9cacbcccdcecf
9191
8)EpochStartTime2: 1110002"
9292
cluster: "Group Key Management"
9393
endpoint: 0
@@ -113,8 +113,8 @@ tests:
113113
GroupKeySet fields are as follows: 1)GroupKeySetID: 0x01a2
114114
2)GroupKeySecurityPolicy: TrustFirst (0) 3)EpochKey0:
115115
d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 2220000
116-
5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
117-
2220001 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
116+
5)EpochKey1: e0e1e2e3e4e5e6e7e8e9eaebecedeeef 6)EpochStartTime1:
117+
2220001 7)EpochKey2: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
118118
8)EpochStartTime2: 2220002"
119119
cluster: "Group Key Management"
120120
endpoint: 0
@@ -130,12 +130,12 @@ tests:
130130
EpochStartTime0: 2220000,
131131
EpochKey1: "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef",
132132
EpochStartTime1: 2220001,
133-
EpochKey2: "\xf2\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
133+
EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
134134
EpochStartTime2: 2220002,
135135
}
136136

137137
- label:
138-
"Step 0b: TH binds GroupId G1 with GroupKeySetID 0x01a1 in the
138+
"Step 0c: TH binds GroupId G1 with GroupKeySetID 0x01a1 in the
139139
GroupKeyMap attribute list on GroupKeyManagement cluster by writing
140140
the GroupKeyMap attribute with one entry as follows: List item 1:
141141
1)FabricIndex: 1 2)GroupId :_G1_ 3)GroupKeySetId: 0x01a1"
@@ -188,7 +188,7 @@ tests:
188188
- name: "GroupID"
189189
value: G2
190190

191-
- label: "Install ACLs"
191+
- label: "Step 1c: Install ACLs"
192192
cluster: "Access Control"
193193
endpoint: 0
194194
command: "writeAttribute"
@@ -214,7 +214,7 @@ tests:
214214
]
215215

216216
- label:
217-
"Step 1c: TH sends a RemoveAllScenes command to DUT with the GroupID
217+
"Step 1d: TH sends a RemoveAllScenes command to DUT with the GroupID
218218
field set to G1."
219219
PICS: S.S.C03.Rsp
220220
command: "RemoveAllScenes"
@@ -230,7 +230,7 @@ tests:
230230
value: G1
231231

232232
- label:
233-
"Step 1d: TH sends a RemoveAllScenes command to DUT with the GroupID
233+
"Step 1e: TH sends a RemoveAllScenes command to DUT with the GroupID
234234
field set to G2."
235235
PICS: S.S.C03.Rsp
236236
command: "RemoveAllScenes"
@@ -246,7 +246,7 @@ tests:
246246
value: G2
247247

248248
- label:
249-
"Step 1e: TH sends a GetSceneMembership command to DUT with the
249+
"Step 1f: TH sends a GetSceneMembership command to DUT with the
250250
GroupID field set to G1."
251251
PICS: S.S.C06.Rsp
252252
command: "GetSceneMembership"

‎src/app/tests/suites/certification/Test_TC_S_2_4.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ tests:
4242
cluster to DUT using a key that is pre-installed on the TH.
4343
GroupKeySet fields are as follows: 1)GroupKeySetID: 0x01a1
4444
2)GroupKeySecurityPolicy: TrustFirst (0) 3)EpochKey0:
45-
d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 2220000
46-
5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
47-
2220001 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
48-
8)EpochStartTime2: 2220002"
45+
a0a1a2a3a4a5a6a7a8a9aaabacadaeaf 4)EpochStartTime0: 1110000
46+
5)EpochKey1: b0b1b2b3b4b5b6b7b8b9babbbcbdbebf 6)EpochStartTime1:
47+
1110001 7)EpochKey2: c0c1c2c3c4c5c6c7c8c9cacbcccdcecf
48+
8)EpochStartTime2: 1110002"
4949
cluster: "Group Key Management"
5050
endpoint: 0
5151
command: "KeySetWrite"

‎src/app/tests/suites/certification/Test_TC_S_2_5.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ tests:
3737
cluster to DUT using a key that is pre-installed on the TH.
3838
GroupKeySet fields are as follows: GroupKeySetID: 0x01a1
3939
GroupKeySecurityPolicy: TrustFirst (0) EpochKey0:
40-
d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1:
41-
d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2:
42-
d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002"
40+
a0a1a2a3a4a5a6a7a8a9aaabacadaeaf EpochStartTime0: 1110000 EpochKey1:
41+
b0b1b2b3b4b5b6b7b8b9babbbcbdbebf EpochStartTime1: 1110001 EpochKey2:
42+
c0c1c2c3c4c5c6c7c8c9cacbcccdcecf EpochStartTime2: 1110002"
4343
verification: |
4444
./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,
4545
"groupKeySecurityPolicy": 0, "epochKey0":
46-
"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
47-
"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
48-
"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 1 0
46+
"a0a1a2a3a4a5a6a7a8a9aaabacadaeaf", "epochStartTime0": 1110000,"epochKey1":
47+
"b0b1b2b3b4b5b6b7b8b9babbbcbdbebf", "epochStartTime1": 1110001,"epochKey2":
48+
"c0c1c2c3c4c5c6c7c8c9cacbcccdcecf", "epochStartTime2": 1110002 }' 1 0
4949
5050
Verify the "status is success" on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
5151

0 commit comments

Comments
 (0)
Please sign in to comment.