Skip to content

Commit cd7478f

Browse files
pidarpedpidarped
committed
Run zap-regen.
1 parent fa22323 commit cd7478f

File tree

20 files changed

+242
-189
lines changed

20 files changed

+242
-189
lines changed

‎src/controller/data_model/controller-clusters.matter

+19-19
Original file line numberDiff line numberDiff line change
@@ -10138,17 +10138,17 @@ provisional cluster WebRTCTransportProvider = 1363 {
1013810138
optional int16u caid = 4;
1013910139
}
1014010140

10141-
struct WebRTCSessionStruct {
10141+
fabric_scoped struct WebRTCSessionStruct {
1014210142
int16u id = 1;
1014310143
node_id peerNodeID = 2;
10144-
fabric_idx peerFabricIndex = 3;
10145-
StreamUsageEnum streamUsage = 4;
10146-
nullable int16u videoStreamID = 5;
10147-
nullable int16u audioStreamID = 6;
10148-
WebRTCMetadataOptionsBitmap metadataOptions = 7;
10144+
StreamUsageEnum streamUsage = 3;
10145+
nullable int16u videoStreamID = 4;
10146+
nullable int16u audioStreamID = 5;
10147+
WebRTCMetadataOptionsBitmap metadataOptions = 6;
10148+
fabric_idx fabricIndex = 254;
1014910149
}
1015010150

10151-
readonly attribute WebRTCSessionStruct currentSessions[] = 0;
10151+
readonly attribute access(read: manage) WebRTCSessionStruct currentSessions[] = 0;
1015210152
readonly attribute command_id generatedCommandList[] = 65528;
1015310153
readonly attribute command_id acceptedCommandList[] = 65529;
1015410154
readonly attribute event_id eventList[] = 65530;
@@ -10205,15 +10205,15 @@ provisional cluster WebRTCTransportProvider = 1363 {
1020510205
}
1020610206

1020710207
/** Requests that the Provider initiates a new session with the Offer / Answer flow in a way that allows for options to be passed and work with devices needing the standby flow. */
10208-
command SolicitOffer(SolicitOfferRequest): SolicitOfferResponse = 1;
10208+
fabric command SolicitOffer(SolicitOfferRequest): SolicitOfferResponse = 1;
1020910209
/** This command allows an SDP Offer to be set and start a new session. */
10210-
command ProvideOffer(ProvideOfferRequest): ProvideOfferResponse = 3;
10210+
fabric command ProvideOffer(ProvideOfferRequest): ProvideOfferResponse = 3;
1021110211
/** This command SHALL be initiated from a Node in response to an Offer that was previously received from a remote peer. */
10212-
command ProvideAnswer(ProvideAnswerRequest): DefaultSuccess = 5;
10212+
fabric command ProvideAnswer(ProvideAnswerRequest): DefaultSuccess = 5;
1021310213
/** This command allows for string based https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange, via a JSEP https://datatracker.ietf.org/doc/html/rfc9429#section-4.1.20 event, a DOM https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent event, or other WebRTC compliant implementations, to be added to a session during the gathering phase. */
10214-
command ProvideICECandidates(ProvideICECandidatesRequest): DefaultSuccess = 6;
10214+
fabric command ProvideICECandidates(ProvideICECandidatesRequest): DefaultSuccess = 6;
1021510215
/** This command instructs the stream provider to end the WebRTC session. */
10216-
command EndSession(EndSessionRequest): DefaultSuccess = 7;
10216+
fabric command EndSession(EndSessionRequest): DefaultSuccess = 7;
1021710217
}
1021810218

1021910219
/** The WebRTC transport requestor cluster provides a way for stream consumers (e.g. Matter Stream Viewer) to establish a WebRTC connection with a stream provider. */
@@ -10253,17 +10253,17 @@ provisional cluster WebRTCTransportRequestor = 1364 {
1025310253
optional int16u caid = 4;
1025410254
}
1025510255

