header.go prevent otherHeader.rawTLVs being nil

hilbix · pires · commit 9814f02da6f5 · 2024-10-08T12:29:38.000+01:00
If header.Version != otherHeader.Version then otherHeader.rawTLVs
is not present.
diff --git a/header.go b/header.go
@@ -155,11 +155,11 @@ func (header *Header) EqualsTo(otherHeader *Header) bool {
 	if otherHeader == nil {
 		return false
 	}
-	// TLVs only exist for version 2
-	if header.Version == 2 && !bytes.Equal(header.rawTLVs, otherHeader.rawTLVs) {
+	if header.Version != otherHeader.Version || header.Command != otherHeader.Command || header.TransportProtocol != otherHeader.TransportProtocol {
 		return false
 	}
-	if header.Version != otherHeader.Version || header.Command != otherHeader.Command || header.TransportProtocol != otherHeader.TransportProtocol {
+	// TLVs only exist for version 2
+	if header.Version == 2 && !bytes.Equal(header.rawTLVs, otherHeader.rawTLVs) {
 		return false
 	}
 	// Return early for header with LOCAL command, which contains no address information

Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,11 @@ func (header Header) EqualsTo(otherHeader Header) bool {`
`155`	`155`	`if otherHeader == nil {`
`156`	`156`	`return false`
`157`	`157`	`}`
`158`		`- // TLVs only exist for version 2`
`159`		`- if header.Version == 2 && !bytes.Equal(header.rawTLVs, otherHeader.rawTLVs) {`
	`158`	`+ if header.Version != otherHeader.Version \|\| header.Command != otherHeader.Command \|\| header.TransportProtocol != otherHeader.TransportProtocol {`
`160`	`159`	`return false`
`161`	`160`	`}`
`162`		`- if header.Version != otherHeader.Version \|\| header.Command != otherHeader.Command \|\| header.TransportProtocol != otherHeader.TransportProtocol {`
	`161`	`+ // TLVs only exist for version 2`
	`162`	`+ if header.Version == 2 && !bytes.Equal(header.rawTLVs, otherHeader.rawTLVs) {`
`163`	`163`	`return false`
`164`	`164`	`}`
`165`	`165`	`// Return early for header with LOCAL command, which contains no address information`