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>
74 lines
1.4 KiB
C
74 lines
1.4 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#ifndef HTTP_H
|
|
#define HTTP_H
|
|
|
|
#include <limits.h>
|
|
|
|
#define HEADER_MAX 4096
|
|
#define FIELD_MAX 200
|
|
|
|
enum req_field {
|
|
REQ_HOST,
|
|
REQ_RANGE,
|
|
REQ_MOD,
|
|
NUM_REQ_FIELDS,
|
|
};
|
|
|
|
extern const char *req_field_str[];
|
|
|
|
enum req_method {
|
|
M_GET,
|
|
M_HEAD,
|
|
NUM_REQ_METHODS,
|
|
};
|
|
|
|
extern const char *req_method_str[];
|
|
|
|
struct request {
|
|
enum req_method method;
|
|
char target[PATH_MAX];
|
|
char field[NUM_REQ_FIELDS][FIELD_MAX];
|
|
};
|
|
|
|
enum status {
|
|
S_OK = 200,
|
|
S_PARTIAL_CONTENT = 206,
|
|
S_MOVED_PERMANENTLY = 301,
|
|
S_NOT_MODIFIED = 304,
|
|
S_BAD_REQUEST = 400,
|
|
S_FORBIDDEN = 403,
|
|
S_NOT_FOUND = 404,
|
|
S_METHOD_NOT_ALLOWED = 405,
|
|
S_REQUEST_TIMEOUT = 408,
|
|
S_RANGE_NOT_SATISFIABLE = 416,
|
|
S_REQUEST_TOO_LARGE = 431,
|
|
S_INTERNAL_SERVER_ERROR = 500,
|
|
S_VERSION_NOT_SUPPORTED = 505,
|
|
};
|
|
|
|
extern const char *status_str[];
|
|
|
|
enum res_field {
|
|
RES_ACCEPT_RANGES,
|
|
RES_ALLOW,
|
|
RES_LOCATION,
|
|
RES_LAST_MODIFIED,
|
|
RES_CONTENT_LENGTH,
|
|
RES_CONTENT_RANGE,
|
|
RES_CONTENT_TYPE,
|
|
NUM_RES_FIELDS,
|
|
};
|
|
|
|
extern const char *res_field_str[];
|
|
|
|
struct response {
|
|
enum status status;
|
|
char field[NUM_RES_FIELDS][FIELD_MAX];
|
|
};
|
|
|
|
enum status http_send_header(int, const struct response *);
|
|
enum status http_send_status(int, enum status);
|
|
int http_get_request(int, struct request *);
|
|
enum status http_send_response(int, struct request *);
|
|
|
|
#endif /* HTTP_H */
|