10256-
struct WebRTCSessionStruct {
10256+
fabric_scoped struct WebRTCSessionStruct {
1025710257
int16u id = 1;
1025810258
node_id peerNodeID = 2;
10259-
fabric_idx peerFabricIndex = 3;
10260-
StreamUsageEnum streamUsage = 4;
10261-
nullable int16u videoStreamID = 5;
10262-
nullable int16u audioStreamID = 6;
10263-
WebRTCMetadataOptionsBitmap metadataOptions = 7;
10259+
StreamUsageEnum streamUsage = 3;
10260+
nullable int16u videoStreamID = 4;
10261+
nullable int16u audioStreamID = 5;
10262+
WebRTCMetadataOptionsBitmap metadataOptions = 6;
10263+
fabric_idx fabricIndex = 254;
1026410264
}
1026510265

10266-
readonly attribute WebRTCSessionStruct currentSessions[] = 0;
10266+
readonly attribute access(read: administer) WebRTCSessionStruct currentSessions[] = 0;
1026710267
readonly attribute command_id generatedCommandList[] = 65528;
1026810268
readonly attribute command_id acceptedCommandList[] = 65529;
1026910269
readonly attribute event_id eventList[] = 65530;

‎src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -63138,6 +63138,11 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback {
6313863138

6313963139
public void readCurrentSessionsAttribute(
6314063140
CurrentSessionsAttributeCallback callback) {
63141+
readCurrentSessionsAttributeWithFabricFilter(callback, true);
63142+
}
63143+
63144+
public void readCurrentSessionsAttributeWithFabricFilter(
63145+
CurrentSessionsAttributeCallback callback, boolean isFabricFiltered) {
6314163146
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SESSIONS_ATTRIBUTE_ID);
6314263147

6314363148
readAttribute(new ReportCallbackImpl(callback, path) {
@@ -63146,7 +63151,7 @@ public void onSuccess(byte[] tlv) {
6314663151
List<ChipStructs.WebRTCTransportProviderClusterWebRTCSessionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
6314763152
callback.onSuccess(value);
6314863153
}
63149-
}, CURRENT_SESSIONS_ATTRIBUTE_ID, true);
63154+
}, CURRENT_SESSIONS_ATTRIBUTE_ID, isFabricFiltered);
6315063155
}
6315163156

6315263157
public void subscribeCurrentSessionsAttribute(
@@ -63466,6 +63471,11 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback {
6346663471

6346763472
public void readCurrentSessionsAttribute(
6346863473
CurrentSessionsAttributeCallback callback) {
63474+
readCurrentSessionsAttributeWithFabricFilter(callback, true);
63475+
}
63476+
63477+
public void readCurrentSessionsAttributeWithFabricFilter(
63478+
CurrentSessionsAttributeCallback callback, boolean isFabricFiltered) {
6346963479
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SESSIONS_ATTRIBUTE_ID);
6347063480

6347163481
readAttribute(new ReportCallbackImpl(callback, path) {
@@ -63474,7 +63484,7 @@ public void onSuccess(byte[] tlv) {
6347463484
List<ChipStructs.WebRTCTransportRequestorClusterWebRTCSessionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
6347563485
callback.onSuccess(value);
6347663486
}
63477-
}, CURRENT_SESSIONS_ATTRIBUTE_ID, true);
63487+
}, CURRENT_SESSIONS_ATTRIBUTE_ID, isFabricFiltered);
6347863488
}
6347963489

