fix sync packet length (#442)

abulimov · facebook-github-bot · commit 5901a6632b01 · 2025-01-17T09:04:52.000-08:00
Summary: Pull Request resolved: #442 Alternate Port TLV made sync packets non-fixed size. Reviewed By: leoleovich, vvfedorenko Differential Revision: D68329227 fbshipit-source-id: fb7726efafb43353cde6c32f497f3e6189aae08a
diff --git a/cmd/ziffy/node/packets.go b/cmd/ziffy/node/packets.go
@@ -66,7 +66,7 @@ func formSyncPacket(msgType ptp.MessageType, hop int, routeIndex int) *ptp.SyncD
 		Header: ptp.Header{
 			SdoIDAndMsgType: ptp.NewSdoIDAndMsgType(msgType, 0),
 			Version:         ptp.Version,
-			MessageLength:   uint16(binary.Size(ptp.SyncDelayReq{})),
+			MessageLength:   uint16(binary.Size(ptp.Header{}) + binary.Size(ptp.SyncDelayReqBody{})), //#nosec G115
 			FlagField:       ptp.FlagUnicast,
 			SequenceID:      uint16(hop),
 			SourcePortIdentity: ptp.PortIdentity{
diff --git a/ptp/sptp/client/client_test.go b/ptp/sptp/client/client_test.go
@@ -49,7 +49,7 @@ func announcePkt(seq int) *ptp.Announce {
 }
 
 func syncPkt(seq int) *ptp.SyncDelayReq {
-	l := binary.Size(ptp.SyncDelayReq{})
+	l := binary.Size(ptp.Header{}) + binary.Size(ptp.SyncDelayReqBody{}) //#nosec G115
 	return &ptp.SyncDelayReq{
 		Header: ptp.Header{
 			SdoIDAndMsgType:    ptp.NewSdoIDAndMsgType(ptp.MessageSync, 0),

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func announcePkt(seq int) *ptp.Announce {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func syncPkt(seq int) *ptp.SyncDelayReq {`
`52`		`- l := binary.Size(ptp.SyncDelayReq{})`
	`52`	`+ l := binary.Size(ptp.Header{}) + binary.Size(ptp.SyncDelayReqBody{}) //#nosec G115`
`53`	`53`	`return &ptp.SyncDelayReq{`
`54`	`54`	`Header: ptp.Header{`
`55`	`55`	`SdoIDAndMsgType: ptp.NewSdoIDAndMsgType(ptp.MessageSync, 0),`