X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-srsd.c;h=67bda8873f894daa7739110df264beda5bfab82e;hb=8edd7234e1c30a16d914292dc652046ee581fa5b;hp=ce4113b3a6fd8703794c4e596e6169415b5204c8;hpb=8a872b1a9ec12dd44292603137c41f1b29b9f756;p=apps%2Fpfixtools.git diff --git a/main-srsd.c b/main-srsd.c index ce4113b..67bda88 100644 --- a/main-srsd.c +++ b/main-srsd.c @@ -31,6 +31,7 @@ /* * Copyright © 2005-2007 Pierre Habouzit + * Copyright © 2008 Florent Bruneau */ #include "common.h" @@ -40,6 +41,7 @@ #include "epoll.h" #include "mem.h" #include "buffer.h" +#include "server.h" #define DAEMON_NAME "pfix-srsd" #define DEFAULT_ENCODER_PORT 10001 @@ -47,37 +49,44 @@ #define RUNAS_USER "nobody" #define RUNAS_GROUP "nogroup" -#define __tostr(x) #x -#define STR(x) __tostr(x) +DECLARE_MAIN -/* srs encoder/decoder/listener worker {{{ */ +typedef struct srs_config_t { + srs_t* srs; + const char* domain; +} srs_config_t; -typedef struct srsd_t { - unsigned listener : 1; - unsigned decoder : 1; - int fd; - buffer_t ibuf; - buffer_t obuf; -} srsd_t; -static srsd_t *srsd_new(void) +/* Server {{{1 + */ + +static const char* const decoder_ptr = "decoder"; +static const char* const encoder_ptr = "encoder"; + +static void *srsd_new_decoder(void) { - srsd_t *srsd = p_new(srsd_t, 1); - srsd->fd = -1; - return srsd; + return (void*)decoder_ptr; } -static void srsd_delete(srsd_t **srsd) +static void *srsd_new_encoder(void) { - if (*srsd) { - if ((*srsd)->fd >= 0) - close((*srsd)->fd); - buffer_wipe(&(*srsd)->ibuf); - buffer_wipe(&(*srsd)->obuf); - p_delete(srsd); - } + return (void*)encoder_ptr; +} + +static void *srsd_starter(server_t *server) +{ + return server->data; } +int start_listener(int port, bool decoder) +{ + return start_server(port, decoder ? srsd_new_decoder : srsd_new_encoder, NULL); +} + + +/* Processing {{{1 + */ + void urldecode(char *s, char *end) { char *p = s; @@ -98,8 +107,9 @@ void urldecode(char *s, char *end) *s++ = '\0'; } -int process_srs(srs_t *srs, const char *domain, srsd_t *srsd) +int process_srs(server_t *srsd, void* vconfig) { + srs_config_t* config = vconfig; int res = buffer_read(&srsd->ibuf, srsd->fd, -1); if ((res < 0 && errno != EINTR && errno != EAGAIN) || res == 0) @@ -115,6 +125,9 @@ int process_srs(srs_t *srs, const char *domain, srsd_t *srsd) syslog(LOG_ERR, "unreasonnable amount of data without a \\n"); return -1; } + if (srsd->obuf.len) { + epoll_modify(srsd->fd, EPOLLIN | EPOLLOUT, srsd); + } return 0; } @@ -134,10 +147,10 @@ int process_srs(srs_t *srs, const char *domain, srsd_t *srsd) urldecode(p, q); - if (srsd->decoder) { - err = srs_reverse(srs, buf, ssizeof(buf), p); + if (srsd->data == (void*)decoder_ptr) { + err = srs_reverse(config->srs, buf, ssizeof(buf), p); } else { - err = srs_forward(srs, buf, ssizeof(buf), p, domain); + err = srs_forward(config->srs, buf, ssizeof(buf), p, config->domain); } if (err == 0) { @@ -160,143 +173,49 @@ int process_srs(srs_t *srs, const char *domain, srsd_t *srsd) skip: buffer_consume(&srsd->ibuf, nl - srsd->ibuf.data); } - - return 0; -} - -int start_listener(int port, bool decoder) -{ - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_addr = { htonl(INADDR_LOOPBACK) }, - }; - srsd_t *tmp; - int sock; - - addr.sin_port = htons(port); - sock = tcp_listen_nonblock((const struct sockaddr *)&addr, sizeof(addr)); - if (sock < 0) { - return -1; + if (srsd->obuf.len) { + epoll_modify(srsd->fd, EPOLLIN | EPOLLOUT, srsd); } - - tmp = srsd_new(); - tmp->fd = sock; - tmp->decoder = decoder; - tmp->listener = true; - epoll_register(sock, EPOLLIN, tmp); return 0; } -void start_client(srsd_t *srsd) -{ - srsd_t *tmp; - int sock; - - sock = accept_nonblock(srsd->fd); - if (sock < 0) { - UNIXERR("accept"); - return; - } - tmp = srsd_new(); - tmp->decoder = srsd->decoder; - tmp->fd = sock; - epoll_register(sock, EPOLLIN, tmp); -} +/* config {{{1 + */ -/* }}} */ -/* administrivia {{{ */ +static srs_config_t config = { + .srs = NULL, + .domain = NULL +}; -static int main_initialize(void) -{ - openlog(DAEMON_NAME, LOG_PID, LOG_MAIL); - signal(SIGPIPE, SIG_IGN); - signal(SIGINT, &common_sighandler); - signal(SIGTERM, &common_sighandler); - signal(SIGHUP, &common_sighandler); - signal(SIGSEGV, &common_sighandler); - syslog(LOG_INFO, "Starting..."); - return 0; -} +/** overload srs_free since the lib is not properly maintained. + */ +#undef srs_free -static void main_shutdown(void) +inline void srs_free(srs_t* srs) { - closelog(); + int i; + for (i = 0; i < srs->numsecrets; i++) { + memset(srs->secrets[i], 0, strlen(srs->secrets[i])); + free(srs->secrets[i]); + srs->secrets[i] = '\0'; + } + if (srs->secrets) { + free(srs->secrets); + } + free(srs); } -module_init(main_initialize); -module_exit(main_shutdown); - -void usage(void) +static void config_shutdown(void) { - fputs("usage: "DAEMON_NAME" [options] domain secrets\n" - "\n" - "Options:\n" - " -e port to listen to for encoding requests\n" - " (default: "STR(DEFAULT_ENCODER_PORT)")\n" - " -d port to listen to for decoding requests\n" - " (default: "STR(DEFAULT_DECODER_PORT)")\n" - " -p file to write our pid to\n" - " -u unsafe mode: don't drop privilegies\n" - " -f stay in foreground\n" - , stderr); -} - -/* }}} */ - -int main_loop(srs_t *srs, const char *domain, int port_enc, int port_dec) -{ - if (start_listener(port_enc, false) < 0) - return EXIT_FAILURE; - if (start_listener(port_dec, true) < 0) - return EXIT_FAILURE; - - while (!sigint) { - struct epoll_event evts[1024]; - int n; - - n = epoll_select(evts, countof(evts), -1); - if (n < 0) { - if (errno != EAGAIN && errno != EINTR) { - UNIXERR("epoll_wait"); - return EXIT_FAILURE; - } - continue; - } - - while (--n >= 0) { - srsd_t *srsd = evts[n].data.ptr; - - if (srsd->listener) { - start_client(srsd); - continue; - } - - if (evts[n].events & EPOLLIN) { - if (process_srs(srs, domain, srsd) < 0) { - srsd_delete(&srsd); - continue; - } - if (srsd->obuf.len) { - epoll_register(srsd->fd, EPOLLIN | EPOLLOUT, srsd); - } - } - - if ((evts[n].events & EPOLLOUT) && srsd->obuf.len) { - if (buffer_write(&srsd->obuf, srsd->fd) < 0) { - srsd_delete(&srsd); - continue; - } - if (!srsd->obuf.len) { - epoll_modify(srsd->fd, EPOLLIN, srsd); - } - } - } + if (config.srs) { + srs_free(config.srs); + config.srs = NULL; } - - return EXIT_SUCCESS; } +module_exit(config_shutdown); + static srs_t *srs_read_secrets(const char *sfile) { srs_t *srs; @@ -338,6 +257,27 @@ static srs_t *srs_read_secrets(const char *sfile) return NULL; } +/* administrivia {{{1 + */ + +void usage(void) +{ + fputs("usage: "DAEMON_NAME" [options] domain secrets\n" + "\n" + "Options:\n" + " -e port to listen to for encoding requests\n" + " (default: "STR(DEFAULT_ENCODER_PORT)")\n" + " -d port to listen to for decoding requests\n" + " (default: "STR(DEFAULT_DECODER_PORT)")\n" + " -p file to write our pid to\n" + " -u unsafe mode: don't drop privilegies\n" + " -f stay in foreground\n" + , stderr); +} + +/* }}} + */ + int main(int argc, char *argv[]) { bool unsafe = false; @@ -346,9 +286,6 @@ int main(int argc, char *argv[]) int port_dec = DEFAULT_DECODER_PORT; const char *pidfile = NULL; - int res; - srs_t *srs; - for (int c = 0; (c = getopt(argc, argv, "hfu" "e:d:p:")) >= 0; ) { switch (c) { case 'e': @@ -377,28 +314,14 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - srs = srs_read_secrets(argv[optind + 1]); - if (!srs) { - return EXIT_FAILURE; - } - - if (pidfile_open(pidfile) < 0) { - syslog(LOG_CRIT, "unable to write pidfile %s", pidfile); - return EXIT_FAILURE; - } - - if (!unsafe && drop_privileges(RUNAS_USER, RUNAS_GROUP) < 0) { - syslog(LOG_CRIT, "unable to drop privileges"); - return EXIT_FAILURE; - } - - if (daemonize && daemon_detach() < 0) { - syslog(LOG_CRIT, "unable to fork"); + config.domain = argv[optind]; + config.srs = srs_read_secrets(argv[optind + 1]); + if (!config.srs + || common_setup(pidfile, unsafe, RUNAS_USER, RUNAS_GROUP, + daemonize) != EXIT_SUCCESS + || start_listener(port_enc, false) < 0 + || start_listener(port_dec, true) < 0) { return EXIT_FAILURE; } - - pidfile_refresh(); - res = main_loop(srs, argv[optind], port_enc, port_dec); - syslog(LOG_INFO, "Stopping..."); - return res; + return server_loop(srsd_starter, NULL, process_srs, &config); }