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

Corrected the MS/TP TEST REQUEST state such that it now returns the data from the request per BACnet 9.3.5 which says "The data, if present, shall be that which was present in the initiating Test_Request." Thank you to Martin Labbe!

Browse Source
This commit is contained in:
skarg
2008-03-09 13:52:48 +00:00
parent 17d307dd57
commit eb7196668c
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/at91sam7s/dlmstp.c
+2 -1
View File
@@ -759,7 +759,8 @@ static bool MSTP_Master_Node_FSM(
break;
case FRAME_TYPE_TEST_REQUEST:
MSTP_Send_Frame(FRAME_TYPE_TEST_RESPONSE,
SourceAddress, This_Station, NULL, 0);
SourceAddress, This_Station,
&InputBuffer[0], DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
bacnet-stack/ports/atmega168/dlmstp.c
+2 -1
View File
@@ -673,7 +673,8 @@ static bool MSTP_Master_Node_FSM(
break;
case FRAME_TYPE_TEST_REQUEST:
MSTP_Send_Frame(FRAME_TYPE_TEST_RESPONSE,
SourceAddress, This_Station, NULL, 0);
SourceAddress, This_Station,
&InputBuffer[0], DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
bacnet-stack/ports/dos/dlmstp.c
+2 -1
View File
@@ -758,7 +758,8 @@ static bool MSTP_Master_Node_FSM(
break;
case FRAME_TYPE_TEST_REQUEST:
MSTP_Send_Frame(FRAME_TYPE_TEST_RESPONSE,
SourceAddress, This_Station, NULL, 0);
SourceAddress, This_Station,
&InputBuffer[0], DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
bacnet-stack/ports/pic18f6720/mstp.c
+3 -1
View File
@@ -676,7 +676,9 @@ bool MSTP_Master_Node_FSM(
MSTP_Create_And_Send_Frame(mstp_port,
FRAME_TYPE_TEST_RESPONSE,
mstp_port->SourceAddress,
mstp_port->This_Station, NULL, 0);
mstp_port->This_Station,
(uint8_t *) & mstp_port->InputBuffer[0],
mstp_port->DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
bacnet-stack/ports/rtos32/mstp.c
+3 -1
View File
@@ -819,7 +819,9 @@ bool MSTP_Master_Node_FSM(
MSTP_Create_And_Send_Frame(mstp_port,
FRAME_TYPE_TEST_RESPONSE,
mstp_port->SourceAddress,
mstp_port->This_Station, NULL, 0);
mstp_port->This_Station,
(uint8_t *) & mstp_port->InputBuffer[0],
mstp_port->DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
bacnet-stack/src/mstp.c
+1 -1
View File
@@ -632,7 +632,7 @@ MSTP_Put_Receive(mstp_port); break; case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
mstp_port->master_state =
MSTP_MASTER_STATE_ANSWER_DATA_REQUEST;}
break; case FRAME_TYPE_TEST_REQUEST:
MSTP_Create_And_Send_Frame(mstp_port, FRAME_TYPE_TEST_RESPONSE, mstp_port->SourceAddress, mstp_port->This_Station, NULL, 0); break; case FRAME_TYPE_TEST_RESPONSE:
MSTP_Create_And_Send_Frame(mstp_port, FRAME_TYPE_TEST_RESPONSE, mstp_port->SourceAddress, mstp_port->This_Station, mstp_port->InputBuffer, mstp_port->DataLength); break; case FRAME_TYPE_TEST_RESPONSE:
default:
break;}
}