From 2716fd398672dc4f53b3b1393ca41764284e1c1e Mon Sep 17 00:00:00 2001
From: "Tristan B. Velloza Kildaire" <deavmi@redxen.eu>
Date: Fri, 22 Sep 2023 15:40:11 +0200
Subject: [PATCH] CoapRequest

- Now takes in the original request packet, `CoapPacket` instead of the token
- Added `getToken()` to fetch the token (for matching purposes)
- Added `getRequestPacket()` to obtain the original request

CoapClient

- Use `getToken()`
- Pass the `CoapPacket` in rather
---
 source/doap/client/client.d  |  4 ++--
 source/doap/client/request.d | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/source/doap/client/client.d b/source/doap/client/client.d
index 7d4d0c3..7c10f3c 100644
--- a/source/doap/client/client.d
+++ b/source/doap/client/client.d
@@ -151,7 +151,7 @@ public class CoapClient
         CoapRequestFuture future = new CoapRequestFuture();
 
         // Link the CoapRequest to the future so it can be signalled
-        CoapRequest request = new CoapRequest(requestPacket.getToken(), future);
+        CoapRequest request = new CoapRequest(requestPacket, future);
 
         // Store the request
         storeRequest(request);
@@ -194,7 +194,7 @@ public class CoapClient
 
         foreach(CoapRequest request; outgoingRequests)
         {
-            if(request.token == token)
+            if(request.getToken() == token)
             {
                 foundRequest = request;
                 break;
diff --git a/source/doap/client/request.d b/source/doap/client/request.d
index d832e0c..709211d 100644
--- a/source/doap/client/request.d
+++ b/source/doap/client/request.d
@@ -21,10 +21,10 @@ import doap.exceptions;
 package class CoapRequest
 {
     /** 
-     * The token to be able to match a response
-     * to
+     * The original packet (to be able to access the token
+     * such that we can match it up with a respnse)
      */
-    package ubyte[] token;
+    private CoapPacket requestPacket;
 
     /** 
      * The future which we can fill up with the
@@ -36,15 +36,25 @@ package class CoapRequest
      * Constructs a new request
      *
      * Params:
-     *   token = the token
+     *   requestPacket = the actual request
      *   future = the `CoapRequestFuture` to wake up
      * on data arrival
      */
-    this(ubyte[] token, CoapRequestFuture future)
+    this(CoapPacket requestPacket, CoapRequestFuture future)
     {
-        this.token = token;
+        this.requestPacket = requestPacket;
         this.future = future;
     }
+
+    public CoapPacket getRequestPacket()
+    {
+        return this.requestPacket;
+    }
+
+    public ubyte[] getToken()
+    {
+        return this.requestPacket.getToken();
+    }
 }
 
 /**