Skip to content

Commit 3bb1fcc

Browse files
jdomnitzjdomnitz
committed
Implement Interaction data payloads, improve TLV parsing, properly close sessions, various fixes
1 parent a24a97d commit 3bb1fcc

35 files changed

+230
-130
lines changed

‎MatterDotNet/Messages/CASE/Sigma1.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ public Sigma1(TLVReader reader, uint structNumber = 0) {
5656
/// <inheritdoc />
5757
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
5858
writer.StartStructure(structNumber);
59-
writer.WriteBytes(1, InitiatorRandom, 1);
59+
writer.WriteBytes(1, InitiatorRandom);
6060
writer.WriteUShort(2, InitiatorSessionId);
61-
writer.WriteBytes(3, DestinationId, 1);
62-
writer.WriteBytes(4, InitiatorEphPubKey, 1);
61+
writer.WriteBytes(3, DestinationId);
62+
writer.WriteBytes(4, InitiatorEphPubKey);
6363
if (InitiatorSessionParams != null)
6464
InitiatorSessionParams.Serialize(writer, 5);
6565
if (ResumptionID != null)
66-
writer.WriteBytes(6, ResumptionID, 1);
66+
writer.WriteBytes(6, ResumptionID);
6767
if (InitiatorResumeMIC != null)
68-
writer.WriteBytes(7, InitiatorResumeMIC, 1);
68+
writer.WriteBytes(7, InitiatorResumeMIC);
6969
writer.EndContainer();
7070
}
7171
}

‎MatterDotNet/Messages/CASE/Sigma2.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public Sigma2(TLVReader reader, uint structNumber = 0) {
5050
/// <inheritdoc />
5151
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
5252
writer.StartStructure(structNumber);
53-
writer.WriteBytes(1, ResponderRandom, 1);
53+
writer.WriteBytes(1, ResponderRandom);
5454
writer.WriteUShort(2, ResponderSessionId);
55-
writer.WriteBytes(3, ResponderEphPubKey, 1);
56-
writer.WriteBytes(4, Encrypted2, 0);
55+
writer.WriteBytes(3, ResponderEphPubKey);
56+
writer.WriteBytes(4, Encrypted2);
5757
if (ResponderSessionParams != null)
5858
ResponderSessionParams.Serialize(writer, 5);
5959
writer.EndContainer();

‎MatterDotNet/Messages/CASE/Sigma2Resume.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public Sigma2Resume(TLVReader reader, uint structNumber = 0) {
4848
/// <inheritdoc />
4949
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
5050
writer.StartStructure(structNumber);
51-
writer.WriteBytes(1, ResumptionID, 1);
52-
writer.WriteBytes(2, Sigma2ResumeMIC, 1);
51+
writer.WriteBytes(1, ResumptionID);
52+
writer.WriteBytes(2, Sigma2ResumeMIC);
5353
writer.WriteUShort(3, ResponderSessionID);
5454
if (ResponderSessionParams != null)
5555
ResponderSessionParams.Serialize(writer, 4);

‎MatterDotNet/Messages/CASE/Sigma2Tbedata.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public Sigma2Tbedata(TLVReader reader, uint structNumber = 0) {
4747
/// <inheritdoc />
4848
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4949
writer.StartStructure(structNumber);
50-
writer.WriteBytes(1, ResponderNOC, 0);
50+
writer.WriteBytes(1, ResponderNOC);
5151
if (ResponderICAC != null)
52-
writer.WriteBytes(2, ResponderICAC, 0);
53-
writer.WriteBytes(3, Signature, 1);
54-
writer.WriteBytes(4, ResumptionID, 1);
52+
writer.WriteBytes(2, ResponderICAC);
53+
writer.WriteBytes(3, Signature);
54+
writer.WriteBytes(4, ResumptionID);
5555
writer.EndContainer();
5656
}
5757
}

‎MatterDotNet/Messages/CASE/Sigma2Tbsdata.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public Sigma2Tbsdata(TLVReader reader, uint structNumber = 0) {
4747
/// <inheritdoc />
4848
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4949
writer.StartStructure(structNumber);
50-
writer.WriteBytes(1, ResponderNOC, 0);
50+
writer.WriteBytes(1, ResponderNOC);
5151
if (ResponderICAC != null)
52-
writer.WriteBytes(2, ResponderICAC, 0);
53-
writer.WriteBytes(3, ResponderEphPubKey, 1);
54-
writer.WriteBytes(4, InitiatorEphPubKey, 1);
52+
writer.WriteBytes(2, ResponderICAC);
53+
writer.WriteBytes(3, ResponderEphPubKey);
54+
writer.WriteBytes(4, InitiatorEphPubKey);
5555
writer.EndContainer();
5656
}
5757
}

