ghopp
/
server_playground
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

as i have a lot of static string initialization with the length of that sting a created and used a macro to prevent errors

master
Georg Hopp 14 years ago
parent
a0ec357e0a
commit
1d238aa55d
14 changed files with 60 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      include/utils/memory.h
  2. 7
      src/http/message/has_keep_alive.c
  3. 19
      src/http/response/304.c
  4. 11
      src/http/response/403.c
  5. 18
      src/http/response/404.c
  6. 30
      src/http/response/asset.c
  7. 19
      src/http/response/login_form.c
  8. 31
      src/http/response/me.c
  9. 17
      src/http/response/randval.c
  10. 46
      src/http/worker/add_common_header.c
  11. 5
      src/http/worker/get_asset.c
  12. 17
      src/http/worker/process.c
  13. 1
      src/server/poll.c
  14. 2
      src/socket.c

4
include/utils/memory.h
View File

@ -23,8 +23,12 @@
#ifndef __UTILS_MEMORY_H__ #ifndef __UTILS_MEMORY_H__
#define __UTILS_MEMORY_H__ #define __UTILS_MEMORY_H__
#define CSTRA(val) val, sizeof(val)-1 //!< Const STRing Argument
#define FREE(val) (ffree((void**)&(val))) #define FREE(val) (ffree((void**)&(val)))
void ffree(void **); void ffree(void **);
#endif // __UTILS_MEMORY_H__ #endif // __UTILS_MEMORY_H__
// vim: set ts=4 sw=4:

7
src/http/message/has_keep_alive.c
View File

@ -28,6 +28,8 @@
#include "http/request.h" #include "http/request.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#endif #endif
@ -43,10 +45,7 @@ httpMessageHasKeepAlive(HttpMessage message)
size_t size; size_t size;
char * value; char * value;
header = httpHeaderGet(
&(message->header),
"connection",
sizeof("connection")-1);
header = httpHeaderGet(&(message->header), CSTRA("connection"));
if (NULL == header) { if (NULL == header) {
return 0; return 0;

19
src/http/response/304.c
View File

@ -29,6 +29,7 @@
#include "http/message.h" #include "http/message.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
HttpResponse HttpResponse
httpResponse304( httpResponse304(
@ -47,23 +48,11 @@ httpResponse304(
message->body = NULL; message->body = NULL;
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Type",
sizeof("Content-Type")-1,
mime,
nmime));
new(HttpHeader, CSTRA("Content-Type"), mime, nmime));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"ETag",
sizeof("ETag")-1,
etag,
netag));
new(HttpHeader, CSTRA("ETag"), etag, netag));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Last-Modified",
sizeof("Last-Modified")-1,
mtime,
nmtime));
new(HttpHeader, CSTRA("Last-Modified"), mtime, nmtime));
return response; return response;
} }

11
src/http/response/403.c
View File

@ -38,8 +38,6 @@ httpResponse403()
{ {
HttpResponse response; HttpResponse response;
HttpMessage message; HttpMessage message;
char buffer[200];
size_t nbuf;
response = new(HttpResponse, "HTTP/1.1", 403, "Forbidden"); response = new(HttpResponse, "HTTP/1.1", 403, "Forbidden");
message = (HttpMessage)response; message = (HttpMessage)response;
@ -48,15 +46,6 @@ httpResponse403()
message->nbody = 0; message->nbody = 0;
message->body = NULL; message->body = NULL;
nbuf = sprintf(buffer, "%d", message->nbody);
httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Length",
sizeof("Content-Length")-1,
buffer,
nbuf));
return response; return response;
} }

18
src/http/response/404.c
View File

@ -32,6 +32,7 @@
#include "http/message.h" #include "http/message.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
#define RESP_DATA "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" \ #define RESP_DATA "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" \
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" \ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" \
@ -45,35 +46,20 @@
HttpResponse HttpResponse
httpResponse404() httpResponse404()
{ {
char buffer[200];
HttpResponse response; HttpResponse response;
HttpMessage message; HttpMessage message;
size_t nbuf;
response = new(HttpResponse, "HTTP/1.1", 404, "Not Found"); response = new(HttpResponse, "HTTP/1.1", 404, "Not Found");
message = (HttpMessage)response; message = (HttpMessage)response;
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Type",
sizeof("Content-Type")-1,
"text/html",
sizeof("text/html")-1));
new(HttpHeader, CSTRA("Content-Type"), CSTRA("text/html")));
message->type = HTTP_MESSAGE_BUFFERED; message->type = HTTP_MESSAGE_BUFFERED;
message->nbody = sizeof(RESP_DATA) - 1; message->nbody = sizeof(RESP_DATA) - 1;
message->body = malloc(sizeof(RESP_DATA)); message->body = malloc(sizeof(RESP_DATA));
memcpy(message->body, RESP_DATA, sizeof(RESP_DATA)); memcpy(message->body, RESP_DATA, sizeof(RESP_DATA));
nbuf = sprintf(buffer, "%d", message->nbody);
httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Length",
sizeof("Content-Length")-1,
buffer,
nbuf));
return response; return response;
} }

