Skip to content

Commit 8595d74

Browse files
jdomnitzjdomnitz
committed
Improve handling of anonymous fields - command invocation now works
1 parent 4a3f02d commit 8595d74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+253
-218
lines changed

‎Generator/ClassGenerator.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ private static void WriteTag(string indent, Tag tag, StreamWriter writer)
4242
if (child.Type != DataType.Structure)
4343
writer.WriteLine($"{indent} {(child.Optional? "public" : "public required")} {GetType(child)}{((child.Nullable || child.Optional) ? "?" : "")} {child.Name} {{ get; set; }} ");
4444
}
45-
writer.WriteLine($"\r\n{indent} /// <inheritdoc />\r\n{indent} [SetsRequiredMembers]\r\n{indent} public {tag.Name}(TLVReader reader, uint structNumber = 0) {{");
45+
writer.WriteLine($"\r\n{indent} /// <inheritdoc />\r\n{indent} [SetsRequiredMembers]\r\n{indent} public {tag.Name}(TLVReader reader, long structNumber = -1) {{");
4646
if (tag.Type == DataType.List)
47-
writer.WriteLine($"{indent} reader.StartList();");
47+
writer.WriteLine($"{indent} reader.StartList(structNumber);");
4848
else if (tag.Type != DataType.Choice)
4949
writer.WriteLine($"{indent} reader.StartStructure(structNumber);");
5050
foreach (Tag child in tag.Children)
@@ -125,9 +125,9 @@ private static void WriteTag(string indent, Tag tag, StreamWriter writer)
125125
}
126126
if (tag.Type != DataType.Choice)
127127
writer.WriteLine($"{indent} reader.EndContainer();");
128-
writer.WriteLine($"{indent} }}\r\n\r\n{indent} /// <inheritdoc />\r\n{indent} public override void Serialize(TLVWriter writer, uint structNumber = 0) {{");
128+
writer.WriteLine($"{indent} }}\r\n\r\n{indent} /// <inheritdoc />\r\n{indent} public override void Serialize(TLVWriter writer, long structNumber = -1) {{");
129129
if (tag.Type == DataType.List)
130-
writer.WriteLine($"{indent} writer.StartList();");
130+
writer.WriteLine($"{indent} writer.StartList(structNumber);");
131131
else if (tag.Type != DataType.Choice)
132132
writer.WriteLine($"{indent} writer.StartStructure(structNumber);");
133133
foreach (Tag child in tag.Children)
@@ -335,7 +335,7 @@ private static string GetEnumerationType(Tag tag)
335335
private static string GetEnumerationIndex(Tag tag)
336336
{
337337
if (tag.Children.Count == 0)
338-
return "0";
338+
return "-1";
339339
return tag.Children[0].TagNumber.ToString();
340340
}
341341
}

‎MatterDotNet/Messages/CASE/Sigma1.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Sigma1(Memory<byte> data) : this(new TLVReader(data)) {}
3838

