From 8cddaa5881a4f8a7f1efe83d5546e482022e2409 Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Wed, 17 Aug 2022 23:21:39 -0500
Subject: [PATCH] Fix confirmed service with service supported enumeration

---
 src/bacnet/basic/object/device.h            | 2 +-
 src/bacnet/basic/object/gateway/gw_device.c | 6 +++---
 src/bacnet/basic/service/h_dcc.c            | 2 +-
 src/bacnet/basic/service/h_rd.c             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bacnet/basic/object/device.h b/src/bacnet/basic/object/device.h
index bb7937e6..2a716697 100644
--- a/src/bacnet/basic/object/device.h
+++ b/src/bacnet/basic/object/device.h
@@ -512,7 +512,7 @@ extern "C" {
         void);
     BACNET_STACK_EXPORT
     int Routed_Device_Service_Approval(
-        BACNET_CONFIRMED_SERVICE service,
+        BACNET_SERVICES_SUPPORTED service,
         int service_argument,
         uint8_t * apdu_buff,
         uint8_t invoke_id);
diff --git a/src/bacnet/basic/object/gateway/gw_device.c b/src/bacnet/basic/object/gateway/gw_device.c
index 798916cc..549fff1d 100644
--- a/src/bacnet/basic/object/gateway/gw_device.c
+++ b/src/bacnet/basic/object/gateway/gw_device.c
@@ -613,14 +613,14 @@ void Routed_Device_Inc_Database_Revision(void)
  *          just 1 if no apdu_buff was supplied and service is not supported,
  *          else 0 if service is approved for the current device.
  */
-int Routed_Device_Service_Approval(BACNET_CONFIRMED_SERVICE service,
+int Routed_Device_Service_Approval(BACNET_SERVICES_SUPPORTED service,
     int service_argument,
     uint8_t *apdu_buff,
     uint8_t invoke_id)
 {
     int len = 0;
     switch (service) {
-        case SERVICE_CONFIRMED_REINITIALIZE_DEVICE:
+        case SERVICE_SUPPORTED_REINITIALIZE_DEVICE:
             /* If not the gateway device, we don't support RD */
             if (iCurrent_Device_Idx > 0) {
                 if (apdu_buff != NULL) {
@@ -631,7 +631,7 @@ int Routed_Device_Service_Approval(BACNET_CONFIRMED_SERVICE service,
                 }
             }
             break;
-        case SERVICE_CONFIRMED_DEVICE_COMMUNICATION_CONTROL:
+        case SERVICE_SUPPORTED_DEVICE_COMMUNICATION_CONTROL:
             /* If not the gateway device, we don't support DCC */
             if (iCurrent_Device_Idx > 0) {
                 if (apdu_buff != NULL) {
diff --git a/src/bacnet/basic/service/h_dcc.c b/src/bacnet/basic/service/h_dcc.c
index 12018e0e..67ed9b0c 100644
--- a/src/bacnet/basic/service/h_dcc.c
+++ b/src/bacnet/basic/service/h_dcc.c
@@ -169,7 +169,7 @@ void handler_device_communication_control(uint8_t *service_request,
 #ifdef BAC_ROUTING
         /* Check to see if the current Device supports this service. */
         len = Routed_Device_Service_Approval(
-            SERVICE_CONFIRMED_DEVICE_COMMUNICATION_CONTROL, (int)state,
+            SERVICE_SUPPORTED_DEVICE_COMMUNICATION_CONTROL, (int)state,
             &Handler_Transmit_Buffer[pdu_len], service_data->invoke_id);
         if (len > 0)
             goto DCC_ABORT;
diff --git a/src/bacnet/basic/service/h_rd.c b/src/bacnet/basic/service/h_rd.c
index ccf6ed7a..2a7f0b42 100644
--- a/src/bacnet/basic/service/h_rd.c
+++ b/src/bacnet/basic/service/h_rd.c
@@ -126,7 +126,7 @@ void handler_reinitialize_device(uint8_t *service_request,
 #ifdef BAC_ROUTING
         /* Check to see if the current Device supports this service. */
         len = Routed_Device_Service_Approval(
-            SERVICE_CONFIRMED_REINITIALIZE_DEVICE, (int)rd_data.state,
+            SERVICE_SUPPORTED_REINITIALIZE_DEVICE, (int)rd_data.state,
             &Handler_Transmit_Buffer[pdu_len], service_data->invoke_id);
         if (len > 0)
             goto RD_ABORT;