#include "buffer.h"
#define DAEMON_NAME "pfix-srsd"
-#define DEFAULT_ENCODER_PORT 10000
-#define DEFAULT_DECODER_PORT 10001
+#define DEFAULT_ENCODER_PORT 10001
+#define DEFAULT_DECODER_PORT 10002
#define RUNAS_USER "nobody"
#define RUNAS_GROUP "nogroup"
" (default: "STR(DEFAULT_DECODER_PORT)")\n"
" -p <pidfile> 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)
{
- int exitcode = EXIT_SUCCESS;
-
if (start_listener(port_enc, false) < 0)
return EXIT_FAILURE;
if (start_listener(port_dec, true) < 0)
if (n < 0) {
if (errno != EAGAIN && errno != EINTR) {
UNIXERR("epoll_wait");
- exitcode = EXIT_FAILURE;
- break;
+ return EXIT_FAILURE;
}
continue;
}
}
}
- return exitcode;
+ return EXIT_SUCCESS;
}
static srs_t *srs_read_secrets(const char *sfile)
int main(int argc, char *argv[])
{
bool unsafe = false;
+ bool daemonize = true;
int port_enc = DEFAULT_ENCODER_PORT;
int port_dec = DEFAULT_DECODER_PORT;
const char *pidfile = NULL;
- FILE *f = NULL;
int res;
srs_t *srs;
- common_initialize();
-
- for (int c = 0; (c = getopt(argc, argv, "hu" "e:d:p:")) >= 0; ) {
+ for (int c = 0; (c = getopt(argc, argv, "hfu" "e:d:p:")) >= 0; ) {
switch (c) {
case 'e':
port_enc = atoi(optarg);
break;
+ case 'f':
+ daemonize = false;
+ break;
case 'd':
port_dec = atoi(optarg);
break;
return EXIT_FAILURE;
}
- if (pidfile) {
- f = fopen(pidfile, "w");
- if (!f) {
- syslog(LOG_CRIT, "unable to write pidfile %s", pidfile);
- }
- fprintf(f, "%d\n", getpid());
- fflush(f);
+ 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) {
return EXIT_FAILURE;
}
- if (daemon_detach() < 0) {
+ if (daemonize && daemon_detach() < 0) {
syslog(LOG_CRIT, "unable to fork");
return EXIT_FAILURE;
}
- if (f) {
- rewind(f);
- ftruncate(fileno(f), 0);
- fprintf(f, "%d\n", getpid());
- fflush(f);
- }
+ pidfile_refresh();
res = main_loop(srs, argv[optind], port_enc, port_dec);
- if (f) {
- rewind(f);
- ftruncate(fileno(f), 0);
- fclose(f);
- f = NULL;
- }
syslog(LOG_INFO, "Stopping...");
return res;
}