From 24e7c4c908b3d11a8e70bc3c3e2ba9bdbc5a4a28 Mon Sep 17 00:00:00 2001 From: brayra Date: Tue, 17 Jun 2008 18:18:30 +0000 Subject: [PATCH] Added check at end of function main for Error_Detected and return 1 if there were errors. Added "Error_Detected=true" to TSM Timeout and ADPU Timeout error conditions. --- bacnet-stack/demo/readprop/main.c | 7 +++++-- bacnet-stack/demo/writeprop/main.c | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/demo/readprop/main.c b/bacnet-stack/demo/readprop/main.c index 6307586d..c39be295 100644 --- a/bacnet-stack/demo/readprop/main.c +++ b/bacnet-stack/demo/readprop/main.c @@ -350,7 +350,8 @@ int main(int argc, char *argv[]) { else if (tsm_invoke_id_failed(invoke_id)) { fprintf(stderr, "\rError: TSM Timeout!\r\n"); tsm_free_invoke_id(invoke_id); - /* try again or abort? */ + Error_Detected = true; + /* try again or abort? */ break; } } else { @@ -358,12 +359,14 @@ int main(int argc, char *argv[]) { elapsed_seconds += (current_seconds - last_seconds); if (elapsed_seconds > timeout_seconds) { printf("\rError: APDU Timeout!\r\n"); - break; + Error_Detected = true; + break; } } /* keep track of time for next check */ last_seconds = current_seconds; } + if(Error_Detected) return 1; return 0; } diff --git a/bacnet-stack/demo/writeprop/main.c b/bacnet-stack/demo/writeprop/main.c index c6838eb9..c24579c5 100644 --- a/bacnet-stack/demo/writeprop/main.c +++ b/bacnet-stack/demo/writeprop/main.c @@ -436,13 +436,15 @@ int main(int argc, char *argv[]) { else if (tsm_invoke_id_failed(invoke_id)) { fprintf(stderr, "\rError: TSM Timeout!\r\n"); tsm_free_invoke_id(invoke_id); - /* try again or abort? */ + Error_Detected = true; + /* try again or abort? */ break; } } else { /* increment timer - exit if timed out */ elapsed_seconds += (current_seconds - last_seconds); if (elapsed_seconds > timeout_seconds) { + Error_Detected = true; printf("\rError: APDU Timeout!\r\n"); break; } @@ -450,6 +452,6 @@ int main(int argc, char *argv[]) { /* keep track of time for next check */ last_seconds = current_seconds; } - + if(Error_Detected) return 1; return 0; }