‎MatterDotNet/Messages/CASE/Sigma3.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Sigma3(TLVReader reader, uint structNumber = 0) {
4040
/// <inheritdoc />
4141
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4242
writer.StartStructure(structNumber);
43-
writer.WriteBytes(1, Encrypted3, 0);
43+
writer.WriteBytes(1, Encrypted3);
4444
writer.EndContainer();
4545
}
4646
}

‎MatterDotNet/Messages/CASE/Sigma3Tbedata.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public Sigma3Tbedata(TLVReader reader, uint structNumber = 0) {
4545
/// <inheritdoc />
4646
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4747
writer.StartStructure(structNumber);
48-
writer.WriteBytes(1, InitiatorNOC, 0);
48+
writer.WriteBytes(1, InitiatorNOC);
4949
if (InitiatorICAC != null)
50-
writer.WriteBytes(2, InitiatorICAC, 0);
51-
writer.WriteBytes(3, Signature, 1);
50+
writer.WriteBytes(2, InitiatorICAC);
51+
writer.WriteBytes(3, Signature);
5252
writer.EndContainer();
5353
}
5454
}

‎MatterDotNet/Messages/CASE/Sigma3Tbsdata.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public Sigma3Tbsdata(TLVReader reader, uint structNumber = 0) {
4747
/// <inheritdoc />
4848
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4949
writer.StartStructure(structNumber);
50-
writer.WriteBytes(1, InitiatorNOC, 0);
50+
writer.WriteBytes(1, InitiatorNOC);
5151
if (InitiatorICAC != null)
52-
writer.WriteBytes(2, InitiatorICAC, 0);
53-
writer.WriteBytes(3, InitiatorEphPubKey, 1);
54-
writer.WriteBytes(4, ResponderEphPubKey, 1);
52+
writer.WriteBytes(2, InitiatorICAC);
53+
writer.WriteBytes(3, InitiatorEphPubKey);
54+
writer.WriteBytes(4, ResponderEphPubKey);
5555
writer.EndContainer();
5656
}
5757
}

‎MatterDotNet/Messages/InteractionModel/AttributeDataIB.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public AttributeDataIB(TLVReader reader, uint structNumber = 0) {
3737
reader.StartStructure(structNumber);
3838
DataVersion = reader.GetUInt(0)!.Value;
3939
Path = new AttributePathIB(reader, 1);
40+
Data = reader.GetAny(2)!;
4041
reader.EndContainer();
4142
}
4243

@@ -45,6 +46,7 @@ public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4546
writer.StartStructure(structNumber);
4647
writer.WriteUInt(0, DataVersion);
4748
Path.Serialize(writer, 1);
49+
writer.WriteAny(2, Data);
4850
writer.EndContainer();
4951
}
5052
}

‎MatterDotNet/Messages/InteractionModel/CommandDataIB.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public CommandDataIB(TLVReader reader, uint structNumber = 0) {
3737
reader.StartStructure(structNumber);
3838
CommandPath = new CommandPathIB(reader, 0);
3939
if (reader.IsTag(1))
40+
CommandFields = reader.GetAny(1);
4041
if (reader.IsTag(2))
4142
CommandRef = reader.GetUShort(2);
4243
reader.EndContainer();
@@ -47,6 +48,7 @@ public override void Serialize(TLVWriter writer, uint structNumber = 0) {
4748
writer.StartStructure(structNumber);
4849
CommandPath.Serialize(writer, 0);
4950
if (CommandFields != null)
51+
writer.WriteAny(1, CommandFields);
5052
if (CommandRef != null)
5153
writer.WriteUShort(2, CommandRef);
5254
writer.EndContainer();

0 commit comments

Comments
 (0)