X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fhttp.c;h=00589686a2ba2ef009dc6d7b9aca11e77653c2c8;hb=eca47918b9fe7fa90a5983c09cef9c492a449ec4;hp=b494ac42bd9d57d04bf84f14ed3d6189ef35c305;hpb=97b1e9813e532b9065a841f2d185d632df19bf7a;p=rocksndiamonds.git

diff --git a/src/libgame/http.c b/src/libgame/http.c
index b494ac42..00589686 100644
--- a/src/libgame/http.c
+++ b/src/libgame/http.c
@@ -65,6 +65,22 @@ static void SetHttpResponseToDefaults(struct HttpResponse *response)
   response->status_text[0] = '\0';
 }
 
+struct HttpResponse *GetHttpResponseFromBuffer(void *buffer, int size)
+{
+  if (size > MAX_HTTP_BODY_SIZE)
+    return NULL;
+
+  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
+
+  SetHttpResponseToDefaults(response);
+
+  strncpy(response->body, buffer, MAX_HTTP_BODY_SIZE);
+  response->body[MAX_HTTP_BODY_SIZE] = '\0';
+  response->body_size = MIN(size, MAX_HTTP_BODY_SIZE);
+
+  return response;
+}
+
 static boolean SetHTTPResponseCode(struct HttpResponse *response, char *buffer)
 {
   char *prefix = "HTTP/1.1 ";
@@ -154,10 +170,10 @@ static boolean DoHttpRequestExt(struct HttpRequest *request,
 				struct HttpResponse *response,
 				char *send_buffer,
 				char *recv_buffer,
-				int max_http_buffer_size)
+				int max_http_buffer_size,
+				SDLNet_SocketSet socket_set,
+				TCPsocket socket)
 {
-  SDLNet_SocketSet socket_set;
-  TCPsocket socket;
   IPaddress ip;
   int server_host;
 
@@ -270,9 +286,6 @@ static boolean DoHttpRequestExt(struct HttpRequest *request,
     return FALSE;
   }
 
-  SDLNet_TCP_DelSocket(socket_set, socket);
-  SDLNet_TCP_Close(socket);
-
   Debug("network:http", "server response: %d %s",
 	response->status_code,
 	response->status_text);
@@ -286,10 +299,23 @@ boolean DoHttpRequest(struct HttpRequest *request,
   int max_http_buffer_size = MAX_HTTP_HEAD_SIZE + MAX_HTTP_BODY_SIZE;
   char *send_buffer = checked_malloc(max_http_buffer_size + 1);
   char *recv_buffer = checked_malloc(max_http_buffer_size + 1);
+  SDLNet_SocketSet socket_set = NULL;
+  TCPsocket socket = NULL;
 
   boolean success = DoHttpRequestExt(request, response,
 				     send_buffer, recv_buffer,
-				     max_http_buffer_size);
+				     max_http_buffer_size,
+				     socket_set, socket);
+  if (socket_set != NULL)
+  {
+    if (socket != NULL)
+    {
+      SDLNet_TCP_DelSocket(socket_set, socket);
+      SDLNet_TCP_Close(socket);
+    }
+
+    SDLNet_FreeSocketSet(socket_set);
+  }
 
   checked_free(send_buffer);
   checked_free(recv_buffer);