c51b31d7ac
I wasn't happy with how responses were generated. HTTP-headers were
handled by hand and it was duplicated in multiple parts of the code.
Due to the duplication, some functions like timestamp() had really
ugly semantics.
The HTTP requests are parsed much better: We have an enum of fields
we care about that are automatically read into our request struct. This
commit adapts this idea to the response: We have an enum of fields
we might put into our response, and a response-struct holds the
content of these fields. A function http_send_header() automatically
sends a header based on the entries in response. In case we don't
use a field, we just leave the field in the response-struct empty.
With this commit, some logical changes came with it:
- timestamp() now has a sane signature, TIMESTAMP_LEN is no more and
it can now return proper errors and is also reentrant by using
gmtime_r() instead of gmtime()
- No more use of a static timestamp-array, making all the methods
also reentrant
- Better internal-error-reporting: Because the fields are filled
before and not during sending the response-headers, we can better
report any internal errors as status 500 instead of sending a
partial non-500-header and then dying.
These improved data structures make it easier to read and hack the code
and implement new features, if desired.
Signed-off-by: Laslo Hunhold <dev@frign.de>
58 lines
1 KiB
C
58 lines
1 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#ifndef UTIL_H
|
|
#define UTIL_H
|
|
|
|
#include <regex.h>
|
|
#include <stddef.h>
|
|
#include <time.h>
|
|
|
|
#include "arg.h"
|
|
|
|
/* main server struct */
|
|
struct vhost {
|
|
char *chost;
|
|
char *regex;
|
|
char *dir;
|
|
char *prefix;
|
|
regex_t re;
|
|
};
|
|
|
|
struct map {
|
|
char *chost;
|
|
char *from;
|
|
char *to;
|
|
};
|
|
|
|
extern struct server {
|
|
char *host;
|
|
char *port;
|
|
char *docindex;
|
|
int listdirs;
|
|
struct vhost *vhost;
|
|
size_t vhost_len;
|
|
struct map *map;
|
|
size_t map_len;
|
|
} s;
|
|
|
|
#undef MIN
|
|
#define MIN(x,y) ((x) < (y) ? (x) : (y))
|
|
#undef MAX
|
|
#define MAX(x,y) ((x) > (y) ? (x) : (y))
|
|
#undef LEN
|
|
#define LEN(x) (sizeof (x) / sizeof *(x))
|
|
|
|
extern char *argv0;
|
|
|
|
void warn(const char *, ...);
|
|
void die(const char *, ...);
|
|
|
|
void epledge(const char *, const char *);
|
|
void eunveil(const char *, const char *);
|
|
|
|
int timestamp(char *, size_t, time_t);
|
|
int esnprintf(char *, size_t, const char *, ...);
|
|
|
|
void *reallocarray(void *, size_t, size_t);
|
|
long long strtonum(const char *, long long, long long, const char **);
|
|
|
|
#endif /* UTIL_H */
|