30
src/http/response/asset.c
View File

@ -33,6 +33,8 @@
#include "http/message.h" #include "http/message.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
HttpResponse HttpResponse
httpResponseAsset( httpResponseAsset(
@ -47,8 +49,6 @@ httpResponseAsset(
size_t netag; size_t netag;
char mtime[200]; char mtime[200];
size_t nmtime; size_t nmtime;
char clen[200];
size_t nclen;
struct stat st; struct stat st;
HttpResponse response; HttpResponse response;
HttpMessage message; HttpMessage message;
@ -72,32 +72,12 @@ httpResponseAsset(
message->handle = handle; message->handle = handle;
message->nbody = st.st_size; message->nbody = st.st_size;
nclen = sprintf(clen, "%d", message->nbody);
httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Type",
sizeof("Content-Type")-1,
mime,
nmime));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Length",
sizeof("Content-Length")-1,
clen,
nclen));
new(HttpHeader, CSTRA("Content-Type"), mime, nmime));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"ETag",
sizeof("ETag")-1,
etag,
netag));
new(HttpHeader, CSTRA("ETag"), etag, netag));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Last-Modified",
sizeof("Last-Modified")-1,
mtime,
nmtime));
new(HttpHeader, CSTRA("Last-Modified"), mtime, nmtime));
return response; return response;
} }

19
src/http/response/login_form.c
View File

@ -33,6 +33,8 @@
#include "http/message.h" #include "http/message.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
#define RESP_DATA "<form action=\"/me/\" method=\"POST\">" \ #define RESP_DATA "<form action=\"/me/\" method=\"POST\">" \
"<input name=\"username\" type=\"text\" />" \ "<input name=\"username\" type=\"text\" />" \
"<input type=\"submit\">" \ "<input type=\"submit\">" \
@ -41,20 +43,14 @@
HttpResponse HttpResponse
httpResponseLoginForm() httpResponseLoginForm()
{ {
char buffer[200];
HttpResponse response; HttpResponse response;
HttpMessage message; HttpMessage message;
size_t nbuf;
response = new(HttpResponse, "HTTP/1.1", 200, "OK"); response = new(HttpResponse, "HTTP/1.1", 200, "OK");
message = (HttpMessage)response; message = (HttpMessage)response;
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Type",
sizeof("Content-Type")-1,
"text/html",
sizeof("text/html")-1));
new(HttpHeader, CSTRA("Content-Type"), CSTRA("text/html")));
message->type = HTTP_MESSAGE_BUFFERED; message->type = HTTP_MESSAGE_BUFFERED;
@ -62,15 +58,6 @@ httpResponseLoginForm()
message->body = malloc(message->nbody); message->body = malloc(message->nbody);
memcpy(message->body, RESP_DATA, message->nbody); memcpy(message->body, RESP_DATA, message->nbody);
nbuf = sprintf(buffer, "%d", message->nbody);
httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Length",
sizeof("Content-Length")-1,
buffer,
nbuf));
return response; return response;
} }

31
src/http/response/me.c
View File

