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

Changed RetryCount in TSM to count up, which matches the BACnet spec language, and removes the bug when APDU Retries is 0.

Browse Source
This commit is contained in:
skarg
2009-11-10 12:03:34 +00:00
parent b95b01772d
commit eb370fa972
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/tsm.c
+6 -6
View File
@@ -186,9 +186,9 @@ void tsm_set_confirmed_unsegmented_transaction(
if (invokeID) { if (invokeID) {
index = tsm_find_invokeID_index(invokeID); index = tsm_find_invokeID_index(invokeID);
if (index < MAX_TSM_TRANSACTIONS) { if (index < MAX_TSM_TRANSACTIONS) {
/* assign the transaction */ /* SendConfirmedUnsegmented */
TSM_List[index].state = TSM_STATE_AWAIT_CONFIRMATION; TSM_List[index].state = TSM_STATE_AWAIT_CONFIRMATION;
TSM_List[index].RetryCount = apdu_retries(); TSM_List[index].RetryCount = 0;
/* start the timer */ /* start the timer */
TSM_List[index].RequestTimer = apdu_timeout(); TSM_List[index].RequestTimer = apdu_timeout();
/* copy the data */ /* copy the data */
@@ -249,11 +249,11 @@ void tsm_timer_milliseconds(
TSM_List[i].RequestTimer -= milliseconds; TSM_List[i].RequestTimer -= milliseconds;
else else
TSM_List[i].RequestTimer = 0; TSM_List[i].RequestTimer = 0;
/* timeout. retry? */ /* AWAIT_CONFIRMATION */
if (TSM_List[i].RequestTimer == 0) { if (TSM_List[i].RequestTimer == 0) {
TSM_List[i].RetryCount--; if (TSM_List[i].RetryCount < apdu_retries()) {
TSM_List[i].RequestTimer = apdu_timeout(); TSM_List[i].RequestTimer = apdu_timeout();
if (TSM_List[i].RetryCount) { TSM_List[i].RetryCount++;
datalink_send_pdu(&TSM_List[i].dest, datalink_send_pdu(&TSM_List[i].dest,
&TSM_List[i].npdu_data, &TSM_List[i].apdu[0], &TSM_List[i].npdu_data, &TSM_List[i].apdu[0],
TSM_List[i].apdu_len); TSM_List[i].apdu_len);