diff options
author | goodale <goodale@1faa4e14-9dd3-4be0-9f0e-ffe519881164> | 2000-09-15 16:55:01 +0000 |
---|---|---|
committer | goodale <goodale@1faa4e14-9dd3-4be0-9f0e-ffe519881164> | 2000-09-15 16:55:01 +0000 |
commit | 39366eb76565d3516e78047cc96f09b66524bf13 (patch) | |
tree | 6d082e272009c941eb2fa406b409a116164897f3 /src/Content.c | |
parent | 17bd72bd47967b5836db85ed33087ef02299fa66 (diff) |
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
Diffstat (limited to 'src/Content.c')
-rw-r--r-- | src/Content.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/Content.c b/src/Content.c index b1f6c34..9681a0d 100644 --- a/src/Content.c +++ b/src/Content.c @@ -198,20 +198,20 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data) /* Status message */ strcpy(message,"HTTP/1.0 200 OK\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Content-Type */ strcpy(message,"Content-Type: text/html\r\n\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Start the page */ strcpy(message,"<HTML><HEAD><TITLE>Running CACTUS Status Information</TITLE>\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Write out the main header part */ - write(request->filedes, cactus_mainheader, strlen(cactus_mainheader)); + HTTP_Write(request, cactus_mainheader, strlen(cactus_mainheader)); /* Some blurb */ strcpy(message, "<br>" @@ -223,7 +223,7 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data) "<p>Depending on which other thorns are active, there may be additional " "features available, such as the viewing and downloading of output files</p>"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* CONFIGURATION DETAILS */ @@ -235,7 +235,7 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data) __DATE__ "</FONT> at <FONT COLOR=RED>"__TIME__ "</font></li>\n" "</ul>", CCTK_FullVersion()); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /******************************************************************************/ @@ -243,7 +243,7 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data) strcpy(message, "</td><td valign=top>"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /*******************************************************************************/ @@ -266,11 +266,11 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data) strcpy(message, "<li>Current cactus time is unknown</li>\n"); } - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); strcpy(message, "</ul>"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* LIST COMPILED THORNS */ @@ -315,19 +315,19 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data) free(thorns); } - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Finish table started by blurb */ strcpy(message, "</td></tr></table>"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Write out the footer part. */ - retval = write(request->filedes, cactus_footer, strlen(cactus_footer)); + retval = HTTP_Write(request, cactus_footer, strlen(cactus_footer)); - /* retval = write(request->filedes, base_page, strlen(base_page)); */ + /* retval = HTTP_Write(request, base_page, strlen(base_page)); */ return retval; } @@ -359,31 +359,31 @@ static int ParameterPage(cGH *cctkGH, httpRequest *request, void *data) /* Status message */ strcpy(message,"HTTP/1.0 200 OK\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Content-Type */ strcpy(message,"Content-Type: text/html\r\n\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Start the page */ strcpy(message,"<HTML><HEAD><TITLE>Running CACTUS Status Information</TITLE>\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Write out the main header part */ - write(request->filedes, cactus_header, strlen(cactus_header)); + HTTP_Write(request, cactus_header, strlen(cactus_header)); /* This is just a test to see what the actual page requested was. */ sprintf(message, "Residual is '%s'\n", request->residual); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); /* Write out the footer part. */ - retval = write(request->filedes, cactus_footer, strlen(cactus_footer)); + retval = HTTP_Write(request, cactus_footer, strlen(cactus_footer)); - /* retval = write(request->filedes, base_page, strlen(base_page)); */ + /* retval = HTTP_Write(request, base_page, strlen(base_page)); */ return retval; } @@ -460,13 +460,13 @@ static int ShowStaticPage(cGH *cctkGH, httpRequest *request, void *data) strcpy(message,"HTTP/1.0 200 OK\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); sprintf(message,"Content-Length: %d\r\nContent-Type: %s\r\n\r\n", page->length, page->mime_type); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); - retval = write(request->filedes, page->page, page->length); + retval = HTTP_Write(request, page->page, page->length); } else { @@ -684,42 +684,42 @@ static int TestPage(cGH *cctkGH, httpRequest *request, void *data) strcpy(message,"HTTP/1.0 200 OK\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)); if(request->n_arguments == 0) { - retval = write(request->filedes, test_page, strlen(test_page)); + retval = HTTP_Write(request, test_page, strlen(test_page)); } else { strcpy(message, "<html><head><title>Advanced Query</title></head>" "<body><H1> Query Result </H1><br>"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); sprintf(message, "Number of arguments is %d<hr>\n", request->n_arguments); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); value = HTTP_ArgumentValue(request, "text"); sprintf(message, "text = %s<hr>\n", value); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); value = HTTP_HeaderValue(request, "Host"); sprintf(message, "Host header = %s<hr>\n", value); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); strcpy(message, "</body></html>"); - retval = write(request->filedes, message, strlen(message)); + retval = HTTP_Write(request, message, strlen(message)); } return retval; @@ -747,33 +747,33 @@ static int AuthPage(cGH *cctkGH, httpRequest *request, void *data) { strcpy(message,"HTTP/1.0 200 Ok\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); strcpy(message,"WWW-Authenticate: Basic realm=\"foo\"\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, authorized_page, strlen(authorized_page)); + HTTP_Write(request, authorized_page, strlen(authorized_page)); } else { strcpy(message,"HTTP/1.0 401 Unauthorized\r\n"); - write(request->filedes, message, strlen(message)); + HTTP_Write(request, message, strlen(message)); strcpy(message,"WWW-Authenticate: Basic realm=\"foo\"\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, notauthorized_page, strlen(notauthorized_page)); + HTTP_Write(request, notauthorized_page, strlen(notauthorized_page)); } return 0; |