Use more managed pointers

RamseyK · RamseyK · commit 54559eff78d2 · 2026-01-01T20:45:36.000-05:00
diff --git a/src/Client.cpp b/src/Client.cpp
@@ -29,7 +29,7 @@ Client::~Client() {
  * Add to Send Queue
  * Adds a SendQueueItem object to the end of this client's send queue
  */
-void Client::addToSendQueue(SendQueueItem* item) {
+void Client::addToSendQueue(std::shared_ptr<SendQueueItem> item) {
     sendQueue.push(item);
 }
 
@@ -49,7 +49,7 @@ uint32_t Client::sendQueueSize() const {
  *
  * @return SendQueueItem object containing the data to send and current offset
  */
-SendQueueItem* Client::nextInSendQueue() {
+std::shared_ptr<SendQueueItem> Client::nextInSendQueue() {
     if (sendQueue.empty())
         return nullptr;
 
@@ -61,10 +61,10 @@ SendQueueItem* Client::nextInSendQueue() {
  * Deletes and dequeues first item in the queue
  */
 void Client::dequeueFromSendQueue() {
-    SendQueueItem* item = nextInSendQueue();
+    std::shared_ptr<SendQueueItem> item = nextInSendQueue();
     if (item != nullptr) {
+        item.reset();
         sendQueue.pop();
-        delete item;
     }
 }
 
@@ -74,7 +74,7 @@ void Client::dequeueFromSendQueue() {
  */
 void Client::clearSendQueue() {
     while (!sendQueue.empty()) {
-        delete sendQueue.front();
+        sendQueue.front().reset();
         sendQueue.pop();
     }
 }
diff --git a/src/Client.h b/src/Client.h
@@ -21,6 +21,8 @@
 
 #include "SendQueueItem.h"
 
+#include <memory>
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <queue>
@@ -29,7 +31,7 @@ class Client {
     int32_t socketDesc; // Socket Descriptor
     sockaddr_in clientAddr;
 
-    std::queue<SendQueueItem*> sendQueue;
+    std::queue<std::shared_ptr<SendQueueItem>> sendQueue;
 
 public:
     Client(int32_t fd, sockaddr_in addr);
@@ -50,9 +52,9 @@ class Client {
         return inet_ntoa(clientAddr.sin_addr);
     }
 
-    void addToSendQueue(SendQueueItem* item);
+    void addToSendQueue(std::shared_ptr<SendQueueItem> item);
     uint32_t sendQueueSize() const;
-    SendQueueItem* nextInSendQueue();
+    std::shared_ptr<SendQueueItem> nextInSendQueue();
     void dequeueFromSendQueue();
     void clearSendQueue();
 };
diff --git a/src/HTTPServer.cpp b/src/HTTPServer.cpp
@@ -25,6 +25,7 @@
 #include <memory>
 #include <print>
 #include <vector>
+#include <utility>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -629,7 +630,7 @@ void HTTPServer::sendResponse(std::shared_ptr<Client> cl, std::unique_ptr<HTTPRe
 
     // Get raw data by creating the response (we are responsible for cleaning it up in process())
     // Add data to the Client's send queue
-    cl->addToSendQueue(new SendQueueItem(resp->create(), resp->size(), disconnect));
+    cl->addToSendQueue(std::make_shared<SendQueueItem>(resp->create(), resp->size(), disconnect));
 }
 
 /**
@@ -657,7 +658,6 @@ std::shared_ptr<ResourceHost> HTTPServer::getResourceHostForRequest(const std::s
             return it->second;
     } else {
         // Temporary: HTTP/1.0 are given the first ResouceHost in the hostList
-        // TODO: Allow admin to specify a 'default resource host'
         if (!hostList.empty())
             return hostList[0];
     }
diff --git a/src/Resource.h b/src/Resource.h
@@ -33,6 +33,9 @@ class Resource {
 public:
     explicit Resource(std::string const& loc, bool dir = false);
     ~Resource();
+    Resource& operator=(Resource const&) = delete;  // Copy assignment
+    Resource(Resource &&) = delete;  // Move
+    Resource& operator=(Resource &&) = delete;  // Move assignment
 
     // Setters
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ Client::~Client() {`
`29`	`29`	`* Add to Send Queue`
`30`	`30`	`* Adds a SendQueueItem object to the end of this client's send queue`
`31`	`31`	`*/`
`32`		`-void Client::addToSendQueue(SendQueueItem* item) {`
	`32`	`+void Client::addToSendQueue(std::shared_ptr<SendQueueItem> item) {`
`33`	`33`	`sendQueue.push(item);`
`34`	`34`	`}`
`35`	`35`
`@@ -49,7 +49,7 @@ uint32_t Client::sendQueueSize() const {`
`49`	`49`	`*`
`50`	`50`	`* @return SendQueueItem object containing the data to send and current offset`
`51`	`51`	`*/`
`52`		`-SendQueueItem* Client::nextInSendQueue() {`
	`52`	`+std::shared_ptr<SendQueueItem> Client::nextInSendQueue() {`
`53`	`53`	`if (sendQueue.empty())`
`54`	`54`	`return nullptr;`
`55`	`55`
`@@ -61,10 +61,10 @@ SendQueueItem* Client::nextInSendQueue() {`
`61`	`61`	`* Deletes and dequeues first item in the queue`
`62`	`62`	`*/`
`63`	`63`	`void Client::dequeueFromSendQueue() {`
`64`		`- SendQueueItem* item = nextInSendQueue();`
	`64`	`+ std::shared_ptr<SendQueueItem> item = nextInSendQueue();`
`65`	`65`	`if (item != nullptr) {`
	`66`	`+ item.reset();`
`66`	`67`	`sendQueue.pop();`
`67`		`- delete item;`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -74,7 +74,7 @@ void Client::dequeueFromSendQueue() {`
`74`	`74`	`*/`
`75`	`75`	`void Client::clearSendQueue() {`
`76`	`76`	`while (!sendQueue.empty()) {`
`77`		`- delete sendQueue.front();`
	`77`	`+ sendQueue.front().reset();`
`78`	`78`	`sendQueue.pop();`
`79`	`79`	`}`
`80`	`80`	`}`