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

refactored the private-transfer printing

Browse Source
This commit is contained in:
skarg
2013-12-09 19:19:19 +00:00
parent 31b8373520
commit d03e35ebda
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_upt.c
+28 -17
View File
@@ -39,12 +39,9 @@
/** @file h_upt.c Handles Unconfirmed Private Transfer requests. */ /** @file h_upt.c Handles Unconfirmed Private Transfer requests. */
void handler_unconfirmed_private_transfer( void private_transfer_print_data(
uint8_t * service_request, BACNET_PRIVATE_TRANSFER_DATA *private_data)
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
BACNET_PRIVATE_TRANSFER_DATA private_data;
BACNET_OBJECT_PROPERTY_VALUE object_value; /* for bacapp printing */ BACNET_OBJECT_PROPERTY_VALUE object_value; /* for bacapp printing */
BACNET_APPLICATION_DATA_VALUE value; /* for decode value data */ BACNET_APPLICATION_DATA_VALUE value; /* for decode value data */
int len = 0; int len = 0;
@@ -53,21 +50,15 @@ void handler_unconfirmed_private_transfer(
bool first_value = true; bool first_value = true;
bool print_brace = false; bool print_brace = false;
#if PRINT_ENABLED if (private_data) {
fprintf(stderr, "Received Unconfirmed Private Transfer Request!\n");
#endif
len =
ptransfer_decode_service_request(service_request, service_len,
&private_data);
if (len >= 0) {
#if PRINT_ENABLED #if PRINT_ENABLED
printf("PrivateTransfer:vendorID=%u\r\n", printf("PrivateTransfer:vendorID=%u\r\n",
(unsigned) private_data.vendorID); (unsigned) private_data->vendorID);
printf("PrivateTransfer:serviceNumber=%lu\r\n", printf("PrivateTransfer:serviceNumber=%lu\r\n",
(unsigned long) private_data.serviceNumber); (unsigned long) private_data->serviceNumber);
#endif #endif
application_data = private_data.serviceParameters; application_data = private_data->serviceParameters;
application_data_len = private_data.serviceParametersLen; application_data_len = private_data->serviceParametersLen;
for (;;) { for (;;) {
len = len =
bacapp_decode_application_data(application_data, bacapp_decode_application_data(application_data,
@@ -102,9 +93,29 @@ void handler_unconfirmed_private_transfer(
} }
} }
#if PRINT_ENABLED #if PRINT_ENABLED
if (print_brace) if (print_brace) {
fprintf(stdout, "}"); fprintf(stdout, "}");
}
fprintf(stdout, "\r\n"); fprintf(stdout, "\r\n");
#endif #endif
} }
} }
void handler_unconfirmed_private_transfer(
uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{
BACNET_PRIVATE_TRANSFER_DATA private_data;
int len = 0;
#if PRINT_ENABLED
fprintf(stderr, "Received Unconfirmed Private Transfer Request!\n");
#endif
len =
ptransfer_decode_service_request(service_request, service_len,
&private_data);
if (len >= 0) {
private_transfer_print_data(&private_data);
}
}
bacnet-stack/include/handlers.h
+3
View File
@@ -283,6 +283,9 @@ extern "C" {
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src); BACNET_ADDRESS * src);
void private_transfer_print_data(
BACNET_PRIVATE_TRANSFER_DATA *private_data);
void handler_read_range( void handler_read_range(
uint8_t * service_request, uint8_t * service_request,
uint16_t service_len, uint16_t service_len,