#include <dirent.h>
#include <stdio.h>
#include <stdlib.h>
+#include <time.h>
#include <unistd.h>
#include "debug.h"
+#include "file.h"
#include "http.h"
#include "server.h"
#define BUFFER_SIZE 4096
#define ROOT_DIR "webroot"
+#define TEMP_DIR "tmp"
+#define SERVER_NAME "localhost"
+#define CHARSET "iso-8859-1"
/* macros */
char *progname = NULL;
int port = 8080;
char *root = ROOT_DIR;
+char *temp = TEMP_DIR;
+char *servername = SERVER_NAME;
+char *charset = CHARSET;
/* help function */
{
FILE *fid = ret ? stderr : stdout;
fprintf (fid, "usage: %s\n", progname);
+ fprintf (fid, " -c : charset name (%s)\n", charset);
fprintf (fid, " -h : help message\n");
fprintf (fid, " -p : port number (%d)\n", port);
fprintf (fid, " -r : web root directory (%s)\n", root);
+ fprintf (fid, " -s : server name (%s)\n", servername);
+ fprintf (fid, " -t : temporay directory (%s)\n", temp);
fprintf (fid, " -v : verbose level (%d)\n", verbose);
return ret;
}
char c = arg[1];
switch (c) {
- case 'p':
+ case 'c':
+ arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+ if (arg == NULL) {
+ VERBOSE (ERROR, PERROR ("%s: missing charset name\n", progname); usage (1));
+ return 1;
+ }
+ charset = arg;
+ break;
+ case 'p':
arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
if (arg == NULL) {
VERBOSE (ERROR, PERROR ("%s: missing port number\n", progname); usage (1));
}
root = arg;
break;
+ case 's':
+ arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+ if (arg == NULL) {
+ VERBOSE (ERROR, PERROR ("%s: missing server name\n", progname); usage (1));
+ return 1;
+ }
+ servername = arg;
+ break;
+ case 't':
+ arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+ if (arg == NULL) {
+ VERBOSE (ERROR, PERROR ("%s: missing directory name\n", progname); usage (1));
+ return 1;
+ }
+ temp = arg;
+ break;
case 'v':
arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
if (arg == NULL) {
}
}
+ /* init seed */
+ srand (time (NULL));
+
/* check root directory */
VERBOSE (DEBUG, PRINT ("Check web root\n"));
- DIR *pdir = opendir (root);
- if (pdir == NULL) {
+ DIR *prootdir = opendir (root);
+ if (prootdir == NULL) {
VERBOSE (ERROR, PERROR ("Can't read directory (%s)\n", root));
return 1;
}
- closedir (pdir);
+ closedir (prootdir);
+
+ /* check temp directory */
+ VERBOSE (DEBUG, PRINT ("Check temp dirweb root\n"));
+ DIR *ptempdir = opendir (temp);
+ if (ptempdir == NULL) {
+ VERBOSE (ERROR, PERROR ("Can't read directory (%s)\n", temp));
+ return 1;
+ }
+ char *ntemp = tempname (temp, NULL);
+ FILE *ftemp = fopen (ntemp, "w");
+ if (ftemp == NULL) {
+ VERBOSE (ERROR, PERROR ("Can't write temporary file (%s)\n", ntemp));
+ return 1;
+ }
+ fclose (ftemp);
+ unlink (ntemp);
+ free (ntemp);
+
+ /* configuration */
+ conf_t conf = {root, temp, servername, charset};
/* init network stack */
VERBOSE (DEBUG, PRINT ("Initializing socket\n"));
VERBOSE (DEBUG, PRINT ("Server connected, waiting for data\n"));
- unsigned char *data = {0};
+ char *data = NULL;
+ char *output = NULL;
int len = receive_data (&data);
if (len == 0) {
// processing
VERBOSE (DEBUG, PRINT ("Processing %s\n", data));
- len = processing ((char *)data, len, root, (char **)&data);
+ len = processing (data, len, &conf, &output);
- int rc = send_data (data, len);
+ VERBOSE (DEBUG, PRINT ("Sending data (%d)\n%s\n", len, data));
+ int rc = send_data (output, len);
if (rc == 0) {
VERBOSE (WARNING, PRINT ("Connection closed by peer (tx)\n"));
} else if (rc < 0) {
if (data) {
free (data);
}
+ if (output) {
+ free (output);
+ }
close_connection ();
}
// test: webserver.exe -_ 2>&1 | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
// test: webserver.exe error 2>&1 | grep -q 'invalid option'
// test: webserver.exe -v 2>&1 | grep -q 'missing verbose level'
+// test: webserver.exe -c 2>&1 | grep -q 'missing charset name'
// test: webserver.exe -p 2>&1 | grep -q 'missing port number'
// test: webserver.exe -p -1 2>&1 | grep -q 'incorrect port number'
-// test: webserver.exe > test.log & pid=$!; sleep 1; kill -QUIT $pid; grep -q 'Listening socket on port 8080' test.log
-// test: webserver.exe -p 8000 > test.log & pid=$!; sleep 1; kill -ABRT $pid; grep -q 'Listening socket on port 8000' test.log
-// test: webserver.exe & pid=$!; sleep 1; kill -TERM $pid; ps aux | grep -q [w]ebserver.exe && kill -9 $pid || rc=1; test x$rc = x1
+// test: webserver.exe -s 2>&1 | grep -q 'missing server name'
+// test: webserver.exe -r 2>&1 | grep -q 'missing directory name'
+// test: webserver.exe >& test.log & pid=$!; sleep 1; kill -ABRT $pid; sleep 1; grep -q 'Listening socket on port 8080' test.log
+// test: webserver.exe -p 8000 >& test.log & pid=$!; sleep 1; kill -TERM $pid; sleep 1; grep -q 'Listening socket on port 8000' test.log
+// test: webserver.exe -p 8001 -c iso-8859-1 -r webroot -s localhost >&/dev/null & pid=$!; sleep 1; curl http://localhost:8001/index.html > test.log; kill -TERM $pid; sleep 1; grep -q '<title>Test</title>' test.log
+// test: webserver.exe -v 3 -p 8002 >&/dev/null & pid=$!; sleep 1; curl -v http://localhost:8002/index.html >& test.log; kill -TERM $pid; sleep 1; grep -q 200 test.log
+// test: webserver.exe -v 3 -p 8003 >&/dev/null & pid=$!; sleep 1; curl -v http://localhost:8003/not_found.html >& test.log; kill -TERM $pid; sleep 1; grep -q 404 test.log
+// test: webserver.exe -v 3 -p 8004 >&/dev/null & pid=$!; sleep 1; curl -v -I http://localhost:8004/index.html >& test.log; kill -TERM $pid; sleep 1; grep -q Content-Length test.log; test $? -eq 1
+// test: webserver.exe -v 3 -p 8005 >&/dev/null & pid=$!; sleep 1; curl -v -d '' http://localhost:8005/index.html >& test.log; kill -TERM $pid; sleep 1; grep -q '<title>Test</title>' test.log
/* vim: set ts=4 sw=4 et: */
Soft'N'Design Software / projects / webserver.git / blobdiff