From a8ad8f4d5cc1cc033097e50cfeb72daaf086fc85 Mon Sep 17 00:00:00 2001 From: skarg Date: Fri, 12 Aug 2016 20:45:08 +0000 Subject: [PATCH] Changed error code from SERVICE/NO_SPACE_FOR_OBJECT to ABORT/SEGMENTATION_NOT_SUPPORTED to be consistent with the BACnet standard. Thank you, lo pe! [bugs:#41] --- bacnet-stack/demo/object/access_credential.c | 18 +++++++++--------- bacnet-stack/demo/object/access_door.c | 6 +++--- bacnet-stack/demo/object/access_point.c | 6 +++--- bacnet-stack/demo/object/access_rights.c | 12 ++++++------ bacnet-stack/demo/object/access_user.c | 6 +++--- bacnet-stack/demo/object/access_zone.c | 12 ++++++------ bacnet-stack/demo/object/ai.c | 6 +++--- bacnet-stack/demo/object/ao.c | 6 +++--- bacnet-stack/demo/object/av.c | 6 +++--- bacnet-stack/demo/object/bo.c | 6 +++--- bacnet-stack/demo/object/bv.c | 6 +++--- bacnet-stack/demo/object/channel.c | 12 ++++++------ .../demo/object/credential_data_input.c | 6 +++--- bacnet-stack/demo/object/lc.c | 12 ++++++------ bacnet-stack/demo/object/lo.c | 6 +++--- bacnet-stack/demo/object/ms-input.c | 6 +++--- bacnet-stack/demo/object/mso.c | 6 +++--- bacnet-stack/demo/object/msv.c | 6 +++--- bacnet-stack/ports/at91sam7s/av.c | 6 +++--- bacnet-stack/ports/bdk-atxx4-mstp/av.c | 6 +++--- bacnet-stack/ports/bdk-atxx4-mstp/bo.c | 6 +++--- bacnet-stack/ports/pic18f6720/av.c | 12 ++++++------ bacnet-stack/ports/pic18f97j60/av.c | 12 ++++++------ bacnet-stack/ports/rx62n/bo.c | 6 +++--- bacnet-stack/ports/stm32f10x/bo.c | 6 +++--- bacnet-stack/src/proplist.c | 18 +++++++++--------- 26 files changed, 108 insertions(+), 108 deletions(-) diff --git a/bacnet-stack/demo/object/access_credential.c b/bacnet-stack/demo/object/access_credential.c index 3b378eca..735eb944 100644 --- a/bacnet-stack/demo/object/access_credential.c +++ b/bacnet-stack/demo/object/access_credential.c @@ -234,9 +234,9 @@ int Access_Credential_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -254,9 +254,9 @@ int Access_Credential_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -305,9 +305,9 @@ int Access_Credential_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/access_door.c b/bacnet-stack/demo/object/access_door.c index dd244d4f..7fd00239 100644 --- a/bacnet-stack/demo/object/access_door.c +++ b/bacnet-stack/demo/object/access_door.c @@ -395,9 +395,9 @@ int Access_Door_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/access_point.c b/bacnet-stack/demo/object/access_point.c index dbcd9ac8..6ee44867 100644 --- a/bacnet-stack/demo/object/access_point.c +++ b/bacnet-stack/demo/object/access_point.c @@ -311,9 +311,9 @@ int Access_Point_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/access_rights.c b/bacnet-stack/demo/object/access_rights.c index 563da43c..702dd49a 100644 --- a/bacnet-stack/demo/object/access_rights.c +++ b/bacnet-stack/demo/object/access_rights.c @@ -230,9 +230,9 @@ int Access_Rights_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -265,9 +265,9 @@ int Access_Rights_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/access_user.c b/bacnet-stack/demo/object/access_user.c index 9bd3452c..1550273b 100644 --- a/bacnet-stack/demo/object/access_user.c +++ b/bacnet-stack/demo/object/access_user.c @@ -221,9 +221,9 @@ int Access_User_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/access_zone.c b/bacnet-stack/demo/object/access_zone.c index e3350e46..552a6937 100644 --- a/bacnet-stack/demo/object/access_zone.c +++ b/bacnet-stack/demo/object/access_zone.c @@ -264,9 +264,9 @@ int Access_Zone_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -279,9 +279,9 @@ int Access_Zone_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/ai.c b/bacnet-stack/demo/object/ai.c index 8b09e55d..bb3b5cdd 100644 --- a/bacnet-stack/demo/object/ai.c +++ b/bacnet-stack/demo/object/ai.c @@ -590,9 +590,9 @@ int Analog_Input_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/ao.c b/bacnet-stack/demo/object/ao.c index c48e68c6..8ffe89a8 100644 --- a/bacnet-stack/demo/object/ao.c +++ b/bacnet-stack/demo/object/ao.c @@ -377,9 +377,9 @@ int Analog_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/av.c b/bacnet-stack/demo/object/av.c index 91de2925..84cb89d5 100644 --- a/bacnet-stack/demo/object/av.c +++ b/bacnet-stack/demo/object/av.c @@ -422,9 +422,9 @@ int Analog_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c index d1fba341..3e842b68 100644 --- a/bacnet-stack/demo/object/bo.c +++ b/bacnet-stack/demo/object/bo.c @@ -297,9 +297,9 @@ int Binary_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/bv.c b/bacnet-stack/demo/object/bv.c index 36445c89..d91deabc 100644 --- a/bacnet-stack/demo/object/bv.c +++ b/bacnet-stack/demo/object/bv.c @@ -301,9 +301,9 @@ int Binary_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/channel.c b/bacnet-stack/demo/object/channel.c index e4f4b87a..5cdbfe6b 100644 --- a/bacnet-stack/demo/object/channel.c +++ b/bacnet-stack/demo/object/channel.c @@ -1448,9 +1448,9 @@ int Channel_Read_Property(BACNET_READ_PROPERTY_DATA * rpdata) if ((apdu_len + len) < MAX_APDU) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -1493,9 +1493,9 @@ int Channel_Read_Property(BACNET_READ_PROPERTY_DATA * rpdata) if ((apdu_len + len) < MAX_APDU) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/credential_data_input.c b/bacnet-stack/demo/object/credential_data_input.c index 87ad705d..10fc32b7 100644 --- a/bacnet-stack/demo/object/credential_data_input.c +++ b/bacnet-stack/demo/object/credential_data_input.c @@ -266,9 +266,9 @@ int Credential_Data_Input_Read_Property( if (apdu_len + len < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/lc.c b/bacnet-stack/demo/object/lc.c index 80f57d85..2db44515 100644 --- a/bacnet-stack/demo/object/lc.c +++ b/bacnet-stack/demo/object/lc.c @@ -848,9 +848,9 @@ int Load_Control_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -886,9 +886,9 @@ int Load_Control_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/lo.c b/bacnet-stack/demo/object/lo.c index 72de12ce..17092063 100644 --- a/bacnet-stack/demo/object/lo.c +++ b/bacnet-stack/demo/object/lo.c @@ -1081,9 +1081,9 @@ int Lighting_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/ms-input.c b/bacnet-stack/demo/object/ms-input.c index 2239a73c..0ddbc88c 100644 --- a/bacnet-stack/demo/object/ms-input.c +++ b/bacnet-stack/demo/object/ms-input.c @@ -575,9 +575,9 @@ int Multistate_Input_Read_Property( if ((apdu_len + len) < MAX_APDU) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/mso.c b/bacnet-stack/demo/object/mso.c index 630b16d1..7065b293 100644 --- a/bacnet-stack/demo/object/mso.c +++ b/bacnet-stack/demo/object/mso.c @@ -311,9 +311,9 @@ int Multistate_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/demo/object/msv.c b/bacnet-stack/demo/object/msv.c index c6b0f0e1..25cd2589 100644 --- a/bacnet-stack/demo/object/msv.c +++ b/bacnet-stack/demo/object/msv.c @@ -443,9 +443,9 @@ int Multistate_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/ports/at91sam7s/av.c b/bacnet-stack/ports/at91sam7s/av.c index a0c647ca..87240ae3 100644 --- a/bacnet-stack/ports/at91sam7s/av.c +++ b/bacnet-stack/ports/at91sam7s/av.c @@ -269,9 +269,9 @@ int Analog_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/av.c b/bacnet-stack/ports/bdk-atxx4-mstp/av.c index f7ccd659..2b956c80 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/av.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/av.c @@ -278,9 +278,9 @@ int Analog_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/bo.c b/bacnet-stack/ports/bdk-atxx4-mstp/bo.c index 38e61913..edfcc85d 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/bo.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/bo.c @@ -340,9 +340,9 @@ int Binary_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/ports/pic18f6720/av.c b/bacnet-stack/ports/pic18f6720/av.c index c44057bb..71885270 100644 --- a/bacnet-stack/ports/pic18f6720/av.c +++ b/bacnet-stack/ports/pic18f6720/av.c @@ -235,9 +235,9 @@ int Analog_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - *error_class = ERROR_CLASS_SERVICES; - *error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = -1; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -256,7 +256,7 @@ int Analog_Value_Read_Property( } else { *error_class = ERROR_CLASS_PROPERTY; *error_code = ERROR_CODE_INVALID_ARRAY_INDEX; - apdu_len = -1; + apdu_len = BACNET_STATUS_ERROR; } } @@ -269,7 +269,7 @@ int Analog_Value_Read_Property( default: rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; - apdu_len = -1; + apdu_len = BACNET_STATUS_ERROR; break; } /* only array properties can have array options */ @@ -280,7 +280,7 @@ int Analog_Value_Read_Property( (rpdata->array_index != BACNET_ARRAY_ALL)) { rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; - apdu_len = -1; + apdu_len = BACNET_STATUS_ERROR; } return apdu_len; diff --git a/bacnet-stack/ports/pic18f97j60/av.c b/bacnet-stack/ports/pic18f97j60/av.c index 96790671..c9850d89 100644 --- a/bacnet-stack/ports/pic18f97j60/av.c +++ b/bacnet-stack/ports/pic18f97j60/av.c @@ -235,9 +235,9 @@ int Analog_Value_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - *error_class = ERROR_CLASS_SERVICES; - *error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = -1; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -256,7 +256,7 @@ int Analog_Value_Read_Property( } else { *error_class = ERROR_CLASS_PROPERTY; *error_code = ERROR_CODE_INVALID_ARRAY_INDEX; - apdu_len = -1; + apdu_len = BACNET_STATUS_ERROR; } } @@ -269,7 +269,7 @@ int Analog_Value_Read_Property( default: rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; - apdu_len = -1; + apdu_len = BACNET_STATUS_ERROR; break; } /* only array properties can have array options */ @@ -280,7 +280,7 @@ int Analog_Value_Read_Property( (rpdata->array_index != BACNET_ARRAY_ALL)) { rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; - apdu_len = -1; + apdu_len = BACNET_STATUS_ERROR; } return apdu_len; diff --git a/bacnet-stack/ports/rx62n/bo.c b/bacnet-stack/ports/rx62n/bo.c index b6157c82..96d60ae0 100644 --- a/bacnet-stack/ports/rx62n/bo.c +++ b/bacnet-stack/ports/rx62n/bo.c @@ -312,9 +312,9 @@ int Binary_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/ports/stm32f10x/bo.c b/bacnet-stack/ports/stm32f10x/bo.c index 04a4b22c..f4596df5 100644 --- a/bacnet-stack/ports/stm32f10x/bo.c +++ b/bacnet-stack/ports/stm32f10x/bo.c @@ -318,9 +318,9 @@ int Binary_Output_Read_Property( if ((apdu_len + len) < MAX_APDU) apdu_len += len; else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } diff --git a/bacnet-stack/src/proplist.c b/bacnet-stack/src/proplist.c index 8223588c..2b9afca2 100644 --- a/bacnet-stack/src/proplist.c +++ b/bacnet-stack/src/proplist.c @@ -1213,9 +1213,9 @@ int property_list_encode( if ((apdu_len + len) < max_apdu_len) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -1229,9 +1229,9 @@ int property_list_encode( if ((apdu_len + len) < max_apdu_len) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } } @@ -1245,9 +1245,9 @@ int property_list_encode( if ((apdu_len + len) < max_apdu_len) { apdu_len += len; } else { - rpdata->error_class = ERROR_CLASS_SERVICES; - rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; - apdu_len = BACNET_STATUS_ERROR; + rpdata->error_code = + ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; + apdu_len = BACNET_STATUS_ABORT; break; } }