mirror of
https://github.com/S7NetPlus/s7netplus.git
synced 2026-02-17 22:38:27 +08:00
50b026d7a5
Read responses from the PLS using classes for TPKT and COPT. This makes the communication more robust. It will now handle empty COTP packets that SoftPLS and WinAC based PLCs send out. I use RFC names for functions and classes. Change logic to use COTP and S7Comm reponse codes instead of relying on packet sizes. Read Max PDU size from connection setup. Ref #21 Change logic to use MaxPDUSize when reading istead of hardcoded limit. I tried using MaxPDUSize when writing data but this failed when packet size is over 256 on snap7. So i decided to drop changes to write size. I have done some tests against WinAC cpu and it seems to handle bigger pdu's when writing if negotiated in the connection setup. This might just be a SNAP7 bug. Fix MaxPDUSize for readbytes Remove debug line Simplify byte copy. Remove unessesarry buffer
50 lines
1.3 KiB
C#
50 lines
1.3 KiB
C#
using System;
|
|
using System.Net.Sockets;
|
|
|
|
namespace S7.Net
|
|
{
|
|
|
|
/// <summary>
|
|
/// Describes a TPKT Packet
|
|
/// </summary>
|
|
internal class TPKT
|
|
{
|
|
public byte Version;
|
|
public byte Reserved1;
|
|
public int Length;
|
|
public byte[] Data;
|
|
|
|
/// <summary>
|
|
/// Reds a TPKT from the socket
|
|
/// </summary>
|
|
/// <param name="socket">The socket to read from</param>
|
|
/// <returns>TPKT Instace</returns>
|
|
public static TPKT Read(Socket socket)
|
|
{
|
|
var buf = new byte[4];
|
|
socket.Receive(buf, 4, SocketFlags.None);
|
|
var pkt = new TPKT
|
|
{
|
|
Version = buf[0],
|
|
Reserved1 = buf[1],
|
|
Length = buf[2] * 256 + buf[3] //BigEndian
|
|
};
|
|
if (pkt.Length > 0)
|
|
{
|
|
pkt.Data = new byte[pkt.Length - 4];
|
|
socket.Receive(pkt.Data, pkt.Length - 4, SocketFlags.None);
|
|
}
|
|
return pkt;
|
|
}
|
|
|
|
public override string ToString()
|
|
{
|
|
return string.Format("Version: {0} Length: {1} Data: {2}",
|
|
Version,
|
|
Length,
|
|
BitConverter.ToString(Data)
|
|
);
|
|
}
|
|
}
|
|
}
|