lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Remove parent stds and added --geoip

Browse Source
This commit is contained in:
Lorenz Stechauner
2020-12-22 20:22:07 +01:00
parent 14bcc47db2
commit 562cfb04e6
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/necronda-server.c
View File

@ -172,9 +172,6 @@ int main(int argc, const char *argv[]) {
struct timeval timeout; struct timeval timeout;
parent_stdout = stdout;
parent_stderr = stderr;
const struct sockaddr_in6 addresses[2] = { const struct sockaddr_in6 addresses[2] = {
{.sin6_family = AF_INET6, .sin6_addr = IN6ADDR_ANY_INIT, .sin6_port = htons(80)}, {.sin6_family = AF_INET6, .sin6_addr = IN6ADDR_ANY_INIT, .sin6_port = htons(80)},
{.sin6_family = AF_INET6, .sin6_addr = IN6ADDR_ANY_INIT, .sin6_port = htons(443)} {.sin6_family = AF_INET6, .sin6_addr = IN6ADDR_ANY_INIT, .sin6_port = htons(443)}
@ -190,6 +187,7 @@ int main(int argc, const char *argv[]) {
"\n" "\n"
"Options:\n" "Options:\n"
" -c, --cert <CERT-FILE> path to the full chain certificate file\n" " -c, --cert <CERT-FILE> path to the full chain certificate file\n"
" -g, --geoip <DB-FILE> path to a Maxmind GeoIP Database file\n"
" -h, --help print this dialogue\n" " -h, --help print this dialogue\n"
" -p, --privkey <KEY-FILE> path to the private key file\n" " -p, --privkey <KEY-FILE> path to the private key file\n"
" -w, --webroot <PATH> path to the web root directory\n"); " -w, --webroot <PATH> path to the web root directory\n");
@ -212,6 +210,12 @@ int main(int argc, const char *argv[]) {
return 1; return 1;
} }
key_file = argv[++i]; key_file = argv[++i];
} else if ((len == 2 && strncmp(arg, "-g", 2) == 0) || (len == 7 && strncmp(arg, "--geoip", 7) == 0)) {
if (i == argc - 1) {
fprintf(stderr, ERR_STR "Unable to parse argument %s, usage: --geoip <DB-FILE>" CLR_STR "\n", arg);
return 1;
}
geoip_file = argv[++i];
} else { } else {
fprintf(stderr, ERR_STR "Unable to parse argument '%s'" CLR_STR "\n", arg); fprintf(stderr, ERR_STR "Unable to parse argument '%s'" CLR_STR "\n", arg);
return 1; return 1;
@ -312,7 +316,7 @@ int main(int argc, const char *argv[]) {
if (FD_ISSET(sockets[i], &read_socket_fds)) { if (FD_ISSET(sockets[i], &read_socket_fds)) {
client_fd = accept(sockets[i], (struct sockaddr *) &client_addr, &client_addr_len); client_fd = accept(sockets[i], (struct sockaddr *) &client_addr, &client_addr_len);
if (client_fd == -1) { if (client_fd == -1) {
fprintf(parent_stderr, ERR_STR "Unable to accept connection: %s" CLR_STR "\n", strerror(errno)); fprintf(stderr, ERR_STR "Unable to accept connection: %s" CLR_STR "\n", strerror(errno));
continue; continue;
} }

4
src/necronda-server.h
View File

@ -59,9 +59,7 @@
int sockets[NUM_SOCKETS]; int sockets[NUM_SOCKETS];
pid_t children[MAX_CHILDREN]; pid_t children[MAX_CHILDREN];
FILE *parent_stdout, *parent_stderr; const char *cert_file, *key_file, *webroot_base, *geoip_file;
const char *cert_file, *key_file, *webroot_base;
typedef struct { typedef struct {
unsigned int enc:1; unsigned int enc:1;

4
src/utils.h
View File

@ -10,8 +10,8 @@
char *log_prefix; char *log_prefix;
#define out_1(fmt) fprintf(parent_stdout, "%s" fmt "\n", log_prefix) #define out_1(fmt) fprintf(stdout, "%s" fmt "\n", log_prefix)
#define out_2(fmt, args...) fprintf(parent_stdout, "%s" fmt "\n", log_prefix, args) #define out_2(fmt, args...) fprintf(stdout, "%s" fmt "\n", log_prefix, args)
#define out_x(x, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, FUNC, ...) FUNC #define out_x(x, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, FUNC, ...) FUNC