cppAndNetworkAndDB
diff --git a/‎Makefile‎
Lines changed: 4 additions & 3 deletions b/‎Makefile‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/ByteBuffer.h‎
Lines changed: 4 additions & 4 deletions b/‎src/ByteBuffer.h‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Client.cpp‎
Lines changed: 35 additions & 1 deletion b/‎src/Client.cpp‎
Lines changed: 35 additions & 1 deletion
diff --git a/‎src/Client.h‎
Lines changed: 13 additions & 1 deletion b/‎src/Client.h‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎src/HTTPResponse.cpp‎
Lines changed: 1 addition & 0 deletions b/‎src/HTTPResponse.cpp‎
Lines changed: 1 addition & 0 deletions
@@ -8,9 +8,10 @@ BUILDDIR := build
 TARGET := httpserver
 
 # Debug Flags
-DEBUGFLAGS := -g -O0 -Wall
+DEBUGFLAGS := -g3 -O0 -Wall
+RTCHECKS := -fmudflap -fstack-check -gnato
 # Production Flags
-PRODFLAGS := -Wall -O3
+PRODFLAGS := -Wall -O2
 # Active Flags
 CFLAGS := -std=c++11 -stdlib=libc++ -Iinclude/ $(DEBUGFLAGS)
 LINK := -stdlib=libc++ $(DEBUGFLAGS)
@@ -27,6 +28,6 @@ $(BUILDDIR)/%.o: $(SRCDIR)/%.$(SRCEXT)
 	@echo " CC $<"; $(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	@echo " Cleaning..."; $(RM) -r $(BUILDDIR) $(BINDIR)/$(TARGET)
+	@echo " Cleaning..."; rm -r $(BUILDDIR) $(BINDIR)/$(TARGET)*
 
 .PHONY: clean
@@ -16,8 +16,8 @@
    limitations under the License.
 */
 
-#ifndef _BYTEBUFFER_H
-#define _BYTEBUFFER_H
+#ifndef _BYTEBUFFER_H_
+#define _BYTEBUFFER_H_
 
 // Default number of bytes to allocate in the backing buffer if no size is provided
 #define DEFAULT_SIZE 4096
@@ -63,7 +63,7 @@ class ByteBuffer {
 		if (size() < (wpos + s))
 			buf.resize(wpos + s);
 		memcpy(&buf[wpos], (byte*)&data, s);
-		//printf("writing %c to %u\n", ((uns, wpos);
+		//printf("writing %c to %i\n", (byte)data, wpos);
 
 		wpos += s;
 	}
@@ -79,7 +79,7 @@ class ByteBuffer {
 public:
 	ByteBuffer(unsigned int size = DEFAULT_SIZE);
 	ByteBuffer(byte* arr, unsigned int size);
-	~ByteBuffer();
+	virtual ~ByteBuffer();
 
 	unsigned int bytesRemaining(); // Number of bytes from the current read position till the end of the buffer
 	void clear(); // Clear our the vector and reset read and write positions
 
@@ -25,5 +25,39 @@ Client::Client(SOCKET fd, sockaddr_in addr) {
 }
 
 Client::~Client() {
-    
+    clearSendQueue();
+}
+
+void Client::addToSendQueue(SendQueueItem* item) {
+	sendQueue.push(item);
+}
+
+unsigned int Client::sendQueueSize() {
+	return sendQueue.size();
+}
+
+SendQueueItem* Client::nextFromSendQueue(unsigned int bytesToSend) {
+	if(sendQueue.empty())
+		return NULL;
+
+	SendQueueItem* item = sendQueue.front();
+	unsigned int remaining = item->getSize() - item->getOffset();
+
+
+	if(bytesToSend > remaining) { // Rest or entire resource data can be sent, Dequeue
+		sendQueue.pop(); // Dequeue
+	} else { // Only a portion of the resource can be sent, keep in queue
+		// Add to the back of the queue
+		sendQueue.pop();
+		sendQueue.push(item);
+	}
+
+	return item;
 }
+    
+void Client::clearSendQueue() {
+	while(!sendQueue.empty()) {
+		delete sendQueue.front();
+		sendQueue.pop();
+	}
+}
@@ -21,12 +21,19 @@
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <queue>
+
+#include "SendQueueItem.h"
 
 #define SOCKET int
 
+typedef unsigned char byte;
+
 class Client {
     SOCKET socketDesc; // Socket Descriptor
     sockaddr_in clientAddr;
+
+    std::queue<SendQueueItem*> sendQueue;
 
 public:
     Client(SOCKET fd, sockaddr_in addr);
@@ -40,9 +47,14 @@ class Client {
         return socketDesc;
     }
 
-    char *getClientIP() {
+    char* getClientIP() {
         return inet_ntoa(clientAddr.sin_addr);
     }
+
+    void addToSendQueue(SendQueueItem* item);
+    unsigned int sendQueueSize();
+    SendQueueItem* nextFromSendQueue(unsigned int bytesToSend);
+    void clearSendQueue();
 };
 
 #endif
@@ -92,6 +92,7 @@ void HTTPResponse::determineReasonStr() {
 /**
  * Create
  * Create and return a byte array of an HTTP response, built from the variables of this HTTPResponse
+ * Caller will be responsible for cleaning up returned byte array
  *
  * @return Byte array of this HTTPResponse to be sent over the wire
  */
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ void HTTPResponse::determineReasonStr() {`
`92`	`92`	`/**`
`93`	`93`	`* Create`
`94`	`94`	`* Create and return a byte array of an HTTP response, built from the variables of this HTTPResponse`
	`95`	`+ * Caller will be responsible for cleaning up returned byte array`
`95`	`96`	`*`
`96`	`97`	`* @return Byte array of this HTTPResponse to be sent over the wire`
`97`	`98`	`*/`