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

Corrected the NPDU encoding for the demo handlers.

Browse Source
This commit is contained in:
skarg
2006-09-23 22:02:04 +00:00
parent 07a1077b2d
commit 337bc5ab4e
23 changed files with 502 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_wp.c
+45 -39
View File
@@ -60,10 +60,16 @@ void handler_write_property(uint8_t * service_request,
BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
int bytes_sent = 0;
BACNET_ADDRESS my_address;
/* decode the service request only */
len = wp_decode_service_request(service_request,
service_len, &wp_data);
/* encode the NPDU portion of the packet */
datalink_get_my_address(&my_address);
npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL);
pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], src,
&my_address, &npdu_data);
#if PRINT_ENABLED
fprintf(stderr, "Received Write-Property Request!\n");
if (len > 0)
@@ -76,13 +82,13 @@ void handler_write_property(uint8_t * service_request,
#endif
/* bad decoding or something we didn't understand - send an abort */
if (len <= 0) {
pdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[0],
len = abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, ABORT_REASON_OTHER);
#if PRINT_ENABLED
fprintf(stderr, "Sending Abort!\n");
#endif
} else if (service_data->segmented_message) {
pdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[0],
len = abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED);
#if PRINT_ENABLED
@@ -92,8 +98,8 @@ void handler_write_property(uint8_t * service_request,
switch (wp_data.object_type) {
case OBJECT_DEVICE:
if (Device_Write_Property(&wp_data, &error_class, &error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -101,8 +107,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for Device!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -116,8 +122,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_BINARY_INPUT:
error_class = ERROR_CLASS_PROPERTY;
error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
error_class, error_code);
#if PRINT_ENABLED
@@ -127,8 +133,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_BINARY_OUTPUT:
if (Binary_Output_Write_Property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -136,8 +142,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for BO!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -149,8 +155,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_BINARY_VALUE:
if (Binary_Value_Write_Property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -158,8 +164,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for BV!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -171,8 +177,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_ANALOG_OUTPUT:
if (Analog_Output_Write_Property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -180,8 +186,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for AO!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -193,8 +199,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_ANALOG_VALUE:
if (Analog_Value_Write_Property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -202,8 +208,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for AV!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -215,8 +221,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_LIFE_SAFETY_POINT:
if (Life_Safety_Point_Write_Property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -224,8 +230,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for LSP!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -237,8 +243,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_MULTI_STATE_OUTPUT:
if (Multistate_Output_Write_Property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -246,8 +252,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for MSO!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -260,8 +266,8 @@ void handler_write_property(uint8_t * service_request,
case OBJECT_FILE:
if (bacfile_write_property(&wp_data, &error_class,
&error_code)) {
pdu_len =
encode_simple_ack(&Handler_Transmit_Buffer[0],
len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED
@@ -269,8 +275,8 @@ void handler_write_property(uint8_t * service_request,
"Sending Write Property Simple Ack for File!\n");
#endif
} else {
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
error_code);
@@ -281,8 +287,8 @@ void handler_write_property(uint8_t * service_request,
break;
#endif
default:
pdu_len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[0],
len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
error_class, error_code);
#if PRINT_ENABLED
@@ -291,7 +297,7 @@ void handler_write_property(uint8_t * service_request,
break;
}
}
npdu_encode_confirmed_apdu(&npdu_data, MESSAGE_PRIORITY_NORMAL);
pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len);
#if PRINT_ENABLED