Skip to content

Commit 2d92c00

Browse files
committed
Log more control confirmation messages for IEC 101/104 clients.
1 parent 8f4c557 commit 2d92c00

File tree

2 files changed

+96
-0
lines changed

2 files changed

+96
-0
lines changed

src/lib60870.netcore/iec101client/AsduReceiveHandler.cs

+48
Original file line numberDiff line numberDiff line change
@@ -1795,6 +1795,38 @@ private static bool AsduReceivedHandler(object parameter, ASDU asdu)
17951795
IECCmdAckQueue.Enqueue(ia);
17961796
}
17971797
break;
1798+
case TypeID.M_EI_NA_1: // 70
1799+
{
1800+
Log(conNameStr +
1801+
(asdu.IsNegative ? "Negative" : "Positive") +
1802+
" end of initialization.",
1803+
LogLevelDetailed);
1804+
}
1805+
break;
1806+
case TypeID.C_CI_NA_1: // 101
1807+
{
1808+
Log(conNameStr +
1809+
(asdu.IsNegative ? "Negative" : "Positive") +
1810+
" counter interrogation command.",
1811+
LogLevelDetailed);
1812+
}
1813+
break;
1814+
case TypeID.C_RD_NA_1: // 102
1815+
{
1816+
Log(conNameStr +
1817+
(asdu.IsNegative ? "Negative" : "Positive") +
1818+
" read command.",
1819+
LogLevelDetailed);
1820+
}
1821+
break;
1822+
case TypeID.C_CS_NA_1: // 103
1823+
{
1824+
Log(conNameStr +
1825+
(asdu.IsNegative ? "Negative" : "Positive") +
1826+
" clock synchronization command.",
1827+
LogLevelDetailed);
1828+
}
1829+
break;
17981830
case TypeID.C_TS_NA_1: // 104
17991831
{
18001832
Log(conNameStr +
@@ -1803,6 +1835,22 @@ private static bool AsduReceivedHandler(object parameter, ASDU asdu)
18031835
LogLevelDetailed);
18041836
}
18051837
break;
1838+
case TypeID.C_RP_NA_1: // 105
1839+
{
1840+
Log(conNameStr +
1841+
(asdu.IsNegative ? "Negative" : "Positive") +
1842+
" reset process command.",
1843+
LogLevelDetailed);
1844+
}
1845+
break;
1846+
case TypeID.C_CD_NA_1: // 106
1847+
{
1848+
Log(conNameStr +
1849+
(asdu.IsNegative ? "Negative" : "Positive") +
1850+
" delay acquisition command.",
1851+
LogLevelDetailed);
1852+
}
1853+
break;
18061854
case TypeID.C_TS_TA_1: // 107
18071855
{
18081856
var val = (TestCommandWithCP56Time2a)asdu.GetElement(0);

src/lib60870.netcore/iec104client/AsduReceiveHandler.cs

+48
Original file line numberDiff line numberDiff line change
@@ -1795,6 +1795,38 @@ private static bool AsduReceivedHandler(object parameter, ASDU asdu)
17951795
IECCmdAckQueue.Enqueue(ia);
17961796
}
17971797
break;
1798+
case TypeID.M_EI_NA_1: // 70
1799+
{
1800+
Log(conNameStr +
1801+
(asdu.IsNegative ? "Negative" : "Positive") +
1802+
" end of initialization.",
1803+
LogLevelDetailed);
1804+
}
1805+
break;
1806+
case TypeID.C_CI_NA_1: // 101
1807+
{
1808+
Log(conNameStr +
1809+
(asdu.IsNegative ? "Negative" : "Positive") +
1810+
" counter interrogation command.",
1811+
LogLevelDetailed);
1812+
}
1813+
break;
1814+
case TypeID.C_RD_NA_1: // 102
1815+
{
1816+
Log(conNameStr +
1817+
(asdu.IsNegative ? "Negative" : "Positive") +
1818+
" read command.",
1819+
LogLevelDetailed);
1820+
}
1821+
break;
1822+
case TypeID.C_CS_NA_1: // 103
1823+
{
1824+
Log(conNameStr +
1825+
(asdu.IsNegative ? "Negative" : "Positive") +
1826+
" clock synchronization command.",
1827+
LogLevelDetailed);
1828+
}
1829+
break;
17981830
case TypeID.C_TS_NA_1: // 104
17991831
{
18001832
Log(conNameStr +
@@ -1803,6 +1835,22 @@ private static bool AsduReceivedHandler(object parameter, ASDU asdu)
18031835
LogLevelDetailed);
18041836
}
18051837
break;
1838+
case TypeID.C_RP_NA_1: // 105
1839+
{
1840+
Log(conNameStr +
1841+
(asdu.IsNegative ? "Negative" : "Positive") +
1842+
" reset process command.",
1843+
LogLevelDetailed);
1844+
}
1845+
break;
1846+
case TypeID.C_CD_NA_1: // 106
1847+
{
1848+
Log(conNameStr +
1849+
(asdu.IsNegative ? "Negative" : "Positive") +
1850+
" delay acquisition command.",
1851+
LogLevelDetailed);
1852+
}
1853+
break;
18061854
case TypeID.C_TS_TA_1: // 107
18071855
{
18081856
var val = (TestCommandWithCP56Time2a)asdu.GetElement(0);

0 commit comments

Comments
 (0)