6348063490
public void subscribeCurrentSessionsAttribute(

‎src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java

+42-42
Original file line numberDiff line numberDiff line change
@@ -14636,46 +14636,46 @@ public String toString() {
1463614636
public static class WebRTCTransportProviderClusterWebRTCSessionStruct {
1463714637
public Integer id;
1463814638
public Long peerNodeID;
14639-
public Integer peerFabricIndex;
1464014639
public Integer streamUsage;
1464114640
public @Nullable Integer videoStreamID;
1464214641
public @Nullable Integer audioStreamID;
1464314642
public Integer metadataOptions;
14643+
public Integer fabricIndex;
1464414644
private static final long ID_ID = 1L;
1464514645
private static final long PEER_NODE_ID_ID = 2L;
14646-
private static final long PEER_FABRIC_INDEX_ID = 3L;
14647-
private static final long STREAM_USAGE_ID = 4L;
14648-
private static final long VIDEO_STREAM_ID_ID = 5L;
14649-
private static final long AUDIO_STREAM_ID_ID = 6L;
14650-
private static final long METADATA_OPTIONS_ID = 7L;
14646+
private static final long STREAM_USAGE_ID = 3L;
14647+
private static final long VIDEO_STREAM_ID_ID = 4L;
14648+
private static final long AUDIO_STREAM_ID_ID = 5L;
14649+
private static final long METADATA_OPTIONS_ID = 6L;
14650+
private static final long FABRIC_INDEX_ID = 254L;
1465114651

1465214652
public WebRTCTransportProviderClusterWebRTCSessionStruct(
1465314653
Integer id,
1465414654
Long peerNodeID,
14655-
Integer peerFabricIndex,
1465614655
Integer streamUsage,
1465714656
@Nullable Integer videoStreamID,
1465814657
@Nullable Integer audioStreamID,
14659-
Integer metadataOptions
14658+
Integer metadataOptions,
14659+
Integer fabricIndex
1466014660
) {
1466114661
this.id = id;
1466214662
this.peerNodeID = peerNodeID;
14663-
this.peerFabricIndex = peerFabricIndex;
1466414663
this.streamUsage = streamUsage;
1466514664
this.videoStreamID = videoStreamID;
1466614665
this.audioStreamID = audioStreamID;
1466714666
this.metadataOptions = metadataOptions;
14667+
this.fabricIndex = fabricIndex;
1466814668
}
1466914669

1467014670
public StructType encodeTlv() {
1467114671
ArrayList<StructElement> values = new ArrayList<>();
1467214672
values.add(new StructElement(ID_ID, new UIntType(id)));
1467314673
values.add(new StructElement(PEER_NODE_ID_ID, new UIntType(peerNodeID)));
14674-
values.add(new StructElement(PEER_FABRIC_INDEX_ID, new UIntType(peerFabricIndex)));
1467514674
values.add(new StructElement(STREAM_USAGE_ID, new UIntType(streamUsage)));
1467614675
values.add(new StructElement(VIDEO_STREAM_ID_ID, videoStreamID != null ? new UIntType(videoStreamID) : new NullType()));
1467714676
values.add(new StructElement(AUDIO_STREAM_ID_ID, audioStreamID != null ? new UIntType(audioStreamID) : new NullType()));
1467814677
values.add(new StructElement(METADATA_OPTIONS_ID, new UIntType(metadataOptions)));
14678+
values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
1467914679

1468014680
return new StructType(values);
1468114681
}
@@ -14686,11 +14686,11 @@ public static WebRTCTransportProviderClusterWebRTCSessionStruct decodeTlv(BaseTL
1468614686
}
1468714687
Integer id = null;
1468814688
Long peerNodeID = null;
14689-
Integer peerFabricIndex = null;
1469014689
Integer streamUsage = null;
1469114690
@Nullable Integer videoStreamID = null;
1469214691
@Nullable Integer audioStreamID = null;
1469314692
Integer metadataOptions = null;
14693+
Integer fabricIndex = null;
1469414694
for (StructElement element: ((StructType)tlvValue).value()) {
1469514695
if (element.contextTagNum() == ID_ID) {
1469614696
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -14702,11 +14702,6 @@ public static WebRTCTransportProviderClusterWebRTCSessionStruct decodeTlv(BaseTL
1470214702
UIntType castingValue = element.value(UIntType.class);
1470314703
peerNodeID = castingValue.value(Long.class);
1470414704
}
14705-
} else if (element.contextTagNum() == PEER_FABRIC_INDEX_ID) {
14706-
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
14707-
UIntType castingValue = element.value(UIntType.class);
14708-
peerFabricIndex = castingValue.value(Integer.class);
14709-
}
1471014705
} else if (element.contextTagNum() == STREAM_USAGE_ID) {
1471114706
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
1471214707
UIntType castingValue = element.value(UIntType.class);
@@ -14727,16 +14722,21 @@ public static WebRTCTransportProviderClusterWebRTCSessionStruct decodeTlv(BaseTL
1472714722
UIntType castingValue = element.value(UIntType.class);
1472814723
metadataOptions = castingValue.value(Integer.class);
1472914724
}
14725+
} else if (element.contextTagNum() == FABRIC_INDEX_ID) {
14726+
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
14727+
UIntType castingValue = element.value(UIntType.class);
14728+
fabricIndex = castingValue.value(Integer.class);
14729+
}
1473014730
}
1473114731
}
1473214732
return new WebRTCTransportProviderClusterWebRTCSessionStruct(
1473314733
id,
1473414734
peerNodeID,
14735-
peerFabricIndex,
1473614735
streamUsage,
1473714736
videoStreamID,
1473814737
audioStreamID,
14739-
metadataOptions
14738+
metadataOptions,
14739+
fabricIndex
1474014740
);
1474114741
}
1474214742

