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

Fixed APDU handler again after discussion on BACNet-L showed the errors of my ways regarding the DeviceCommunicationControl limiting processing of APDUs.

Browse Source
This commit is contained in:
skarg
2011-01-28 03:04:09 +00:00
parent ab62b37814
commit 694d56ba1f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/apdu.c
+7 -3
View File
@@ -360,14 +360,16 @@ void apdu_retries_set(
/* When network communications are completely disabled, /* When network communications are completely disabled,
only DeviceCommunicationControl and ReinitializeDevice APDUs only DeviceCommunicationControl and ReinitializeDevice APDUs
shall be processed and no messages shall be initiated. */ shall be processed and no messages shall be initiated.
When the initiation of communications is disabled,
all APDUs shall be processed and responses returned as
required... */
static bool apdu_confirmed_dcc_disabled( static bool apdu_confirmed_dcc_disabled(
uint8_t service_choice) uint8_t service_choice)
{ {
bool status = false; bool status = false;
if (dcc_communication_disabled() || if (dcc_communication_disabled()) {
dcc_communication_initiation_disabled()) {
switch (service_choice) { switch (service_choice) {
case SERVICE_CONFIRMED_DEVICE_COMMUNICATION_CONTROL: case SERVICE_CONFIRMED_DEVICE_COMMUNICATION_CONTROL:
case SERVICE_CONFIRMED_REINITIALIZE_DEVICE: case SERVICE_CONFIRMED_REINITIALIZE_DEVICE:
@@ -394,6 +396,8 @@ static bool apdu_unconfirmed_dcc_disabled(
bool status = false; bool status = false;
if (dcc_communication_disabled()) { if (dcc_communication_disabled()) {
/* there are no Unconfirmed messages that
can be processed in this state */
status = true; status = true;
} else if (dcc_communication_initiation_disabled()) { } else if (dcc_communication_initiation_disabled()) {
/* WhoIs will be processed and I-Am initiated as response. */ /* WhoIs will be processed and I-Am initiated as response. */