From 5eda68d3810a694be9dca0ed857838ee3249e3b5 Mon Sep 17 00:00:00 2001
From: Ping <34202980+Pookping@users.noreply.github.com>
Date: Mon, 23 Mar 2026 10:22:28 -0700
Subject: [PATCH] Add void *context field to service data structures (#1265)

---
 src/bacnet/rp.h          | 1 +
 src/bacnet/write_group.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/bacnet/rp.h b/src/bacnet/rp.h
index c6e03e04..93259815 100644
--- a/src/bacnet/rp.h
+++ b/src/bacnet/rp.h
@@ -22,6 +22,7 @@ typedef struct BACnet_Read_Property_Data {
     int application_data_len;
     BACNET_ERROR_CLASS error_class;
     BACNET_ERROR_CODE error_code;
+    void *context; /* user-defined callback context */
 } BACNET_READ_PROPERTY_DATA;
 
 /* Forward declaration of RPM-style data structure */
diff --git a/src/bacnet/write_group.h b/src/bacnet/write_group.h
index d5a0489d..3730ee83 100644
--- a/src/bacnet/write_group.h
+++ b/src/bacnet/write_group.h
@@ -54,6 +54,7 @@ typedef struct BACnet_Write_Group_Data {
     BACNET_GROUP_CHANNEL_VALUE change_list;
     WRITE_GROUP_INHIBIT_DELAY inhibit_delay;
     struct BACnet_Write_Group_Data *next;
+    void *context; /* user-defined callback context */
 } BACNET_WRITE_GROUP_DATA;
 
 /**