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

Corrected private transfer encoding.

Browse Source
This commit is contained in:
skarg
2009-12-15 21:51:57 +00:00
parent 7c13ab6904
commit 11e1c80e38
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/ptransfer.c
+6 -2
View File
@@ -80,6 +80,7 @@ int ptransfer_encode_apdu(
BACNET_PRIVATE_TRANSFER_DATA * private_data) BACNET_PRIVATE_TRANSFER_DATA * private_data)
{ {
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
if (apdu) { if (apdu) {
apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST; apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST;
@@ -87,8 +88,9 @@ int ptransfer_encode_apdu(
apdu[2] = invoke_id; apdu[2] = invoke_id;
apdu[3] = SERVICE_CONFIRMED_PRIVATE_TRANSFER; apdu[3] = SERVICE_CONFIRMED_PRIVATE_TRANSFER;
apdu_len = 4; apdu_len = 4;
apdu_len = len =
pt_encode_apdu(&apdu[apdu_len], (uint16_t)(MAX_APDU - apdu_len), private_data); pt_encode_apdu(&apdu[apdu_len], (uint16_t)(MAX_APDU - apdu_len), private_data);
apdu_len += len;
} }
return apdu_len; return apdu_len;
@@ -99,13 +101,15 @@ int uptransfer_encode_apdu(
BACNET_PRIVATE_TRANSFER_DATA * private_data) BACNET_PRIVATE_TRANSFER_DATA * private_data)
{ {
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
if (apdu) { if (apdu) {
apdu[0] = PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST; apdu[0] = PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST;
apdu[1] = SERVICE_UNCONFIRMED_PRIVATE_TRANSFER; apdu[1] = SERVICE_UNCONFIRMED_PRIVATE_TRANSFER;
apdu_len = 2; apdu_len = 2;
apdu_len = len =
pt_encode_apdu(&apdu[apdu_len], (uint16_t)(MAX_APDU - apdu_len), private_data); pt_encode_apdu(&apdu[apdu_len], (uint16_t)(MAX_APDU - apdu_len), private_data);
apdu_len += len;
} }
return apdu_len; return apdu_len;