@@ -14750,9 +14750,6 @@ public String toString() {
1475014750
output.append("\tpeerNodeID: ");
1475114751
output.append(peerNodeID);
1475214752
output.append("\n");
14753-
output.append("\tpeerFabricIndex: ");
14754-
output.append(peerFabricIndex);
14755-
output.append("\n");
1475614753
output.append("\tstreamUsage: ");
1475714754
output.append(streamUsage);
1475814755
output.append("\n");
@@ -14765,6 +14762,9 @@ public String toString() {
1476514762
output.append("\tmetadataOptions: ");
1476614763
output.append(metadataOptions);
1476714764
output.append("\n");
14765+
output.append("\tfabricIndex: ");
14766+
output.append(fabricIndex);
14767+
output.append("\n");
1476814768
output.append("}\n");
1476914769
return output.toString();
1477014770
}
@@ -14863,46 +14863,46 @@ public String toString() {
1486314863
public static class WebRTCTransportRequestorClusterWebRTCSessionStruct {
1486414864
public Integer id;
1486514865
public Long peerNodeID;
14866-
public Integer peerFabricIndex;
1486714866
public Integer streamUsage;
1486814867
public @Nullable Integer videoStreamID;
1486914868
public @Nullable Integer audioStreamID;
1487014869
public Integer metadataOptions;
14870+
public Integer fabricIndex;
1487114871
private static final long ID_ID = 1L;
1487214872
private static final long PEER_NODE_ID_ID = 2L;
14873-
private static final long PEER_FABRIC_INDEX_ID = 3L;
14874-
private static final long STREAM_USAGE_ID = 4L;
14875-
private static final long VIDEO_STREAM_ID_ID = 5L;
14876-
private static final long AUDIO_STREAM_ID_ID = 6L;
14877-
private static final long METADATA_OPTIONS_ID = 7L;
14873+
private static final long STREAM_USAGE_ID = 3L;
14874+
private static final long VIDEO_STREAM_ID_ID = 4L;
14875+
private static final long AUDIO_STREAM_ID_ID = 5L;
14876+
private static final long METADATA_OPTIONS_ID = 6L;
14877+
private static final long FABRIC_INDEX_ID = 254L;
1487814878

1487914879
public WebRTCTransportRequestorClusterWebRTCSessionStruct(
1488014880
Integer id,
1488114881
Long peerNodeID,
14882-
Integer peerFabricIndex,
1488314882
Integer streamUsage,
1488414883
@Nullable Integer videoStreamID,
1488514884
@Nullable Integer audioStreamID,
14886-
Integer metadataOptions
14885+
Integer metadataOptions,
14886+
Integer fabricIndex
1488714887
) {
1488814888
this.id = id;
1488914889
this.peerNodeID = peerNodeID;
14890-
this.peerFabricIndex = peerFabricIndex;
1489114890
this.streamUsage = streamUsage;
1489214891
this.videoStreamID = videoStreamID;
1489314892
this.audioStreamID = audioStreamID;
1489414893
this.metadataOptions = metadataOptions;
14894+
this.fabricIndex = fabricIndex;
1489514895
}
1489614896

1489714897
public StructType encodeTlv() {
1489814898
ArrayList<StructElement> values = new ArrayList<>();
1489914899
values.add(new StructElement(ID_ID, new UIntType(id)));
1490014900
values.add(new StructElement(PEER_NODE_ID_ID, new UIntType(peerNodeID)));
14901-
values.add(new StructElement(PEER_FABRIC_INDEX_ID, new UIntType(peerFabricIndex)));
1490214901
values.add(new StructElement(STREAM_USAGE_ID, new UIntType(streamUsage)));
1490314902
values.add(new StructElement(VIDEO_STREAM_ID_ID, videoStreamID != null ? new UIntType(videoStreamID) : new NullType()));
1490414903
values.add(new StructElement(AUDIO_STREAM_ID_ID, audioStreamID != null ? new UIntType(audioStreamID) : new NullType()));
1490514904
values.add(new StructElement(METADATA_OPTIONS_ID, new UIntType(metadataOptions)));
14905+
values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
1490614906

1490714907
return new StructType(values);
1490814908
}
@@ -14913,11 +14913,11 @@ public static WebRTCTransportRequestorClusterWebRTCSessionStruct decodeTlv(BaseT
1491314913
}
1491414914
Integer id = null;
1491514915
Long peerNodeID = null;
14916-
Integer peerFabricIndex = null;
1491714916
Integer streamUsage = null;
1491814917
@Nullable Integer videoStreamID = null;
1491914918
@Nullable Integer audioStreamID = null;
1492014919
Integer metadataOptions = null;
14920+
Integer fabricIndex = null;
1492114921
for (StructElement element: ((StructType)tlvValue).value()) {
1492214922
if (element.contextTagNum() == ID_ID) {
1492314923
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -14929,11 +14929,6 @@ public static WebRTCTransportRequestorClusterWebRTCSessionStruct decodeTlv(BaseT
1492914929
UIntType castingValue = element.value(UIntType.class);
1493014930
peerNodeID = castingValue.value(Long.class);
1493114931
}
14932-
} else if (element.contextTagNum() == PEER_FABRIC_INDEX_ID) {
14933-
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
14934-
UIntType castingValue = element.value(UIntType.class);
14935-
peerFabricIndex = castingValue.value(Integer.class);
14936-
}
1493714932
} else if (element.contextTagNum() == STREAM_USAGE_ID) {
1493814933
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
1493914934
UIntType castingValue = element.value(UIntType.class);
@@ -14954,16 +14949,21 @@ public static WebRTCTransportRequestorClusterWebRTCSessionStruct decodeTlv(BaseT
1495414949
UIntType castingValue = element.value(UIntType.class);
1495514950
metadataOptions = castingValue.value(Integer.class);
1495614951
}
14952+
} else if (element.contextTagNum() == FABRIC_INDEX_ID) {
14953+
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
14954+
UIntType castingValue = element.value(UIntType.class);
14955+
fabricIndex = castingValue.value(Integer.class);
14956+
}
1495714957
}
1495814958
}
1495914959
return new WebRTCTransportRequestorClusterWebRTCSessionStruct(
1496014960
id,
1496114961
peerNodeID,
14962-
peerFabricIndex,
1496314962
streamUsage,
1496414963
videoStreamID,
1496514964
audioStreamID,
14966-
metadataOptions
14965+
metadataOptions,
14966+
fabricIndex
1496714967
);
1496814968
}
1496914969

@@ -14977,9 +14977,6 @@ public String toString() {
1497714977
output.append("\tpeerNodeID: ");
1497814978
output.append(peerNodeID);
1497914979
output.append("\n");
14980-
output.append("\tpeerFabricIndex: ");
14981-
output.append(peerFabricIndex);
14982-
output.append("\n");
1498314980
output.append("\tstreamUsage: ");
1498414981
output.append(streamUsage);
1498514982
output.append("\n");
@@ -14992,6 +14989,9 @@ public String toString() {
1499214989
output.append("\tmetadataOptions: ");
1499314990
output.append(metadataOptions);
1499414991
output.append("\n");
14992+
output.append("\tfabricIndex: ");
14993+
output.append(fabricIndex);
14994+
output.append("\n");
1499514995
output.append("}\n");
1499614996
return output.toString();
1499714997
}

0 commit comments

Comments
 (0)