dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed MS/TP FSM TS filter that was removed for zero-config permiscuous feature. (#803)

Browse Source
This commit is contained in:
Steve Karg
2024-10-10 15:50:57 -05:00
committed by GitHub
parent bcb82841fb
commit 52a2cd437a
2 changed files with 111 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/stm32f4xx/CMakeLists.txt
+24
View File
@@ -51,8 +51,11 @@ set(CMAKE_OBJCOPY arm-none-eabi-objcopy)
set(CMAKE_OBJDUMP arm-none-eabi-objdump)
set(CMAKE_SIZE arm-none-eabi-size)
set(CMAKE_NM arm-none-eabi-nm)
set(CMAKE_GDB gdb-multiarch)
set(CMAKE_OPENOCD openocd)
set(CMAKE_CSTACK "${CMAKE_SOURCE_DIR}/../../tools/check-stack-usage/checkStackUsage.py")
set(CMAKE_MEMAP "${CMAKE_SOURCE_DIR}/../../tools/memap/memap.py")
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
set(EXECUTABLE ${PROJECT_NAME}.elf)
@@ -322,3 +325,24 @@ add_custom_target(memmap
COMMENT "Print file and library memory usage by size"
COMMAND ${CMAKE_MEMAP} -t GCC_ARM ${PROJECT_NAME}.map
)
# Run OpenOCD with ST Link to debug
add_custom_target(openocd
DEPENDS ${EXECUTABLE}
COMMENT "OpenOCD GDB Server via ST Link"
COMMAND ${CMAKE_OPENOCD} -f interface/stlink.cfg -f target/stm32f4x.cfg
)
add_custom_target(gdb
DEPENDS ${EXECUTABLE}
COMMENT "GDB connection to GDB Server via ST Link"
COMMAND ${CMAKE_GDB} -q ${EXECUTABLE} -ex "target extended-remote localhost:3333"
)
# Run OpenOCD with ST Link to flash
set(OPENOCD_FLASH_CMD "program ${EXECUTABLE} verify reset exit")
add_custom_target(flash
DEPENDS ${EXECUTABLE}
COMMENT "OpenOCD flash and verify using elf."
COMMAND ${CMAKE_OPENOCD} -f interface/stlink.cfg -f target/stm32f4x.cfg -c ${OPENOCD_FLASH_CMD}
)
src/bacnet/datalink/mstp.c
+33 -23
View File
@@ -623,6 +623,29 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
(mstp_port->This_Station + 1) % (mstp_port->Nmax_master + 1);
next_next_station =
(mstp_port->Next_Station + 1) % (mstp_port->Nmax_master + 1);
/* The zero config receive state machine does not
filter DestinationAddress for This_Station or Broadcast.
Check before running FSM: */
if (mstp_port->ReceivedValidFrame == true) {
if ((mstp_port->master_state == MSTP_MASTER_STATE_INITIALIZE) &&
(mstp_port->ZeroConfigEnabled)) {
/* zero config initialization processes all frames */
} else {
if ((mstp_port->DestinationAddress == mstp_port->This_Station) ||
(mstp_port->DestinationAddress == MSTP_BROADCAST_ADDRESS)) {
/* process as-is */
} else {
if ((mstp_port->ZeroConfigEnabled) &&
(mstp_port->SourceAddress == mstp_port->This_Station)) {
/* DuplicateNode */
mstp_port->Zero_Config_State = MSTP_ZERO_CONFIG_STATE_INIT;
mstp_port->master_state = MSTP_MASTER_STATE_INITIALIZE;
}
/* ignore the frame */
mstp_port->ReceivedValidFrame = false;
}
}
}
switch (mstp_port->master_state) {
case MSTP_MASTER_STATE_INITIALIZE:
if (mstp_port->ZeroConfigEnabled) {
@@ -674,16 +697,6 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
mstp_port->DataLength, mstp_port->FrameCount,
mstp_port->SilenceTimer((void *)mstp_port),
mstptext_frame_type((unsigned)mstp_port->FrameType));
if (mstp_port->SourceAddress == mstp_port->This_Station) {
/* DuplicateNode */
if (mstp_port->ZeroConfigEnabled) {
/* we are a zero config node - start over */
mstp_port->Zero_Config_State =
MSTP_ZERO_CONFIG_STATE_INIT;
mstp_port->master_state = MSTP_MASTER_STATE_INITIALIZE;
}
mstp_port->ReceivedValidFrame = false;
} else {
/* destined for me! */
switch (mstp_port->FrameType) {
case FRAME_TYPE_TOKEN:
@@ -696,8 +709,7 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
mstp_port->ReceivedValidFrame = false;
mstp_port->FrameCount = 0;
mstp_port->SoleMaster = false;
mstp_port->master_state =
MSTP_MASTER_STATE_USE_TOKEN;
mstp_port->master_state = MSTP_MASTER_STATE_USE_TOKEN;
transition_now = true;
break;
case FRAME_TYPE_POLL_FOR_MASTER:
@@ -706,8 +718,7 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
if (mstp_port->DestinationAddress ==
mstp_port->This_Station) {
MSTP_Create_And_Send_Frame(
mstp_port,
FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER,
mstp_port, FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER,
mstp_port->SourceAddress,
mstp_port->This_Station, NULL, 0);
}
@@ -719,14 +730,15 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
(npdu_confirmed_service(
mstp_port->InputBuffer,
mstp_port->DataLength))) {
/* BTL test: verifies that the IUT will quietly
discard any Confirmed-Request-PDU, whose
destination address is a multicast or
/* BTL test: verifies that the IUT will
quietly discard any Confirmed-Request-PDU,
whose destination address is a multicast or
broadcast address, received from the
network layer. */
} else {
/* indicate successful reception to the higher
* layers */
/* ForUs */
/* indicate successful reception
to the higher layers */
(void)MSTP_Put_Receive(mstp_port);
}
break;
@@ -746,15 +758,13 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
case FRAME_TYPE_TEST_REQUEST:
MSTP_Create_And_Send_Frame(
mstp_port, FRAME_TYPE_TEST_RESPONSE,
mstp_port->SourceAddress,
mstp_port->This_Station, mstp_port->InputBuffer,
mstp_port->DataLength);
mstp_port->SourceAddress, mstp_port->This_Station,
mstp_port->InputBuffer, mstp_port->DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
break;
}
}
/* For DATA_EXPECTING_REPLY, we will keep the Rx Frame for
reference, and the flag will be cleared in the next state */
if (mstp_port->master_state !=