From 5c0d0d0fe896cd59633f98d1dde1808aa7dd5629 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Wed, 6 Jun 2007 21:25:18 +0000
Subject: [PATCH] Corrected SubscribeCOV decoding for cancellation request. 
 Updated COV Code::Blocks project.

---
 bacnet-stack/cov.c   |   9 ++--
 bacnet-stack/cov.cbp | 104 +++++++++++++++++++------------------------
 2 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/bacnet-stack/cov.c b/bacnet-stack/cov.c
index 12a03a75..08fa8b50 100644
--- a/bacnet-stack/cov.c
+++ b/bacnet-stack/cov.c
@@ -78,7 +78,7 @@ static int notify_encode_adpu(uint8_t * apdu, BACNET_COV_DATA * data)
         len = encode_opening_tag(&apdu[apdu_len], 4);
         apdu_len += len;
         /* the first value includes a pointer to the next value, etc */
-        /* FIXME: for small implementations, we might try a partial 
+        /* FIXME: for small implementations, we might try a partial
            approach like the rpm.c where the values are encoded with
            a separate function */
         value = &data->listOfValues;
@@ -367,7 +367,7 @@ int cov_subscribe_decode_service_request(uint8_t * apdu,
         } else
             return -1;
         /* optional parameters - if missing, means cancellation */
-        if (len > apdu_len) {
+        if (len < apdu_len) {
             /* tag 2 - issueConfirmedNotifications - optional */
             if (decode_is_context_tag(&apdu[len], 2)) {
                 data->cancellationRequest = false;
@@ -840,7 +840,10 @@ void testCOVSubscribeData(Test * pTest,
         test_data->monitoredObjectIdentifier.instance ==
         data->monitoredObjectIdentifier.instance);
     ct_test(pTest,
-        test_data->cancellationRequest == data->cancellationRequest);
+        test_data->cancellationRequest == data->cancellationRequest);
+    if (test_data->cancellationRequest != data->cancellationRequest) {
+        printf("cancellation request failed!\n");
+    }
     if (!test_data->cancellationRequest) {
         ct_test(pTest,
             test_data->issueConfirmedNotifications ==
diff --git a/bacnet-stack/cov.cbp b/bacnet-stack/cov.cbp
index a4265572..ac9c5acf 100644
--- a/bacnet-stack/cov.cbp
+++ b/bacnet-stack/cov.cbp
@@ -1,80 +1,68 @@
-<?xml version="1.0"?>
-<!DOCTYPE CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_project_file>
-	<FileVersion major="1" minor="1"/>
+	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="COV Unit Test"/>
-		<Option makefile="Makefile"/>
-		<Option makefile_is_custom="0"/>
-		<Option compiler="0"/>
+		<Option title="COV Unit Test" />
+		<Option pch_mode="0" />
+		<Option compiler="gcc" />
 		<Build>
 			<Target title="default">
-				<Option output="C:\code\bacnet-stack\cov.exe"/>
-				<Option working_dir="."/>
-				<Option object_output=".objs"/>
-				<Option deps_output=".deps"/>
-				<Option type="1"/>
-				<Option compiler="0"/>
-				<Option projectResourceIncludeDirsRelation="1"/>
+				<Option output="C:\code\bacnet-stack\cov.exe" prefix_auto="0" extension_auto="0" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Option projectResourceIncludeDirsRelation="1" />
 			</Target>
 		</Build>
+		<VirtualTargets>
+			<Add alias="All" targets="default;" />
+		</VirtualTargets>
 		<Compiler>
-			<Add option="-DTEST"/>
-			<Add option="-DTEST_WHOIS"/>
+			<Add option="-Wall" />
+			<Add option="-g" />
+			<Add option="-DBACDL_TEST" />
+			<Add option="-DBIG_ENDIAN=0" />
+			<Add option="-DTEST" />
+			<Add option="-DTEST_COV" />
+			<Add directory="test" />
+			<Add directory="demo\object" />
+			<Add directory="." />
 		</Compiler>
 		<Unit filename="bacapp.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="bacapp.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="bacapp.h" />
 		<Unit filename="bacdcode.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="bacdcode.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="bacdef.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="bacenum.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="bacdcode.h" />
+		<Unit filename="bacdef.h" />
+		<Unit filename="bacenum.h" />
 		<Unit filename="bacstr.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="bigend.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+		<Unit filename="bacstr.h" />
+		<Unit filename="bactext.c">
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="bactext.h" />
 		<Unit filename="cov.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="cov.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="cov.h" />
+		<Unit filename="datetime.c">
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="datetime.h" />
+		<Unit filename="indtext.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="indtext.h" />
 		<Unit filename="test\ctest.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="test\ctest.h" />
+		<Extensions>
+			<code_completion />
+		</Extensions>
 	</Project>
 </CodeBlocks_project_file>