Moved plop to use connection instead of just request

1 files changed, 16 insertions, 25 deletions

diff --git a/plop.c b/plop.c
index b1c5944..c64ad11 100644
--- a/plop.c
+++ b/plop.c
@@ -14,6 +14,7 @@
 #include <lauxlib.h>
 #include <lua.h>
 
+#include "connection.h"
 #include "request.h"
 #include "response.h"
 
@@ -121,34 +122,25 @@ int plop_load_handler(lua_State * L, const char * path)
 /// \return -1 if an error occured
 int plop_handle_client(lua_State * L, struct epoll_event * event)
 {
-	// TODO: Temporary shenanigans to avoid too much changes.
-	struct request * r = (struct request *) event->data.ptr;
-	struct request ** request = &r;
+	struct connection * connection = (struct connection *) event->data.ptr;
 
-	if (-1 == parse_request(L, (*request)->fd, request))
+	if (-1 == parse_request(connection))
 	{
-		lua_newtable((*request)->lua);
-		lua_pushstring((*request)->lua, "status");
-		lua_pushinteger((*request)->lua, 400); // TODO: How about a function that generates error responses?
-		lua_rawset((*request)->lua, -3);
+		lua_newtable(connection->L);
+		lua_pushstring(connection->L, "status");
+		lua_pushinteger(connection->L, 400); // TODO: How about a function that generates error responses?
+		lua_rawset(connection->L, -3);
 	}
 	else // TODO: 0 may mean EAGAIN, stuff will be bad very soon from here.
 	{
 		// TODO: Push the handler to stack earlier to avoid shifting it.
-		lua_getglobal((*request)->lua, "handler");
-		lua_insert((*request)->lua, 1);
-		lua_call((*request)->lua, 5, 1);
+		lua_getglobal(connection->L, "handler");
+		lua_insert(connection->L, 1);
+		lua_call(connection->L, 5, 1);
 	}
 
-	int result = response_send((*request)->lua, (*request)->fd);
-
-	close((*request)->fd);
-
-	if (NULL != *request)
-	{
-		free_request(L, *request);
-		*request = NULL;
-	}
+	int result = response_send(connection->L, connection->fd);
+	connection_free(L, connection);
 
 	return result;
 }
@@ -201,15 +193,14 @@ int plop_handle_server(lua_State * L, const int efd, const int server)
 		return 0; // TODO: Retriage this error at some point.
 	}
 
-	// TODO: Request is not the enitre state of the client. Make them distinct along with responses.
-	struct request * request = new_request(L);
-	if (NULL == request)
+	struct connection * connection = connection_new(L, client);
+	if (NULL == connection)
 	{
 		return -1;
 	}
 
-	request->fd = client;
-	e.data.ptr = request;
+	connection->fd = client;
+	e.data.ptr = connection;
 
 	if (-1 == epoll_ctl(efd, EPOLL_CTL_ADD, client, &e))
 	{