New function HTTP_Write(request,buffer,size);

This should be used rather than write(request->filedes,...
as then we can add error checking, SSL, etc in transparently.

Tom


git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@14 1faa4e14-9dd3-4be0-9f0e-ffe519881164

1 files changed, 29 insertions, 6 deletions

diff --git a/src/Server.c b/src/Server.c
index b72c3a6..d70d8cf 100644
--- a/src/Server.c
+++ b/src/Server.c
@@ -95,14 +95,14 @@ int HTTP_RequestGET(cGH *cctkGH, httpRequest *request)
   {
     strcpy(message,"HTTP/1.0 404 Not Found\r\n");
     
-    write(request->filedes, message, strlen(message));
+    HTTP_Write(request, message, strlen(message));
 
     strcpy(message,"Content-Type: text/html\r\n\r\n");
 
-    write(request->filedes, message, strlen(message));
+    HTTP_Write(request, message, strlen(message));
 
     
-    write(request->filedes, notfound_page, strlen(notfound_page));
+    HTTP_Write(request, notfound_page, strlen(notfound_page));
   }
 
   return retval;
@@ -128,14 +128,14 @@ int HTTP_RequestUnsupported(cGH *cctkGH, httpRequest *request)
 
   strcpy(message,"HTTP/1.0 501 Not Implemented\r\n");
     
-  write(request->filedes, message, strlen(message));
+  HTTP_Write(request, message, strlen(message));
 
   strcpy(message,"Content-Type: text/html\r\n\r\n");
   
-  write(request->filedes, message, strlen(message));
+  HTTP_Write(request, message, strlen(message));
   
     
-  write(request->filedes, notimplemented_page, strlen(notimplemented_page));
+  HTTP_Write(request, notimplemented_page, strlen(notimplemented_page));
 
   return 0;
 }
@@ -188,6 +188,29 @@ int HTTP_RegisterPage(const char *path, int (*function)(cGH *, httpRequest *, vo
   return 0;
 }
 
+ /*@@
+   @routine    HTTP_Write
+   @date       Fri Sep 15 18:47:41 2000
+   @author     Tom Goodale
+   @desc 
+   Writes part or all of an HTTP reply.
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+int HTTP_Write(httpRequest *request, const char *buffer, size_t count)
+{
+  int retval;
+  
+  /* Currently don't do anything fancy. */
+  retval = HTTP_Write(request, buffer, count);
+
+  return retval;
+}
 
 /********************************************************************
  *********************     Local Routines   *************************