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

Feature/apdu null length returned (#285)

Browse Source 
* Add APDU as NULL to get BACnet type lengths.

* Fix bacapp copy test to succeed

* fix BACnet REAL and DOUBLE decode

* Add unit test for NULL APDU encoding for length

* Add unit tests for bacapp context

* refactor host-n-port to hostnport.c module

* fix BVLC decoder

* additional unit testing for bacapp

* include bacdevobjpropref module in builds

* simplify bacapp snprintf to be able to return length

* adjust compiler for variable-length arrays

* fix bug found by scan-build

Authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-06-01 15:42:50 -05:00
committed by GitHub
parent 810bfefb34
commit f147283293
76 changed files with 3474 additions and 2791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacreal.c
+78 -62
View File
@@ -56,20 +56,24 @@ int decode_real(uint8_t *apdu, float *real_value)
float real_value;
} my_data;
/* NOTE: assumes the compiler stores float as IEEE-754 float */
if (big_endian()) {
my_data.byte[0] = apdu[0];
my_data.byte[1] = apdu[1];
my_data.byte[2] = apdu[2];
my_data.byte[3] = apdu[3];
} else {
my_data.byte[0] = apdu[3];
my_data.byte[1] = apdu[2];
my_data.byte[2] = apdu[1];
my_data.byte[3] = apdu[0];
if (apdu) {
/* NOTE: assumes the compiler stores float as IEEE-754 float */
if (big_endian()) {
my_data.byte[0] = apdu[0];
my_data.byte[1] = apdu[1];
my_data.byte[2] = apdu[2];
my_data.byte[3] = apdu[3];
} else {
my_data.byte[0] = apdu[3];
my_data.byte[1] = apdu[2];
my_data.byte[2] = apdu[1];
my_data.byte[3] = apdu[0];
}
if (real_value) {
*real_value = my_data.real_value;
}
}
*real_value = my_data.real_value;
return 4;
}
@@ -77,7 +81,9 @@ int decode_real(uint8_t *apdu, float *real_value)
int decode_real_safe(uint8_t *apdu, uint32_t len_value, float *real_value)
{
if (len_value != 4) {
*real_value = 0.0f;
if (real_value) {
*real_value = 0.0f;
}
return (int)len_value;
} else {
return decode_real(apdu, real_value);
@@ -95,16 +101,18 @@ int encode_bacnet_real(float value, uint8_t *apdu)
/* NOTE: assumes the compiler stores float as IEEE-754 float */
my_data.real_value = value;
if (big_endian()) {
apdu[0] = my_data.byte[0];
apdu[1] = my_data.byte[1];
apdu[2] = my_data.byte[2];
apdu[3] = my_data.byte[3];
} else {
apdu[0] = my_data.byte[3];
apdu[1] = my_data.byte[2];
apdu[2] = my_data.byte[1];
apdu[3] = my_data.byte[0];
if (apdu) {
if (big_endian()) {
apdu[0] = my_data.byte[0];
apdu[1] = my_data.byte[1];
apdu[2] = my_data.byte[2];
apdu[3] = my_data.byte[3];
} else {
apdu[0] = my_data.byte[3];
apdu[1] = my_data.byte[2];
apdu[2] = my_data.byte[1];
apdu[3] = my_data.byte[0];
}
}
return 4;
@@ -121,27 +129,31 @@ int decode_double(uint8_t *apdu, double *double_value)
double double_value;
} my_data;
/* NOTE: assumes the compiler stores float as IEEE-754 float */
if (big_endian()) {
my_data.byte[0] = apdu[0];
my_data.byte[1] = apdu[1];
my_data.byte[2] = apdu[2];
my_data.byte[3] = apdu[3];
my_data.byte[4] = apdu[4];
my_data.byte[5] = apdu[5];
my_data.byte[6] = apdu[6];
my_data.byte[7] = apdu[7];
} else {
my_data.byte[0] = apdu[7];
my_data.byte[1] = apdu[6];
my_data.byte[2] = apdu[5];
my_data.byte[3] = apdu[4];
my_data.byte[4] = apdu[3];
my_data.byte[5] = apdu[2];
my_data.byte[6] = apdu[1];
my_data.byte[7] = apdu[0];
if (apdu) {
/* NOTE: assumes the compiler stores float as IEEE-754 float */
if (big_endian()) {
my_data.byte[0] = apdu[0];
my_data.byte[1] = apdu[1];
my_data.byte[2] = apdu[2];
my_data.byte[3] = apdu[3];
my_data.byte[4] = apdu[4];
my_data.byte[5] = apdu[5];
my_data.byte[6] = apdu[6];
my_data.byte[7] = apdu[7];
} else {
my_data.byte[0] = apdu[7];
my_data.byte[1] = apdu[6];
my_data.byte[2] = apdu[5];
my_data.byte[3] = apdu[4];
my_data.byte[4] = apdu[3];
my_data.byte[5] = apdu[2];
my_data.byte[6] = apdu[1];
my_data.byte[7] = apdu[0];
}
if (double_value) {
*double_value = my_data.double_value;
}
}
*double_value = my_data.double_value;
return 8;
}
@@ -149,7 +161,9 @@ int decode_double(uint8_t *apdu, double *double_value)
int decode_double_safe(uint8_t *apdu, uint32_t len_value, double *double_value)
{
if (len_value != 8) {
*double_value = 0.0;
if (double_value) {
*double_value = 0.0;
}
return (int)len_value;
} else {
return decode_double(apdu, double_value);
@@ -167,24 +181,26 @@ int encode_bacnet_double(double value, uint8_t *apdu)
/* NOTE: assumes the compiler stores float as IEEE-754 float */
my_data.double_value = value;
if (big_endian()) {
apdu[0] = my_data.byte[0];
apdu[1] = my_data.byte[1];
apdu[2] = my_data.byte[2];
apdu[3] = my_data.byte[3];
apdu[4] = my_data.byte[4];
apdu[5] = my_data.byte[5];
apdu[6] = my_data.byte[6];
apdu[7] = my_data.byte[7];
} else {
apdu[0] = my_data.byte[7];
apdu[1] = my_data.byte[6];
apdu[2] = my_data.byte[5];
apdu[3] = my_data.byte[4];
apdu[4] = my_data.byte[3];
apdu[5] = my_data.byte[2];
apdu[6] = my_data.byte[1];
apdu[7] = my_data.byte[0];
if (apdu) {
if (big_endian()) {
apdu[0] = my_data.byte[0];
apdu[1] = my_data.byte[1];
apdu[2] = my_data.byte[2];
apdu[3] = my_data.byte[3];
apdu[4] = my_data.byte[4];
apdu[5] = my_data.byte[5];
apdu[6] = my_data.byte[6];
apdu[7] = my_data.byte[7];
} else {
apdu[0] = my_data.byte[7];
apdu[1] = my_data.byte[6];
apdu[2] = my_data.byte[5];
apdu[3] = my_data.byte[4];
apdu[4] = my_data.byte[3];
apdu[5] = my_data.byte[2];
apdu[6] = my_data.byte[1];
apdu[7] = my_data.byte[0];
}
}
return 8;