@ -33,6 +33,8 @@
#include "http/message.h" #include "http/message.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
#define RESP_DATA "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" \ #define RESP_DATA "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" \
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" \ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" \
@ -124,32 +126,18 @@
HttpResponse HttpResponse
httpResponseMe(char * uname) httpResponseMe(char * uname)
{ {
char buffer[200];
HttpResponse response; HttpResponse response;
HttpMessage message; HttpMessage message;
size_t nbuf;
response = new(HttpResponse, "HTTP/1.1", 200, "OK"); response = new(HttpResponse, "HTTP/1.1", 200, "OK");
message = (HttpMessage)response; message = (HttpMessage)response;
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Type",
sizeof("Content-Type")-1,
"text/html",
sizeof("text/html")-1));
new(HttpHeader, CSTRA("Content-Type"), CSTRA("text/html")));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Set-Cookie",
sizeof("Set-Cookie")-1,
"name=\"Georg Hopp\"",
sizeof("name=\"Georg Hopp\"")-1));
new(HttpHeader, CSTRA("Set-Cookie"), CSTRA("name=Georg+Hopp")));
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Set-Cookie",
sizeof("Set-Cookie")-1,
"profession=\"coder\"",
sizeof("profession=\"coder\"")-1));
new(HttpHeader, CSTRA("Set-Cookie"), CSTRA("profession=coder")));
message->type = HTTP_MESSAGE_BUFFERED; message->type = HTTP_MESSAGE_BUFFERED;
message->nbody = sizeof(RESP_DATA)-1-2+strlen(uname); //!< the two are the %s message->nbody = sizeof(RESP_DATA)-1-2+strlen(uname); //!< the two are the %s
@ -157,15 +145,6 @@ httpResponseMe(char * uname)
sprintf(message->body, RESP_DATA, uname); sprintf(message->body, RESP_DATA, uname);
//memcpy(message->body, RESP_DATA, sizeof(RESP_DATA)-1); //memcpy(message->body, RESP_DATA, sizeof(RESP_DATA)-1);
nbuf = sprintf(buffer, "%d", message->nbody);
httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Length",
sizeof("Content-Length")-1,
buffer,
nbuf));
return response; return response;
} }

17
src/http/response/randval.c
View File

@ -33,6 +33,8 @@
#include "http/message.h" #include "http/message.h"
#include "http/header.h" #include "http/header.h"
#include "utils/memory.h"
#define RESP_DATA "{\"ctime\":%ld,\"vnext\":%ld,\"value\":\"%02d\"}" #define RESP_DATA "{\"ctime\":%ld,\"vnext\":%ld,\"value\":\"%02d\"}"
HttpResponse HttpResponse
@ -48,11 +50,7 @@ httpResponseRandval(time_t ctime, int value)
message = (HttpMessage)response; message = (HttpMessage)response;
httpHeaderAdd(&(message->header), httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Type",
sizeof("Content-Type")-1,
"application/json",
sizeof("application/json")-1));
new(HttpHeader, CSTRA("Content-Type"), CSTRA("application/json")));
message->type = HTTP_MESSAGE_BUFFERED; message->type = HTTP_MESSAGE_BUFFERED;
@ -64,15 +62,6 @@ httpResponseRandval(time_t ctime, int value)
message->body = malloc(nbuf); message->body = malloc(nbuf);
memcpy(message->body, buffer, nbuf); memcpy(message->body, buffer, nbuf);
nbuf = sprintf(buffer, "%d", message->nbody);
httpHeaderAdd(&(message->header),
new(HttpHeader,
"Content-Length",
sizeof("Content-Length")-1,
buffer,
nbuf));
return response; return response;
} }

46
src/http/worker/add_common_header.c
View File

@ -7,49 +7,45 @@
#include "http/message.h" #include "http/message.h"
#include "http/response.h" #include "http/response.h"
#include "utils/memory.h"
void void
httpWorkerAddCommonHeader(HttpMessage request, HttpMessage response) httpWorkerAddCommonHeader(HttpMessage request, HttpMessage response)
{ {
time_t t; time_t t;
struct tm * tmp; struct tm * tmp;
char buffer[200]; char buffer[200];
size_t ndate;
size_t nbuf;
if (httpMessageHasKeepAlive(request)) { if (httpMessageHasKeepAlive(request)) {
httpHeaderAdd( httpHeaderAdd(
&(response->header), &(response->header),
new(HttpHeader,
"Connection",
sizeof("Connection")-1,
"Keep-Alive",
sizeof("Keep-Alive")-1));
new(HttpHeader, CSTRA("Connection"), CSTRA("Keep-Alive")));
} }
else { else {
httpHeaderAdd( httpHeaderAdd(
&(response->header), &(response->header),
new(HttpHeader,
"Connection",
sizeof("Connection")-1,
"Close",
sizeof("Close")-1));
new(HttpHeader, CSTRA("Connection"), CSTRA("Close")));
} }
httpHeaderAdd(&(response->header), httpHeaderAdd(&(response->header),
new(HttpHeader,
"Server",
sizeof("Server")-1,
"testserver",
sizeof("testserver")-1));
t = time(NULL);
tmp = localtime(&t);
ndate = strftime(buffer, sizeof(buffer), "%a, %d %b %Y %T %Z", tmp);
new(HttpHeader, CSTRA("Server"), CSTRA("testserver")));
switch(((HttpResponse)response)->status) {
case 304:
break;
default:
nbuf = sprintf(buffer, "%d", response->nbody);
httpHeaderAdd(&(response->header),
new(HttpHeader, CSTRA("Content-Length"), buffer, nbuf));
}
t = time(NULL);
tmp = localtime(&t);
nbuf = strftime(buffer, sizeof(buffer), "%a, %d %b %Y %T %Z", tmp);
httpHeaderAdd(&(response->header), httpHeaderAdd(&(response->header),
new(HttpHeader,
"Date",
sizeof("Date")-1,
buffer,
ndate));
new(HttpHeader, CSTRA("Date"), buffer, nbuf));
} }
// vim: set ts=4 sw=4: // vim: set ts=4 sw=4:

