fix sync packet length (#442)

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
facebook · Jan 17, 2025 · 5901a66 · 5901a66
1 parent 25116f8
commit 5901a66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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),