From 305db64cf26b223736863f3ac4a268c1f25eebaa Mon Sep 17 00:00:00 2001 From: firealarmss Date: Thu, 20 Mar 2025 02:08:50 -0500 Subject: [PATCH] swap ACK_RSP dstId and srcId --- P25/lc/tsbk/IOSP_ACK_RSP.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/P25/lc/tsbk/IOSP_ACK_RSP.cs b/P25/lc/tsbk/IOSP_ACK_RSP.cs index 4335456..bea21e6 100644 --- a/P25/lc/tsbk/IOSP_ACK_RSP.cs +++ b/P25/lc/tsbk/IOSP_ACK_RSP.cs @@ -58,8 +58,8 @@ namespace fnecore.P25.LC.TSBK Aiv = ((tsbkValue >> 56) & 0x80U) == 0x80U; // Additional Info Flag Service = (byte)((tsbkValue >> 56) & 0x3FU); // Service Type - DstId = FneUtils.Bytes3ToUInt32(Payload, 3); // Target Radio Address - SrcId = FneUtils.Bytes3ToUInt32(Payload, 0); // Source Radio Address + SrcId = FneUtils.Bytes3ToUInt32(Payload, 3); // Target Radio Address + DstId = FneUtils.Bytes3ToUInt32(Payload, 0); // Source Radio Address return true; } @@ -86,10 +86,10 @@ namespace fnecore.P25.LC.TSBK } else { - tsbkValue = (tsbkValue << 32) + DstId; // Target Radio Address + tsbkValue = (tsbkValue << 32) + SrcId; // Target Radio Address } - tsbkValue = (tsbkValue << 24) + SrcId; // Source Radio Address + tsbkValue = (tsbkValue << 24) + DstId; // Source Radio Address FneUtils.Memset(Payload, 0x00, Payload.Length); FneUtils.WriteBytes(tsbkValue, ref Payload, 0);