3939
/// <inheritdoc />
4040
[SetsRequiredMembers]
41-
public Sigma1(TLVReader reader, uint structNumber = 0) {
41+
public Sigma1(TLVReader reader, long structNumber = -1) {
4242
reader.StartStructure(structNumber);
4343
InitiatorRandom = reader.GetBytes(1)!;
4444
InitiatorSessionId = reader.GetUShort(2)!.Value;
@@ -54,7 +54,7 @@ public Sigma1(TLVReader reader, uint structNumber = 0) {
5454
}
5555

5656
/// <inheritdoc />
57-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
57+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
5858
writer.StartStructure(structNumber);
5959
writer.WriteBytes(1, InitiatorRandom);
6060
writer.WriteUShort(2, InitiatorSessionId);

‎MatterDotNet/Messages/CASE/Sigma2.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Sigma2(Memory<byte> data) : this(new TLVReader(data)) {}
3636

3737
/// <inheritdoc />
3838
[SetsRequiredMembers]
39-
public Sigma2(TLVReader reader, uint structNumber = 0) {
39+
public Sigma2(TLVReader reader, long structNumber = -1) {
4040
reader.StartStructure(structNumber);
4141
ResponderRandom = reader.GetBytes(1)!;
4242
ResponderSessionId = reader.GetUShort(2)!.Value;
@@ -48,7 +48,7 @@ public Sigma2(TLVReader reader, uint structNumber = 0) {
4848
}
4949

5050
/// <inheritdoc />
51-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
51+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
5252
writer.StartStructure(structNumber);
5353
writer.WriteBytes(1, ResponderRandom);
5454
writer.WriteUShort(2, ResponderSessionId);

‎MatterDotNet/Messages/CASE/Sigma2Resume.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Sigma2Resume(Memory<byte> data) : this(new TLVReader(data)) {}
3535

3636
/// <inheritdoc />
3737
[SetsRequiredMembers]
38-
public Sigma2Resume(TLVReader reader, uint structNumber = 0) {
38+
public Sigma2Resume(TLVReader reader, long structNumber = -1) {
3939
reader.StartStructure(structNumber);
4040
ResumptionID = reader.GetBytes(1)!;
4141
Sigma2ResumeMIC = reader.GetBytes(2)!;
@@ -46,7 +46,7 @@ public Sigma2Resume(TLVReader reader, uint structNumber = 0) {
4646
}
4747

4848
/// <inheritdoc />
49-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
49+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
5050
writer.StartStructure(structNumber);
5151
writer.WriteBytes(1, ResumptionID);
5252
writer.WriteBytes(2, Sigma2ResumeMIC);

‎MatterDotNet/Messages/CASE/Sigma2Tbedata.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Sigma2Tbedata(Memory<byte> data) : this(new TLVReader(data)) {}
3434

3535
/// <inheritdoc />
3636
[SetsRequiredMembers]
37-
public Sigma2Tbedata(TLVReader reader, uint structNumber = 0) {
37+
public Sigma2Tbedata(TLVReader reader, long structNumber = -1) {
3838
reader.StartStructure(structNumber);
3939
ResponderNOC = reader.GetBytes(1)!;
4040
if (reader.IsTag(2))
@@ -45,7 +45,7 @@ public Sigma2Tbedata(TLVReader reader, uint structNumber = 0) {
4545
}
4646

4747
/// <inheritdoc />
48-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
48+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
4949
writer.StartStructure(structNumber);
5050
writer.WriteBytes(1, ResponderNOC);
5151
if (ResponderICAC != null)

‎MatterDotNet/Messages/CASE/Sigma2Tbsdata.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Sigma2Tbsdata(Memory<byte> data) : this(new TLVReader(data)) {}
3434

3535
/// <inheritdoc />
3636
[SetsRequiredMembers]
37-
public Sigma2Tbsdata(TLVReader reader, uint structNumber = 0) {
37+
public Sigma2Tbsdata(TLVReader reader, long structNumber = -1) {
3838
reader.StartStructure(structNumber);
3939
ResponderNOC = reader.GetBytes(1)!;
4040
if (reader.IsTag(2))
@@ -45,7 +45,7 @@ public Sigma2Tbsdata(TLVReader reader, uint structNumber = 0) {
4545
}
4646

4747
/// <inheritdoc />
48-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
48+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
4949
writer.StartStructure(structNumber);
5050
writer.WriteBytes(1, ResponderNOC);
5151
if (ResponderICAC != null)

‎MatterDotNet/Messages/CASE/Sigma3.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public Sigma3(Memory<byte> data) : this(new TLVReader(data)) {}
3131

3232
/// <inheritdoc />
3333
[SetsRequiredMembers]
34-
public Sigma3(TLVReader reader, uint structNumber = 0) {
34+
public Sigma3(TLVReader reader, long structNumber = -1) {
3535
reader.StartStructure(structNumber);
3636
Encrypted3 = reader.GetBytes(1)!;
3737
reader.EndContainer();
3838
}
3939

4040
/// <inheritdoc />
41-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
41+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
4242
writer.StartStructure(structNumber);
4343
writer.WriteBytes(1, Encrypted3);
4444
writer.EndContainer();

‎MatterDotNet/Messages/CASE/Sigma3Tbedata.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public Sigma3Tbedata(Memory<byte> data) : this(new TLVReader(data)) {}
3333

3434
/// <inheritdoc />
3535
[SetsRequiredMembers]
36-
public Sigma3Tbedata(TLVReader reader, uint structNumber = 0) {
36+
public Sigma3Tbedata(TLVReader reader, long structNumber = -1) {
3737
reader.StartStructure(structNumber);
3838
InitiatorNOC = reader.GetBytes(1)!;
3939
if (reader.IsTag(2))
@@ -43,7 +43,7 @@ public Sigma3Tbedata(TLVReader reader, uint structNumber = 0) {
4343
}
4444

4545
/// <inheritdoc />
46-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
46+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
4747
writer.StartStructure(structNumber);
4848
writer.WriteBytes(1, InitiatorNOC);
4949
if (InitiatorICAC != null)

‎MatterDotNet/Messages/CASE/Sigma3Tbsdata.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Sigma3Tbsdata(Memory<byte> data) : this(new TLVReader(data)) {}
3434

3535
/// <inheritdoc />
3636
[SetsRequiredMembers]
37-
public Sigma3Tbsdata(TLVReader reader, uint structNumber = 0) {
37+
public Sigma3Tbsdata(TLVReader reader, long structNumber = -1) {
3838
reader.StartStructure(structNumber);
3939
InitiatorNOC = reader.GetBytes(1)!;
4040
if (reader.IsTag(2))
@@ -45,7 +45,7 @@ public Sigma3Tbsdata(TLVReader reader, uint structNumber = 0) {
4545
}
4646

4747
/// <inheritdoc />
48-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
48+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
4949
writer.StartStructure(structNumber);
5050
writer.WriteBytes(1, InitiatorNOC);
5151
if (InitiatorICAC != null)

‎MatterDotNet/Messages/Certificates/AttestationElements.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public AttestationElements(Memory<byte> data) : this(new TLVReader(data)) {}
3434

3535
/// <inheritdoc />
3636
[SetsRequiredMembers]
37-
public AttestationElements(TLVReader reader, uint structNumber = 0) {
37+
public AttestationElements(TLVReader reader, long structNumber = -1) {
3838
reader.StartStructure(structNumber);
3939
Certification_declaration = reader.GetBytes(1)!;
4040
Attestation_nonce = reader.GetBytes(2)!;
@@ -45,7 +45,7 @@ public AttestationElements(TLVReader reader, uint structNumber = 0) {
4545
}
4646

4747
/// <inheritdoc />
48-
public override void Serialize(TLVWriter writer, uint structNumber = 0) {
48+
public override void Serialize(TLVWriter writer, long structNumber = -1) {
4949
writer.StartStructure(structNumber);
5050
writer.WriteBytes(1, Certification_declaration);
5151
writer.WriteBytes(2, Attestation_nonce);

0 commit comments

Comments
 (0)