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

Indented.

Browse Source
This commit is contained in:
skarg
2008-11-24 12:48:09 +00:00
parent fdfd6a9f9f
commit d1a1c1c8a6
71 changed files with 6873 additions and 6754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_cov.c
+2 -2
View File
@@ -426,8 +426,8 @@ static bool cov_subscribe(
switch (cov_data->monitoredObjectIdentifier.type) {
case OBJECT_BINARY_INPUT:
if (Binary_Input_Valid_Instance(
cov_data->monitoredObjectIdentifier.instance)) {
if (Binary_Input_Valid_Instance(cov_data->
monitoredObjectIdentifier.instance)) {
status =
cov_list_subscribe(src, cov_data, error_class, error_code);
} else {
bacnet-stack/demo/handler/h_rpm.c
+3 -4
View File
@@ -244,8 +244,7 @@ int RPM_Encode_Property(
rpm_ack_encode_apdu_object_property_error(&Temp_Buf[0],
error_class, error_code);
len =
memcopy(&apdu[0], &Temp_Buf[0], offset + apdu_len, len,
max_apdu);
memcopy(&apdu[0], &Temp_Buf[0], offset + apdu_len, len, max_apdu);
if (!len) {
return 0;
}
@@ -344,8 +343,8 @@ void handler_read_property_multiple(
rpm_ack_encode_apdu_object_begin(&Temp_Buf[0], object_type,
object_instance);
copy_len =
memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0],
apdu_len, len, sizeof(Handler_Transmit_Buffer));
memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], apdu_len,
len, sizeof(Handler_Transmit_Buffer));
if (!copy_len) {
apdu_len =
abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
bacnet-stack/demo/handler/h_rpm_a.c
+11 -14
View File
@@ -60,9 +60,8 @@ static int rpm_ack_decode_service_request(
rpm_object = read_access_data;
old_rpm_object = rpm_object;
while (rpm_object && apdu_len) {
len = rpm_ack_decode_object_id(
apdu, apdu_len,
&rpm_object->object_type,
len =
rpm_ack_decode_object_id(apdu, apdu_len, &rpm_object->object_type,
&rpm_object->object_instance);
if (len <= 0) {
old_rpm_object->next = NULL;
@@ -76,9 +75,8 @@ static int rpm_ack_decode_service_request(
rpm_object->listOfProperties = rpm_property;
old_rpm_property = rpm_property;
while (rpm_property && apdu_len) {
len = rpm_ack_decode_object_property(
apdu,
apdu_len,
len =
rpm_ack_decode_object_property(apdu, apdu_len,
&rpm_property->propertyIdentifier,
&rpm_property->propertyArrayIndex);
if (len <= 0) {
@@ -99,10 +97,8 @@ static int rpm_ack_decode_service_request(
rpm_property->value = value;
old_value = value;
while (value && (apdu_len > 0)) {
len = bacapp_decode_application_data(
apdu,
apdu_len,
value);
len =
bacapp_decode_application_data(apdu, apdu_len, value);
decoded_len += len;
apdu_len -= len;
apdu += len;
@@ -113,7 +109,8 @@ static int rpm_ack_decode_service_request(
break;
} else {
old_value = value;
value = calloc(1, sizeof(BACNET_APPLICATION_DATA_VALUE));
value =
calloc(1, sizeof(BACNET_APPLICATION_DATA_VALUE));
old_value->next = value;
}
}
@@ -174,8 +171,7 @@ static void PrintReadPropertyMultipleData(
}
#endif
while (value) {
bacapp_print_value(stdout,
value,
bacapp_print_value(stdout, value,
listOfProperties->propertyIdentifier);
#if PRINT_ENABLED
if (value->next) {
@@ -217,7 +213,8 @@ void handler_read_property_multiple_ack(
rpm_data = calloc(1, sizeof(BACNET_READ_ACCESS_DATA));
if (rpm_data) {
len = rpm_ack_decode_service_request(service_request, service_len,
len =
rpm_ack_decode_service_request(service_request, service_len,
rpm_data);
}
#if 1
bacnet-stack/demo/handler/h_ucov.c
+8 -12
View File
@@ -57,25 +57,21 @@ void handler_ucov_notification(
fprintf(stderr, "UCOV: Received Notification!\n");
#endif
/* decode the service request only */
len = cov_notify_decode_service_request(
service_request, service_len, &cov_data);
len =
cov_notify_decode_service_request(service_request, service_len,
&cov_data);
#if PRINT_ENABLED
if (len > 0) {
fprintf(stderr, "UCOV: PID=%u ",
cov_data.subscriberProcessIdentifier);
fprintf(stderr, "instance=%u ",
cov_data.initiatingDeviceIdentifier);
fprintf(stderr, "UCOV: PID=%u ", cov_data.subscriberProcessIdentifier);
fprintf(stderr, "instance=%u ", cov_data.initiatingDeviceIdentifier);
fprintf(stderr, "%s %u ",
bactext_object_type_name(
cov_data.monitoredObjectIdentifier.type),
bactext_object_type_name(cov_data.monitoredObjectIdentifier.type),
cov_data.monitoredObjectIdentifier.instance);
fprintf(stderr, "time remaining=%u seconds ",
cov_data.timeRemaining);
fprintf(stderr, "time remaining=%u seconds ", cov_data.timeRemaining);
fprintf(stderr, "%s ",
bactext_property_name(property_value.propertyIdentifier));
if (property_value.propertyArrayIndex != BACNET_ARRAY_ALL) {
fprintf(stderr, "%u ",
property_value.propertyArrayIndex);
fprintf(stderr, "%u ", property_value.propertyArrayIndex);
}
fprintf(stderr, "\n");
} else {
bacnet-stack/demo/handler/s_iam.c
+1 -2
View File
@@ -88,7 +88,6 @@ void Send_I_Am(
#if PRINT_ENABLED
if (bytes_sent <= 0)
fprintf(stderr, "Failed to Send I-Am Reply (%s)!\n",
strerror(errno));
fprintf(stderr, "Failed to Send I-Am Reply (%s)!\n", strerror(errno));
#endif
}
bacnet-stack/demo/handler/s_router.c
+5 -11
View File
@@ -69,8 +69,7 @@ void Send_Who_Is_Router_To_Network(
BACNET_NPDU_DATA npdu_data;
npdu_encode_npdu_network(&npdu_data,
NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK,
false,
NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK, false,
MESSAGE_PRIORITY_NORMAL);
/* fixme: should dnet/dlen/dadr be set in NPDU? */
pdu_len =
@@ -112,8 +111,7 @@ void Send_I_Am_Router_To_Network(
unsigned index = 0;
npdu_encode_npdu_network(&npdu_data,
NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK,
false,
NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK, false,
MESSAGE_PRIORITY_NORMAL);
pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], NULL, NULL, &npdu_data);
@@ -157,9 +155,7 @@ void Send_Initialize_Routing_Table(
BACNET_ROUTER_PORT *router_port;
unsigned i = 0; /* counter */
npdu_encode_npdu_network(&npdu_data,
NETWORK_MESSAGE_INIT_RT_TABLE,
true,
npdu_encode_npdu_network(&npdu_data, NETWORK_MESSAGE_INIT_RT_TABLE, true,
MESSAGE_PRIORITY_NORMAL);
pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], NULL, NULL, &npdu_data);
@@ -208,10 +204,8 @@ void Send_Initialize_Routing_Table_Ack(
int bytes_sent = 0;
BACNET_NPDU_DATA npdu_data;
npdu_encode_npdu_network(&npdu_data,
NETWORK_MESSAGE_INIT_RT_TABLE_ACK,
false,
MESSAGE_PRIORITY_NORMAL);
npdu_encode_npdu_network(&npdu_data, NETWORK_MESSAGE_INIT_RT_TABLE_ACK,
false, MESSAGE_PRIORITY_NORMAL);
pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], NULL, NULL, &npdu_data);
/* encode the optional DNET list portion of the packet */
bacnet-stack/demo/handler/s_rpm.c
+4 -9
View File
@@ -72,14 +72,10 @@ uint8_t Send_Read_Property_Multiple_Request(
/* encode the NPDU portion of the packet */
datalink_get_my_address(&my_address);
npdu_encode_npdu_data(&npdu_data, true, MESSAGE_PRIORITY_NORMAL);
pdu_len =
npdu_encode_pdu(&pdu[0], &dest, &my_address,
&npdu_data);
pdu_len = npdu_encode_pdu(&pdu[0], &dest, &my_address, &npdu_data);
/* encode the APDU portion of the packet */
len = rpm_encode_apdu(
&pdu[pdu_len],
max_pdu - pdu_len,
invoke_id,
len =
rpm_encode_apdu(&pdu[pdu_len], max_pdu - pdu_len, invoke_id,
read_access_data);
if (len <= 0) {
return 0;
@@ -94,8 +90,7 @@ uint8_t Send_Read_Property_Multiple_Request(
tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest,
&npdu_data, &pdu[0], (uint16_t) pdu_len);
bytes_sent =
datalink_send_pdu(&dest, &npdu_data,
&pdu[0], pdu_len);
datalink_send_pdu(&dest, &npdu_data, &pdu[0], pdu_len);
#if PRINT_ENABLED
if (bytes_sent <= 0)
fprintf(stderr,
bacnet-stack/demo/initrouter/main.c
+7 -14
View File
@@ -325,7 +325,8 @@ static void address_parse(BACNET_ADDRESS * dst,
dst->mac_len = 6;
for (index = 0; index < 4; index++) {
dst->mac[index] = mac[index];
} encode_unsigned16(&dst->mac[4],
}
encode_unsigned16(&dst->mac[4],
port);
} else {
count =
@@ -364,22 +365,14 @@ int main(int argc, char *argv[]) {
filename_remove_path(argv[0]));
return 0;
}
if ((
argc > 1) && (
strcmp(argv[1],
"--help") == 0)) {
if ((argc > 1) && (strcmp(argv[1], "--help") == 0)) {
printf("Send BACnet Initialize-Routing-Table message to a network\r\n"
"and wait for responses. Displays their network information.\r\n"
"\r\n"
"address:\r\n"
"\r\n" "address:\r\n"
"MAC address in xx:xx:xx:xx:xx:xx format or IP x.x.x.x:port\r\n"
"DNET ID Len Info:\r\n"
"Port-info data:\r\n"
" DNET:\r\n"
" Destination network number 0-65534\r\n"
" ID:\r\n"
" Port Identifier number 0-255\r\n"
" Info:\r\n"
"DNET ID Len Info:\r\n" "Port-info data:\r\n" " DNET:\r\n"
" Destination network number 0-65534\r\n" " ID:\r\n"
" Port Identifier number 0-255\r\n" " Info:\r\n"
" Octet string of data, up to 255 octets\r\n"
"To query the complete routing table, do not include any port-info.\r\n"
"To query using Initialize-Routing-Table message to 192.168.0.18:\r\n"
bacnet-stack/demo/readpropm/main.c
+18 -22
View File
@@ -216,8 +216,7 @@ static void Init_DataLink(
#endif
}
void cleanup(void)
{
void cleanup(void) {
BACNET_READ_ACCESS_DATA *rpm_object;
BACNET_READ_ACCESS_DATA *old_rpm_object;
BACNET_PROPERTY_REFERENCE *rpm_property;
@@ -231,8 +230,7 @@ void cleanup(void)
old_rpm_property = rpm_property;
rpm_property = rpm_property->next;
free(old_rpm_property);
}
old_rpm_object = rpm_object;
} old_rpm_object = rpm_object;
rpm_object = rpm_object->next;
free(old_rpm_object);
}
@@ -251,14 +249,16 @@ int main(int argc, char *argv[]) {
time_t timeout_seconds = 0;
uint8_t invoke_id = 0;
bool found = false;
uint8_t buffer[MAX_PDU] = {0};
uint8_t buffer[MAX_PDU] = {
0};
BACNET_READ_ACCESS_DATA *rpm_object;
BACNET_PROPERTY_REFERENCE *rpm_property;
if (argc < 5) {
printf("Usage: %s device-instance object-type object-instance "
"property index [object-type ...]\r\n", filename_remove_path(argv[0]));
"property index [object-type ...]\r\n",
filename_remove_path(argv[0]));
if ((argc > 1) && (strcmp(argv[1], "--help") == 0)) {
printf("device-instance:\r\n"
"BACnet Device Object Instance number that you are\r\n"
@@ -285,8 +285,7 @@ int main(int argc, char *argv[]) {
"If the property is an array, individual elements can\r\n"
"be read. If this parameter is missing and the property\r\n"
"is an array, the entire array will be read.\r\n"
"\r\nExample:\r\n"
"If you want read the ALL property in\r\n"
"\r\nExample:\r\n" "If you want read the ALL property in\r\n"
"Device object 123, you would use the following command:\r\n"
"%s 123 8 123 8 -1\r\n"
"If you want read the OPTIONAL property in\r\n"
@@ -294,10 +293,8 @@ int main(int argc, char *argv[]) {
"%s 123 8 123 80 -1\r\n"
"If you want read the REQUIRED property in\r\n"
"Device object 123, you would use the following command:\r\n"
"%s 123 8 123 105 -1\r\n",
filename_remove_path(argv[0]),
filename_remove_path(argv[0]),
filename_remove_path(argv[0]));
"%s 123 8 123 105 -1\r\n", filename_remove_path(argv[0]),
filename_remove_path(argv[0]), filename_remove_path(argv[0]));
}
return 0;
}
@@ -315,8 +312,7 @@ int main(int argc, char *argv[]) {
arg_sets = 0;
while (rpm_object) {
tag_value_arg = 2 + (arg_sets * 4);
rpm_object->object_type =
strtol(argv[tag_value_arg], NULL, 0);
rpm_object->object_type = strtol(argv[tag_value_arg], NULL, 0);
tag_value_arg++;
args_remaining--;
if (args_remaining <= 0) {
@@ -328,8 +324,7 @@ int main(int argc, char *argv[]) {
rpm_object->object_type, MAX_BACNET_OBJECT_TYPE + 1);
return 1;
}
rpm_object->object_instance =
strtol(argv[tag_value_arg], NULL, 0);
rpm_object->object_instance = strtol(argv[tag_value_arg], NULL, 0);
tag_value_arg++;
args_remaining--;
if (args_remaining <= 0) {
@@ -350,12 +345,14 @@ int main(int argc, char *argv[]) {
tag_value_arg++;
args_remaining--;
if (args_remaining <= 0) {
fprintf(stderr, "Error: not enough object property quads.\r\n");
fprintf(stderr,
"Error: not enough object property quads.\r\n");
return 1;
}
if (rpm_property->propertyIdentifier > MAX_BACNET_PROPERTY_ID) {
fprintf(stderr, "property=%u - it must be less than %u\r\n",
rpm_property->propertyIdentifier, MAX_BACNET_PROPERTY_ID + 1);
rpm_property->propertyIdentifier,
MAX_BACNET_PROPERTY_ID + 1);
return 1;
}
rpm_property->propertyArrayIndex =
@@ -413,10 +410,9 @@ int main(int argc, char *argv[]) {
&Target_Address);
if (found) {
if (invoke_id == 0) {
invoke_id = Send_Read_Property_Multiple_Request(
&buffer[0],
sizeof(buffer),
Target_Device_Object_Instance,
invoke_id =
Send_Read_Property_Multiple_Request(&buffer[0],
sizeof(buffer), Target_Device_Object_Instance,
Read_Access_Data);
} else if (tsm_invoke_id_free(invoke_id))
break;
bacnet-stack/demo/ucov/main.c
+2 -2
View File
@@ -212,8 +212,8 @@ int main(int argc, char *argv[]) {
filename_remove_path(argv[0]), filename_remove_path(argv[0]));
return 0;
}
/* decode the command line parameters */
cov_data.subscriberProcessIdentifier = strtol(argv[1], NULL, 0);
/* decode the command line parameters */ cov_data.
subscriberProcessIdentifier = strtol(argv[1], NULL, 0);
cov_data.initiatingDeviceIdentifier = strtol(argv[2], NULL, 0);
cov_data.monitoredObjectIdentifier.type = strtol(argv[3], NULL, 0);
cov_data.monitoredObjectIdentifier.instance = strtol(argv[4], NULL, 0);
bacnet-stack/include/bacdevobjpropref.h
-3
View File
@@ -69,7 +69,4 @@ int bacapp_decode_context_device_obj_property_ref(
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif //_BAC_DEV_PROP_REF_H_
bacnet-stack/include/bacpropstates.h
-2
View File
@@ -99,6 +99,4 @@ int bacapp_encode_property_state(
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif // _BAC_PROP_STATES_H_
bacnet-stack/include/debug.h
+1 -4
View File
@@ -50,14 +50,11 @@ void debug_printf(
#else
static void debug_printf(
const char *format,
...)
{
...) {
format = format;
}
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif
bacnet-stack/include/timestamp.h
-2
View File
@@ -73,6 +73,4 @@ int bacapp_decode_context_timestamp(
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif
bacnet-stack/lib/main.h
+2 -1
View File
@@ -13,6 +13,7 @@
#define DLL_EXPORT __declspec(dllimport)
#endif
void DLL_EXPORT SomeFunction(const LPCSTR sometext);
void DLL_EXPORT SomeFunction(
const LPCSTR sometext);
#endif // __MAIN_H__
bacnet-stack/ports/atmega8/device.c
-1
View File
@@ -328,4 +328,3 @@ int Device_Encode_Property_APDU(
return apdu_len;
}
bacnet-stack/ports/atmega8/dlmstp.c
+18 -13
View File
@@ -105,8 +105,7 @@ static struct mstp_flag_t {
} MSTP_Flag;
/* data passed to receive handler */
struct mstp_packet_info_t
{
struct mstp_packet_info_t {
/* A Boolean flag set to TRUE by the Receive State Machine */
/* if a valid frame is received. */
unsigned valid_frame:1;
@@ -286,7 +285,9 @@ static void MSTP_Send_Frame(
#if 0
/* return true if the packet is good. */
/* note: buffer should include the CRC as the last byte */
static bool crc_header_good(uint8_t *buffer, uint8_t len)
static bool crc_header_good(
uint8_t * buffer,
uint8_t len)
{
uint8_t i; /* loop counter */
uint8_t crc8 = 0xFF; /* loop counter */
@@ -299,7 +300,8 @@ static bool crc_header_good(uint8_t *buffer, uint8_t len)
}
static void mstp_receive_handler(void)
static void mstp_receive_handler(
void)
{
uint8_t data_register = 0; /* data from UART */
@@ -327,13 +329,15 @@ static void mstp_receive_handler(void)
return;
}
if (DataLength == 0) {
MSTP_Receive_Packet.header[MSTP_Receive_Packet.index] = data_register;
MSTP_Receive_Packet.header[MSTP_Receive_Packet.index] =
data_register;
if (MSTP_Receive_Packet.index == 5) {
if (crc_header_good(MSTP_Receive_Packet.header, 6)) {
FrameType = MSTP_Receive_Packet.header[0];
DestinationAddress = MSTP_Receive_Packet.header[1];
SourceAddress = MSTP_Receive_Packet.header[2];
DataLength = (MSTP_Receive_Packet.header[3] * 256) +
DataLength =
(MSTP_Receive_Packet.header[3] * 256) +
MSTP_Receive_Packet.header[4];
if (DataLength == 0) {
MSTP_Receive_Packet.valid_frame = true;
@@ -347,7 +351,8 @@ static void mstp_receive_handler(void)
}
}
} else {
MSTP_Receive_Packet.buffer[MSTP_Receive_Packet.index] = data_register;
MSTP_Receive_Packet.buffer[MSTP_Receive_Packet.index] =
data_register;
if (packet_info->index == packet_info->len) {
/* PDU length ended */
packet_info->ready = true;
@@ -361,7 +366,8 @@ static void mstp_receive_handler(void)
MSTP_Receive_Packet.index++;
if (packet_info->ready) {
/* validate the CRC */
if (!lrc_packet_good(packet_info->buffer,packet_info->len+1)) {
if (!lrc_packet_good(packet_info->buffer,
packet_info->len + 1)) {
packet_info->ready = false;
}
/* pull off the CRC */
@@ -616,9 +622,8 @@ static void MSTP_Slave_Node_FSM(
MSTP_Flag.ReceivePacketPending = true;
break;
case FRAME_TYPE_TEST_REQUEST:
MSTP_Send_Frame(FRAME_TYPE_TEST_RESPONSE,
SourceAddress, This_Station, &InputBuffer[0],
DataLength);
MSTP_Send_Frame(FRAME_TYPE_TEST_RESPONSE, SourceAddress,
This_Station, &InputBuffer[0], DataLength);
break;
case FRAME_TYPE_TEST_RESPONSE:
default:
@@ -634,8 +639,8 @@ static void MSTP_Slave_Node_FSM(
/* and enter the IDLE state to wait for the next frame. */
/* Note: optimized such that we are never a client */
MSTP_Send_Frame(FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY,
TransmitPacketDest, This_Station,
(uint8_t *) & TransmitPacket[0], TransmitPacketLen);
TransmitPacketDest, This_Station, (uint8_t *) & TransmitPacket[0],
TransmitPacketLen);
MSTP_Flag.TransmitPacketPending = false;
MSTP_Flag.ReceivePacketPending = false;
}
bacnet-stack/ports/atmega8/timer.c
+2 -1
View File
@@ -98,7 +98,8 @@ bool timer_silence_elapsed(
return status;
}
void timer_silence_reset(void)
void timer_silence_reset(
void)
{
uint8_t sreg;
bacnet-stack/ports/win32/main.c
+5 -6
View File
@@ -294,14 +294,13 @@ static void Init_DataLink(
#endif
}
int main(
int argc,
char *argv[])
{
BACNET_ADDRESS src = { 0 }; /* address where message came from */
int main(int argc, char *argv[]) {
BACNET_ADDRESS src = {
0}; /* address where message came from */
uint16_t pdu_len = 0;
unsigned timeout = 100; /* milliseconds */
BACNET_ADDRESS my_address, broadcast_address;
BACNET_ADDRESS my_address,
broadcast_address;
(void) argc;
(void) argv;
bacnet-stack/src/bacdcode.c
+57 -79
View File
@@ -523,15 +523,11 @@ int decode_context_boolean2(
if (decode_is_context_tag_with_length(&apdu[len], tag_number, &len)) {
if (apdu[len]) {
*boolean_value = true;
}
else
{
} else {
*boolean_value = false;
}
len++;
}
else
{
} else {
len = -1;
}
return len;
@@ -642,12 +638,10 @@ int decode_context_bitstring(
int len = 0;
if (decode_is_context_tag(&apdu[len], tag_number)) {
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
len += decode_bitstring(&apdu[len], len_value, bit_string);
}
else
{
} else {
len = -1;
}
return len;
@@ -671,7 +665,8 @@ int encode_bitstring(
} else {
used_bytes = bitstring_bytes_used(bit_string);
remaining_used_bits =
(uint8_t)(bitstring_bits_used(bit_string) - ((used_bytes - 1) * 8));
(uint8_t) (bitstring_bits_used(bit_string) - ((used_bytes -
1) * 8));
/* number of unused bits in the subsequent final octet */
apdu[len++] = (uint8_t) (8 - remaining_used_bits);
for (i = 0; i < used_bytes; i++) {
@@ -728,7 +723,8 @@ int decode_object_id(
int len = 0;
len = decode_unsigned32(apdu, &value);
*object_type = (uint16_t)(((value >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT));
*object_type =
(uint16_t) (((value >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT));
*instance = (value & BACNET_MAX_INSTANCE);
return len;
@@ -744,9 +740,7 @@ int decode_context_object_id(
if (decode_is_context_tag_with_length(&apdu[len], tag_number, &len)) {
len += decode_object_id(&apdu[len], object_type, instance);
}
else
{
} else {
len = -1;
}
return len;
@@ -912,19 +906,16 @@ int decode_context_octet_string(
bool status = false;
uint32_t len_value = 0;
if (decode_is_context_tag(&apdu[len], tag_number))
{
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
if (decode_is_context_tag(&apdu[len], tag_number)) {
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
status = octetstring_init(octet_string, &apdu[len], len_value);
if (status) {
len += len_value;
}
}
else
{
} else {
len = -1;
}
@@ -1022,20 +1013,17 @@ int decode_context_character_string(
bool status = false;
uint32_t len_value = 0;
if (decode_is_context_tag(&apdu[len], tag_number))
{
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
if (decode_is_context_tag(&apdu[len], tag_number)) {
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
status =
characterstring_init(char_string, apdu[len], (char *) &apdu[len+1],
len_value - 1);
characterstring_init(char_string, apdu[len],
(char *) &apdu[len + 1], len_value - 1);
if (status) {
len += len_value;
}
}
else
{
} else {
len = -1;
}
@@ -1085,12 +1073,10 @@ int decode_context_unsigned(
int len = 0;
if (decode_is_context_tag(&apdu[len], tag_number)) {
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
len += decode_unsigned(&apdu[len], len_value, value);
}
else
{
} else {
len = -1;
}
return len;
@@ -1186,12 +1172,10 @@ int decode_context_enumerated(
uint32_t len_value;
if (decode_is_context_tag(&apdu[len], tag_value)) {
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
len += decode_enumerated(&apdu[len], len_value, value);
}
else
{
} else {
len = -1;
}
return len;
@@ -1285,12 +1269,10 @@ int decode_context_signed(
int len = 0;
if (decode_is_context_tag(&apdu[len], tag_number)) {
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
len += decode_signed(&apdu[len], len_value, value);
}
else
{
} else {
len = -1;
}
return len;
@@ -1504,13 +1486,10 @@ int decode_application_time(
uint8_t tag_number;
decode_tag_number(&apdu[len], &tag_number);
if ( tag_number == BACNET_APPLICATION_TAG_TIME )
{
if (tag_number == BACNET_APPLICATION_TAG_TIME) {
len++;
len += decode_bacnet_time(&apdu[len], btime);
}
else
{
} else {
len = -1;
}
return len;
@@ -1526,9 +1505,7 @@ int decode_context_bacnet_time(
if (decode_is_context_tag_with_length(&apdu[len], tag_number, &len)) {
len += decode_bacnet_time(&apdu[len], btime);
}
else
{
} else {
len = -1;
}
return len;
@@ -1551,14 +1528,10 @@ int encode_bacnet_date(
/* allow 2 digit years */
if (bdate->year >= 1900) {
apdu[0] = (uint8_t) (bdate->year - 1900);
}
else if ( bdate->year < 0x100 )
{
} else if (bdate->year < 0x100) {
apdu[0] = (uint8_t) bdate->year;
}
else
{
} else {
/*
** Don't try and guess what the user meant here. Just fail
*/
@@ -1633,13 +1606,10 @@ int decode_application_date(
uint8_t tag_number;
decode_tag_number(&apdu[len], &tag_number);
if ( tag_number == BACNET_APPLICATION_TAG_DATE )
{
if (tag_number == BACNET_APPLICATION_TAG_DATE) {
len++;
len += decode_date(&apdu[len], bdate);
}
else
{
} else {
len = -1;
}
return len;
@@ -1654,9 +1624,7 @@ int decode_context_date(
if (decode_is_context_tag_with_length(&apdu[len], tag_number, &len)) {
len += decode_date(&apdu[len], bdate);
}
else
{
} else {
len = -1;
}
return len;
@@ -2293,7 +2261,8 @@ void testBACDCodeBitString(
}
}
void testUnsignedContextDecodes(Test * pTest)
void testUnsignedContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2347,7 +2316,8 @@ void testUnsignedContextDecodes(Test * pTest)
ct_test(pTest, in == out);
}
void testSignedContextDecodes(Test * pTest)
void testSignedContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2401,7 +2371,8 @@ void testSignedContextDecodes(Test * pTest)
ct_test(pTest, in == out);
}
void testEnumeratedContextDecodes(Test * pTest)
void testEnumeratedContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2455,7 +2426,8 @@ void testEnumeratedContextDecodes(Test * pTest)
ct_test(pTest, in == out);
}
void testFloatContextDecodes(Test * pTest)
void testFloatContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2485,7 +2457,8 @@ void testFloatContextDecodes(Test * pTest)
ct_test(pTest, in == out);
}
void testObjectIDContextDecodes(Test * pTest)
void testObjectIDContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2513,7 +2486,8 @@ void testObjectIDContextDecodes(Test * pTest)
}
void testCharacterStringContextDecodes(Test * pTest)
void testCharacterStringContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2536,7 +2510,8 @@ void testCharacterStringContextDecodes(Test * pTest)
ct_test(pTest, strcmp(in.value, out.value) == 0);
}
void testBitStringContextDecodes(Test * pTest)
void testBitStringContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2565,7 +2540,8 @@ void testBitStringContextDecodes(Test * pTest)
}
void testOctetStringContextDecodes(Test * pTest)
void testOctetStringContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2589,7 +2565,8 @@ void testOctetStringContextDecodes(Test * pTest)
ct_test(pTest, octetstring_value_same(&in, &out));
}
void testTimeContextDecodes(Test * pTest)
void testTimeContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
@@ -2616,7 +2593,8 @@ void testTimeContextDecodes(Test * pTest)
ct_test(pTest, in.sec == out.sec);
}
void testDateContextDecodes(Test * pTest)
void testDateContextDecodes(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
int inLen;
bacnet-stack/src/bacdevobjpropref.c
+42 -50
View File
@@ -67,24 +67,23 @@ int bacapp_encode_device_obj_property_ref(
int len;
int apdu_len = 0;
len = encode_context_object_id(&apdu[apdu_len], 0,
value->objectIdentifier.type,
value->objectIdentifier.instance);
len =
encode_context_object_id(&apdu[apdu_len], 0,
value->objectIdentifier.type, value->objectIdentifier.instance);
apdu_len += len;
len = encode_context_enumerated(&apdu[apdu_len], 1,
len =
encode_context_enumerated(&apdu[apdu_len], 1,
value->propertyIdentifier);
apdu_len += len;
if ( value->arrayIndex > 0 )
{
len = encode_context_unsigned(&apdu[apdu_len], 2,
value->arrayIndex);
if (value->arrayIndex > 0) {
len = encode_context_unsigned(&apdu[apdu_len], 2, value->arrayIndex);
apdu_len += len;
}
len = encode_context_object_id(&apdu[apdu_len], 3,
value->deviceIndentifier.type,
value->deviceIndentifier.instance);
len =
encode_context_object_id(&apdu[apdu_len], 3,
value->deviceIndentifier.type, value->deviceIndentifier.instance);
apdu_len += len;
return apdu_len;
@@ -97,47 +96,41 @@ int bacapp_decode_device_obj_property_ref(
int len;
int apdu_len = 0;
if ( -1 == ( len = decode_context_object_id(&apdu[apdu_len], 0,
if (-1 == (len =
decode_context_object_id(&apdu[apdu_len], 0,
&value->objectIdentifier.type,
&value->objectIdentifier.instance)) )
{
&value->objectIdentifier.instance))) {
return -1;
}
apdu_len += len;
if ( -1 == ( len = decode_context_enumerated(&apdu[apdu_len], 1,
&value->propertyIdentifier)))
{
if (-1 == (len =
decode_context_enumerated(&apdu[apdu_len], 1,
&value->propertyIdentifier))) {
return -1;
}
apdu_len += len;
if ( decode_is_context_tag(&apdu[apdu_len], 2 ))
{
if ( -1 == ( len = decode_context_unsigned(&apdu[apdu_len], 2,
&value->arrayIndex)))
{
if (decode_is_context_tag(&apdu[apdu_len], 2)) {
if (-1 == (len =
decode_context_unsigned(&apdu[apdu_len], 2,
&value->arrayIndex))) {
return -1;
}
apdu_len += len;
}
else
{
} else {
value->arrayIndex = 0;
}
if ( decode_is_context_tag(&apdu[apdu_len], 3 ))
{
if ( -1 == ( len = decode_context_object_id(&apdu[apdu_len], 3,
if (decode_is_context_tag(&apdu[apdu_len], 3)) {
if (-1 == (len =
decode_context_object_id(&apdu[apdu_len], 3,
&value->deviceIndentifier.type,
&value->deviceIndentifier.instance)) )
{
&value->deviceIndentifier.instance))) {
return -1;
}
apdu_len += len;
}
else
{
} else {
value->deviceIndentifier.instance = 0;
value->deviceIndentifier.type = 0;
}
@@ -155,27 +148,20 @@ int bacapp_decode_context_device_obj_property_ref(
if (decode_is_opening_tag_number(&apdu[len], tag_number)) {
len++;
section_length = bacapp_decode_device_obj_property_ref(
&apdu[len], value);
section_length =
bacapp_decode_device_obj_property_ref(&apdu[len], value);
if ( section_length == -1 )
{
if (section_length == -1) {
len = -1;
}
else
{
} else {
len += section_length;
if (decode_is_closing_tag_number(&apdu[len], tag_number)) {
len++;
}
else
{
} else {
len = -1;
}
}
}
else
{
} else {
len = -1;
}
return len;
@@ -208,16 +194,22 @@ void testDevIdPropRef(
ct_test(pTest, outLen == inLen);
ct_test(pTest, inData.objectIdentifier.instance == outData.objectIdentifier.instance);
ct_test(pTest, inData.objectIdentifier.type == outData.objectIdentifier.type);
ct_test(pTest,
inData.objectIdentifier.instance == outData.objectIdentifier.instance);
ct_test(pTest,
inData.objectIdentifier.type == outData.objectIdentifier.type);
ct_test(pTest, inData.propertyIdentifier == outData.propertyIdentifier);
ct_test(pTest, inData.arrayIndex == outData.arrayIndex);
ct_test(pTest, inData.deviceIndentifier.instance == outData.deviceIndentifier.instance);
ct_test(pTest, inData.deviceIndentifier.type == outData.deviceIndentifier.type);
ct_test(pTest,
inData.deviceIndentifier.instance ==
outData.deviceIndentifier.instance);
ct_test(pTest,
inData.deviceIndentifier.type == outData.deviceIndentifier.type);
}
#ifdef TEST_DEV_ID_PROP_REF
int main(
bacnet-stack/src/bacpropstates.c
+88 -59
View File
@@ -53,105 +53,116 @@ int bacapp_decode_property_state(
decode_tag_number_and_value(&apdu[len], (uint8_t *) & value->tag,
&len_value_type);
if ( -1 == section_length )
{
if (-1 == section_length) {
return -1;
}
len += section_length;
switch(value->tag)
{
switch (value->tag) {
case BOOLEAN_VALUE:
value->state.booleanValue = decode_boolean(len_value_type);
break;
case BINARY_VALUE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.binaryValue)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.binaryValue))) {
return -1;
}
break;
case EVENT_TYPE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.eventType)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.eventType))) {
return -1;
}
break;
case POLARITY:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.polarity)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.polarity))) {
return -1;
}
break;
case PROGRAM_CHANGE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.programChange)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.programChange))) {
return -1;
}
break;
case PROGRAM_STATE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.programState)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.programState))) {
return -1;
}
break;
case REASON_FOR_HALT:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.programError)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.programError))) {
return -1;
}
break;
case RELIABILITY:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.reliability)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.reliability))) {
return -1;
}
break;
case STATE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.state)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.state))) {
return -1;
}
break;
case SYSTEM_STATUS:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.systemStatus)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.systemStatus))) {
return -1;
}
break;
case UNITS:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.units)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.units))) {
return -1;
}
break;
case UNSIGNED_VALUE:
if ( -1 == ( section_length = decode_unsigned(&apdu[len], len_value_type, &value->state.unsignedValue)))
{
if (-1 == (section_length =
decode_unsigned(&apdu[len], len_value_type,
&value->state.unsignedValue))) {
return -1;
}
break;
case LIFE_SAFETY_MODE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.lifeSafetyMode)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.lifeSafetyMode))) {
return -1;
}
break;
case LIFE_SAFETY_STATE:
if ( -1 == ( section_length = decode_enumerated(&apdu[len], len_value_type, &value->state.lifeSafetyState)))
{
if (-1 == (section_length =
decode_enumerated(&apdu[len], len_value_type,
&value->state.lifeSafetyState))) {
return -1;
}
break;
@@ -174,27 +185,19 @@ int bacapp_decode_context_property_state(
if (decode_is_opening_tag_number(&apdu[len], tag_number)) {
len++;
section_length = bacapp_decode_property_state(
&apdu[len], value);
section_length = bacapp_decode_property_state(&apdu[len], value);
if ( section_length == -1 )
{
if (section_length == -1) {
len = -1;
}
else
{
} else {
len += section_length;
if (decode_is_closing_tag_number(&apdu[len], tag_number)) {
len++;
}
else
{
} else {
len = -1;
}
}
}
else
{
} else {
len = -1;
}
return len;
@@ -206,62 +209,88 @@ int bacapp_encode_property_state(
{
int len = 0; /* length of each encoding */
if (value && apdu) {
switch(value->tag)
{
switch (value->tag) {
case BOOLEAN_VALUE:
len = encode_context_boolean(&apdu[0], 0, value->state.booleanValue);
len =
encode_context_boolean(&apdu[0], 0,
value->state.booleanValue);
break;
case BINARY_VALUE:
len = encode_context_enumerated(&apdu[0], 1, value->state.binaryValue);
len =
encode_context_enumerated(&apdu[0], 1,
value->state.binaryValue);
break;
case EVENT_TYPE:
len = encode_context_enumerated(&apdu[0], 2, value->state.eventType);
len =
encode_context_enumerated(&apdu[0], 2,
value->state.eventType);
break;
case POLARITY:
len = encode_context_enumerated(&apdu[0], 3, value->state.polarity);
len =
encode_context_enumerated(&apdu[0], 3,
value->state.polarity);
break;
case PROGRAM_CHANGE:
len = encode_context_enumerated(&apdu[0], 4, value->state.programChange);
len =
encode_context_enumerated(&apdu[0], 4,
value->state.programChange);
break;
case PROGRAM_STATE:
len = encode_context_enumerated(&apdu[0], 5, value->state.programState);
len =
encode_context_enumerated(&apdu[0], 5,
value->state.programState);
break;
case REASON_FOR_HALT:
len = encode_context_enumerated(&apdu[0], 6, value->state.programError);
len =
encode_context_enumerated(&apdu[0], 6,
value->state.programError);
break;
case RELIABILITY:
len = encode_context_enumerated(&apdu[0], 7, value->state.reliability);
len =
encode_context_enumerated(&apdu[0], 7,
value->state.reliability);
break;
case STATE:
len = encode_context_enumerated(&apdu[0], 8, value->state.state);
len =
encode_context_enumerated(&apdu[0], 8, value->state.state);
break;
case SYSTEM_STATUS:
len = encode_context_enumerated(&apdu[0], 9, value->state.systemStatus);
len =
encode_context_enumerated(&apdu[0], 9,
value->state.systemStatus);
break;
case UNITS:
len = encode_context_enumerated(&apdu[0], 10, value->state.units);
len =
encode_context_enumerated(&apdu[0], 10,
value->state.units);
break;
case UNSIGNED_VALUE:
len = encode_context_unsigned(&apdu[0], 11, value->state.unsignedValue);
len =
encode_context_unsigned(&apdu[0], 11,
value->state.unsignedValue);
break;
case LIFE_SAFETY_MODE:
len = encode_context_enumerated(&apdu[0], 12, value->state.lifeSafetyMode);
len =
encode_context_enumerated(&apdu[0], 12,
value->state.lifeSafetyMode);
break;
case LIFE_SAFETY_STATE:
len = encode_context_enumerated(&apdu[0], 13, value->state.lifeSafetyState);
len =
encode_context_enumerated(&apdu[0], 13,
value->state.lifeSafetyState);
break;
default:
bacnet-stack/src/bacreal.c
+4 -5
View File
@@ -85,16 +85,15 @@ int decode_context_real(
int len = 0;
if (decode_is_context_tag(&apdu[len], tag_number)) {
len += decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len +=
decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
len += decode_real(&apdu[len], real_value);
}
else
{
} else {
len = -1;
}
return len;
}
/* from clause 20.2.6 Encoding of a Real Number Value */
/* returns the number of apdu bytes consumed */
int encode_bacnet_real(
bacnet-stack/src/datetime.c
+10 -20
View File
@@ -439,8 +439,7 @@ int bacapp_encode_context_datetime(
int apdu_len = 0;
if ( apdu && value )
{
if (apdu && value) {
len = encode_opening_tag(&apdu[apdu_len], tag_number);
apdu_len += len;
@@ -463,14 +462,14 @@ int bacapp_decode_datetime(
int len = 0;
int section_len;
if ( -1 == ( section_len = decode_application_date(&apdu[len], &value->date) ) )
{
if (-1 == (section_len =
decode_application_date(&apdu[len], &value->date))) {
return -1;
}
len += section_len;
if ( -1 == ( section_len = decode_application_time(&apdu[len], &value->time) ) )
{
if (-1 == (section_len =
decode_application_time(&apdu[len], &value->time))) {
return -1;
}
@@ -489,27 +488,19 @@ int bacapp_decode_context_datetime(
if (decode_is_opening_tag_number(&apdu[apdu_len], tag_number)) {
apdu_len++;
}
else
{
} else {
return -1;
}
if ( -1 == (len = bacapp_decode_datetime(&apdu[apdu_len], value)))
{
if (-1 == (len = bacapp_decode_datetime(&apdu[apdu_len], value))) {
return -1;
}
else
{
} else {
apdu_len += len;
}
if (decode_is_closing_tag_number(&apdu[apdu_len], tag_number))
{
if (decode_is_closing_tag_number(&apdu[apdu_len], tag_number)) {
apdu_len++;
}
else
{
} else {
return -1;
}
return apdu_len;
@@ -909,4 +900,3 @@ int main(
#endif /* TEST_DATE_TIME */
#endif /* TEST */
bacnet-stack/src/event.c
+516 -369
View File
File diff suppressed because it is too large Load Diff
bacnet-stack/src/memcopy.c
+7 -8
View File
@@ -40,8 +40,8 @@ size_t memcopy(
void *src,
size_t offset, /* where in dest to put the data */
size_t len, /* amount of data to copy */
size_t max) /* total size of destination */
{
size_t max)
{ /* total size of destination */
size_t i;
size_t copy_len = 0;
char *s1, *s2;
@@ -73,15 +73,14 @@ void test_memcopy(
char big_buffer[480] = "";
size_t len = 0;
len = memcopy(&buffer[0], &data1[0], 0,
sizeof(data1), sizeof(buffer));
len = memcopy(&buffer[0], &data1[0], 0, sizeof(data1), sizeof(buffer));
ct_test(pTest, len == sizeof(data1));
ct_test(pTest, memcmp(&buffer[0], &data1[0], len) == 0);
len = memcopy(&buffer[0], &data2[0], len,
sizeof(data2), sizeof(buffer));
len = memcopy(&buffer[0], &data2[0], len, sizeof(data2), sizeof(buffer));
ct_test(pTest, len == sizeof(data2));
len = memcopy(&buffer[0], &big_buffer[0], 1,
sizeof(big_buffer), sizeof(buffer));
len =
memcopy(&buffer[0], &big_buffer[0], 1, sizeof(big_buffer),
sizeof(buffer));
ct_test(pTest, len == 0);
}
bacnet-stack/src/rpm.c
+8 -5
View File
@@ -126,8 +126,8 @@ int rpm_encode_apdu(
apdu_len += len;
rpm_object = read_access_data;
while (rpm_object) {
len = encode_context_object_id(&apdu_temp[0], 0,
rpm_object->object_type,
len =
encode_context_object_id(&apdu_temp[0], 0, rpm_object->object_type,
rpm_object->object_instance);
len = memcopy(&apdu[0], &apdu_temp[0], apdu_len, len, max_apdu);
if (len == 0) {
@@ -144,7 +144,8 @@ int rpm_encode_apdu(
rpm_property = rpm_object->listOfProperties;
while (rpm_property) {
/* stuff as many properties into it as APDU length will allow */
len = encode_context_enumerated(&apdu_temp[0], 0,
len =
encode_context_enumerated(&apdu_temp[0], 0,
rpm_property->propertyIdentifier);
len = memcopy(&apdu[0], &apdu_temp[0], apdu_len, len, max_apdu);
if (len == 0) {
@@ -153,9 +154,11 @@ int rpm_encode_apdu(
apdu_len += len;
/* optional array index */
if (rpm_property->propertyArrayIndex != BACNET_ARRAY_ALL) {
len = encode_context_unsigned(&apdu_temp[0], 1,
len =
encode_context_unsigned(&apdu_temp[0], 1,
rpm_property->propertyArrayIndex);
len = memcopy(&apdu[0], &apdu_temp[0], apdu_len, len, max_apdu);
len =
memcopy(&apdu[0], &apdu_temp[0], apdu_len, len, max_apdu);
if (len == 0) {
return 0;
}
bacnet-stack/src/sbuf.c
+2 -2
View File
@@ -43,8 +43,8 @@
void sbuf_init(
STATIC_BUFFER * b, /* static buffer structure */
char *data, /* data block */
unsigned size) /* actual size, in bytes, of the data block or array of data */
{
unsigned size)
{ /* actual size, in bytes, of the data block or array of data */
if (b) {
b->data = data;
b->size = size;
bacnet-stack/src/timestamp.c
+64 -46
View File
@@ -47,18 +47,23 @@ int bacapp_encode_context_timestamp(
len = encode_opening_tag(&apdu[apdu_len], tag_number);
apdu_len += len;
switch(value->tag)
{
switch (value->tag) {
case TIME_STAMP_TIME:
len = encode_context_time(&apdu[apdu_len], 0, &value->value.time);
len =
encode_context_time(&apdu[apdu_len], 0,
&value->value.time);
break;
case TIME_STAMP_SEQUENCE:
len = encode_context_unsigned(&apdu[apdu_len], 1, value->value.sequenceNum);
len =
encode_context_unsigned(&apdu[apdu_len], 1,
value->value.sequenceNum);
break;
case TIME_STAMP_DATETIME:
len = bacapp_encode_context_datetime(&apdu[apdu_len], 2, &value->value.dateTime);
len =
bacapp_encode_context_datetime(&apdu[apdu_len], 2,
&value->value.dateTime);
break;
default:
@@ -92,49 +97,42 @@ int bacapp_decode_context_timestamp(
decode_tag_number_and_value(&apdu[len], &value->tag,
&len_value_type);
if ( -1 == section_len )
{
if (-1 == section_len) {
return -1;
}
switch( value->tag )
{
switch (value->tag) {
case TIME_STAMP_TIME:
if ( (section_len = decode_context_bacnet_time(&apdu[len], TIME_STAMP_TIME, &value->value.time)) == -1 )
{
if ((section_len =
decode_context_bacnet_time(&apdu[len], TIME_STAMP_TIME,
&value->value.time)) == -1) {
return -1;
}
else
{
} else {
len += section_len;
}
break;
case TIME_STAMP_SEQUENCE:
if ( (section_len = decode_context_unsigned(&apdu[len], TIME_STAMP_SEQUENCE, &sequenceNum)) == -1 )
{
if ((section_len =
decode_context_unsigned(&apdu[len],
TIME_STAMP_SEQUENCE, &sequenceNum)) == -1) {
return -1;
}
else
{
if ( sequenceNum <= 0xffff )
{
} else {
if (sequenceNum <= 0xffff) {
len += section_len;
value->value.sequenceNum = (uint16_t) sequenceNum;
}
else
{
} else {
return -1;
}
}
break;
case TIME_STAMP_DATETIME:
if ( (section_len = bacapp_decode_context_datetime(&apdu[len], TIME_STAMP_DATETIME, &value->value.dateTime)) == -1 )
{
if ((section_len =
bacapp_decode_context_datetime(&apdu[len],
TIME_STAMP_DATETIME,
&value->value.dateTime)) == -1) {
return -1;
}
else
{
} else {
len += section_len;
}
break;
@@ -144,9 +142,7 @@ int bacapp_decode_context_timestamp(
}
if (decode_is_closing_tag_number(&apdu[len], tag_number)) {
len++;
}
else
{
} else {
return -1;
}
}
@@ -180,7 +176,9 @@ void testTimestampSequence(
ct_test(pTest, inLen == outLen);
ct_test(pTest, testTimestampIn.tag == testTimestampOut.tag);
ct_test(pTest, testTimestampIn.value.sequenceNum == testTimestampOut.value.sequenceNum);
ct_test(pTest,
testTimestampIn.value.sequenceNum ==
testTimestampOut.value.sequenceNum);
}
void testTimestampTime(
@@ -206,10 +204,15 @@ void testTimestampTime(
ct_test(pTest, inLen == outLen);
ct_test(pTest, testTimestampIn.tag == testTimestampOut.tag);
ct_test(pTest, testTimestampIn.value.time.hour == testTimestampOut.value.time.hour);
ct_test(pTest, testTimestampIn.value.time.min == testTimestampOut.value.time.min);
ct_test(pTest, testTimestampIn.value.time.sec == testTimestampOut.value.time.sec);
ct_test(pTest, testTimestampIn.value.time.hundredths == testTimestampOut.value.time.hundredths);
ct_test(pTest,
testTimestampIn.value.time.hour == testTimestampOut.value.time.hour);
ct_test(pTest,
testTimestampIn.value.time.min == testTimestampOut.value.time.min);
ct_test(pTest,
testTimestampIn.value.time.sec == testTimestampOut.value.time.sec);
ct_test(pTest,
testTimestampIn.value.time.hundredths ==
testTimestampOut.value.time.hundredths);
}
void testTimestampTimeDate(
@@ -239,15 +242,31 @@ void testTimestampTimeDate(
ct_test(pTest, inLen == outLen);
ct_test(pTest, testTimestampIn.tag == testTimestampOut.tag);
ct_test(pTest, testTimestampIn.value.dateTime.time.hour == testTimestampOut.value.dateTime.time.hour);
ct_test(pTest, testTimestampIn.value.dateTime.time.min == testTimestampOut.value.dateTime.time.min);
ct_test(pTest, testTimestampIn.value.dateTime.time.sec == testTimestampOut.value.dateTime.time.sec);
ct_test(pTest, testTimestampIn.value.dateTime.time.hundredths == testTimestampOut.value.dateTime.time.hundredths);
ct_test(pTest,
testTimestampIn.value.dateTime.time.hour ==
testTimestampOut.value.dateTime.time.hour);
ct_test(pTest,
testTimestampIn.value.dateTime.time.min ==
testTimestampOut.value.dateTime.time.min);
ct_test(pTest,
testTimestampIn.value.dateTime.time.sec ==
testTimestampOut.value.dateTime.time.sec);
ct_test(pTest,
testTimestampIn.value.dateTime.time.hundredths ==
testTimestampOut.value.dateTime.time.hundredths);
ct_test(pTest, testTimestampIn.value.dateTime.date.year == testTimestampOut.value.dateTime.date.year);
ct_test(pTest, testTimestampIn.value.dateTime.date.month == testTimestampOut.value.dateTime.date.month);
ct_test(pTest, testTimestampIn.value.dateTime.date.wday == testTimestampOut.value.dateTime.date.wday);
ct_test(pTest, testTimestampIn.value.dateTime.date.day == testTimestampOut.value.dateTime.date.day);
ct_test(pTest,
testTimestampIn.value.dateTime.date.year ==
testTimestampOut.value.dateTime.date.year);
ct_test(pTest,
testTimestampIn.value.dateTime.date.month ==
testTimestampOut.value.dateTime.date.month);
ct_test(pTest,
testTimestampIn.value.dateTime.date.wday ==
testTimestampOut.value.dateTime.date.wday);
ct_test(pTest,
testTimestampIn.value.dateTime.date.day ==
testTimestampOut.value.dateTime.date.day);
}
@@ -280,4 +299,3 @@ int main(
#endif // TEST_TIME_STAMP
#endif // TEST