5
src/http/worker/get_asset.c
View File

@ -5,6 +5,8 @@
#include "http/request.h" #include "http/request.h"
#include "http/response.h" #include "http/response.h"
#include "utils/memory.h"
HttpMessage HttpMessage
httpWorkerGetAsset( httpWorkerGetAsset(
HttpRequest request, HttpRequest request,
@ -18,8 +20,7 @@ httpWorkerGetAsset(
header = httpHeaderGet( header = httpHeaderGet(
&(((HttpMessage)request)->header), &(((HttpMessage)request)->header),
"If-None-Match",
sizeof("If-None-Match")-1);
CSTRA("If-None-Match"));
if (NULL == header) { if (NULL == header) {
match = ""; match = "";

17
src/http/worker/process.c
View File

@ -36,6 +36,8 @@
#include "http/parser.h" #include "http/parser.h"
#include "session.h" #include "session.h"
#include "utils/memory.h"
HttpMessage httpWorkerGetAsset(HttpRequest, const char *, const char *, size_t); HttpMessage httpWorkerGetAsset(HttpRequest, const char *, const char *, size_t);
void httpWorkerAddCommonHeader(HttpMessage, HttpMessage); void httpWorkerAddCommonHeader(HttpMessage, HttpMessage);
@ -58,8 +60,7 @@ httpWorkerProcess(HttpWorker this, int fd)
HttpMessage response = NULL; HttpMessage response = NULL;
HttpHeader cookie = httpHeaderGet( HttpHeader cookie = httpHeaderGet(
&(rmessage->header), &(rmessage->header),
"cookie",
sizeof("Cookie")-1);
CSTRA("cookie"));
if (NULL == this->session && NULL != cookie) { if (NULL == this->session && NULL != cookie) {
int i; int i;
@ -111,11 +112,7 @@ httpWorkerProcess(HttpWorker this, int fd)
httpHeaderAdd( httpHeaderAdd(
&(response->header), &(response->header),
new(HttpHeader,
"Set-Cookie",
sizeof("Set-Cookie")-1,
buffer,
nbuf));
new(HttpHeader, CSTRA("Set-Cookie"), buffer, nbuf));
} }
} }
@ -144,16 +141,14 @@ httpWorkerProcess(HttpWorker this, int fd)
response = httpWorkerGetAsset( response = httpWorkerGetAsset(
request, request,
"./assets/waldschrat.jpg", "./assets/waldschrat.jpg",
"image/jpeg",
sizeof("image/jpeg")-1);
CSTRA("image/jpeg"));
} }
if (0 == strcmp("/jquery/", request->uri)) { if (0 == strcmp("/jquery/", request->uri)) {
response = httpWorkerGetAsset( response = httpWorkerGetAsset(
request, request,
"./assets/jquery-1.7.1.min.js", "./assets/jquery-1.7.1.min.js",
"text/javascript",
sizeof("text/javascript")-1);
CSTRA("text/javascript"));
} }
} }

1
src/server/poll.c
View File

@ -51,7 +51,6 @@ serverPoll(Server this) {
if (fda < fdb) { if (fda < fdb) {
memcpy(fda, fdb, sizeof(struct pollfd)); memcpy(fda, fdb, sizeof(struct pollfd));
//memset(fdb, 0, sizeof(struct pollfd)); // this might be unneccessary
fdb--; fdb--;
this->nfds--; this->nfds--;
} }

2
src/socket.c
View File

@ -56,7 +56,7 @@ socketCtor(void * _this, va_list * params)
} }
//! Make the socket REUSE a TIME_WAIT socket //! Make the socket REUSE a TIME_WAIT socket
setsockopt(this->handle, SOL_SOCKET, SO_REUSEADDR, &reUse, sizeof (reUse));
setsockopt(this->handle, SOL_SOCKET, SO_REUSEADDR, &reUse, sizeof(reUse));
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save