-/*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file server.c Paraslash's main server. */
-
/**
- * \mainpage Starting points for getting an overview:
- *
- * - The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- * \ref audioc.c, \ref afh.c, \ref play.c,
- * - Server: \ref server_command, \ref sender,
- * - Audio file selector: \ref audio_format_handler, \ref afs_table,
- * - Client: \ref receiver, \ref receiver_node, \ref filter,
- * \ref filter_node, \ref writer_node.
- *
+ * \mainpage Main data structures and selected APIs:
*
- * The gory details, listed by topic:
- *
- * - Audio format handlers: \ref send_common.c \ref mp3_afh.c,
- * \ref ogg_afh.c, \ref aac_afh.c, \ref wma_afh.c, \ref spx_afh.c
- * - Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c,
- * \ref aacdec_filter.c, \ref wmadec_filter.c, spxdec_filter.c,
- * \ref flacdec_filter.c,
- * - Volume normalizer: \ref compress_filter.c,
- * - Output: \ref alsa_write.c, \ref osx_write.c, \ref oss_write.c,
- * - http: \ref http_recv.c, \ref http_send.c,
- * - udp: \ref udp_recv.c, \ref udp_send.c,
- * - dccp: \ref dccp_recv.c, \ref dccp_send.c,
- * - Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
- * - Afs structures: \ref afs_table, \ref audio_file_data,
- * \ref afs_info \ref afh_info,
- * - Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c,
- * \ref attribute.c, \ref score.c,
- * - The virtual streaming system: \ref vss.c, \ref chunk_queue.c.
- *
- * Lower levels:
- *
- * - Scheduling: \ref sched.c, \ref sched.h,
- * - Networking: \ref net.c,
- * - File descriptors: \ref fd.c,
- * - Signals: \ref signal.c,
- * - Daemons: \ref daemon.c,
- * - Strings: \ref string.c, \ref string.h,
+ * - Senders: \ref sender,
+ * - Audio file selector: \ref afs_info, \ref afs_table,
+ * - Audio format handler: \ref audio_format_handler, \ref afh_info
+ * - Receivers/filters/writers: \ref receiver, \ref receiver_node,
+ * \ref filter, \ref filter_node, \ref writer_node, \ref writer.
+ * - Scheduling: \ref sched.h,
+ * - Buffer trees: \ref buffer_tree.h,
+ * - Sideband API: \ref sideband.h,
+ * - Crypto: \ref crypt.h, \ref crypt_backend.h,
+ * - Error subsystem: \ref error.h,
+ * - Inter process communication: \ref ipc.h,
+ * - Forward error correction: \ref fec.h,
+ * - Daemons: \ref daemon.h,
+ * - Mixer API: \ref mix.h,
+ * - Interactive sessions: \ref interactive.h,
+ * - File descriptors: \ref fd.h,
+ * - Signals: \ref signal.h,
+ * - Networking: \ref net.h,
* - Time: \ref time.c,
- * - Spawning processes: \ref exec.c,
- * - Inter process communication: \ref ipc.c,
- * - Blob tables: \ref blob.c,
- * - The error subsystem: \ref error.h.
- * - Access control for paraslash senders: \ref acl.c, \ref acl.h.
- * - Internal crypto API: \ref crypt.h.
- * - interactive sessions (libreadline): \ref interactive.c.
- *
- * Low-level data structures:
- *
- * - Doubly linked lists: \ref list.h,
- * - Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
- * - openssl: \ref crypt.c
- * - libgcrypt: \ref gcrypt.c
- * - Forward error correction: \ref fec.c.
+ * - Doubly linked lists: \ref list.h.
*/
+#include <netinet/in.h>
+#include <sys/socket.h>
#include <signal.h>
#include <regex.h>
#include <osl.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <lopsub.h>
+#include "server.lsg.h"
#include "para.h"
#include "error.h"
#include "crypt.h"
-#include "server.cmdline.h"
#include "afh.h"
#include "string.h"
#include "afs.h"
#include "signal.h"
#include "user_list.h"
#include "color.h"
-#include "ggo.h"
#include "version.h"
-__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
-/** Define the array of error lists needed by para_server. */
-INIT_SERVER_ERRLISTS;
+__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
/** Shut down non-authorized connections after that many seconds. */
#define ALARM_TIMEOUT 10
/**
* Pointer to shared memory area for communication between para_server
- * and its children. Exported to vss.c. command.c and to afs.
+ * and its children. Exported to vss.c, command.c and to afs.
*/
struct misc_meta_data *mmd;
/**
- * The configuration of para_server
+ * The active value for all config options of para_server.
*
- * It also contains the options for the audio file selector, audio format
- * handler and all supported senders.
+ * It is computed by merging the parse result of the command line options with
+ * the parse result of the config file.
*/
-struct server_args_info conf;
+struct lls_parse_result *server_lpr = NULL;
+
+/* Command line options (no config file options). Used in handle_sighup(). */
+static struct lls_parse_result *cmdline_lpr;
-/** A random value used in child context for authentication. */
+/**
+ * A random number used to "authenticate" the afs connection.
+ *
+ * para_server picks this number by random before it forks the afs process. The
+ * command handlers know this number as well and write it to the afs socket,
+ * together with the id of the shared memory area which contains the payload of
+ * the afs command. A local process has to know this number to abuse the afs
+ * service provided by the local socket.
+ */
uint32_t afs_socket_cookie;
/** The mutex protecting the shared memory area containing the mmd struct. */
int mmd_mutex;
-/** The file containing user information (public key, permissions). */
-static char *user_list_file = NULL;
-
static struct sched sched;
+static struct signal_task *signal_task;
+
+/** The process id of the audio file selector process. */
+pid_t afs_pid = 0;
/** The task responsible for server command handling. */
struct server_command_task {
/** Argument vector passed to para_server's main function. */
char **argv;
/** The command task structure for scheduling. */
- struct task task;
+ struct task *task;
};
-static int want_colors(void)
-{
- if (conf.color_arg == color_arg_no)
- return 0;
- if (conf.color_arg == color_arg_yes)
- return 1;
- if (conf.logfile_given)
- return 0;
- return isatty(STDERR_FILENO);
-}
-
-static void init_colors_or_die(void)
+/**
+ * Return the list of tasks for the server process.
+ *
+ * This is called from \a com_tasks(). The helper is necessary since command
+ * handlers can not access the scheduler structure directly.
+ *
+ * \return A dynamically allocated string that must be freed by the caller.
+ */
+char *server_get_tasks(void)
{
- int i;
-
- if (!want_colors())
- return;
- daemon_set_flag(DF_COLOR_LOG);
- daemon_set_default_log_colors();
- for (i = 0; i < conf.log_color_given; i++)
- daemon_set_log_color_or_die(conf.log_color_arg[i]);
+ return get_task_list(&sched);
}
/*
/**
* (Re-)read the server configuration files.
*
- * \param override Passed to gengetopt to activate the override feature.
+ * \param reload Whether config file overrides command line.
*
- * This function also re-opens the logfile and sets the global \a
- * user_list_file variable.
+ * This function also re-opens the logfile and the user list. On SIGHUP it is
+ * called from both server and afs context.
*/
-void parse_config_or_die(int override)
+void parse_config_or_die(bool reload)
{
- char *home = para_homedir();
int ret;
- char *cf;
+ char *cf = NULL, *errctx = NULL, *user_list_file = NULL;
+ void *map;
+ size_t sz;
+ int cf_argc;
+ char **cf_argv;
+ struct lls_parse_result *cf_lpr, *merged_lpr;
+ char *home = para_homedir();
daemon_close_log();
- if (conf.config_file_given)
- cf = para_strdup(conf.config_file_arg);
+ if (OPT_GIVEN(CONFIG_FILE))
+ cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
else
cf = make_message("%s/.paraslash/server.conf", home);
- free(user_list_file);
- if (!conf.user_list_given)
- user_list_file = make_message("%s/.paraslash/server.users", home);
- else
- user_list_file = para_strdup(conf.user_list_arg);
- ret = file_exists(cf);
- if (conf.config_file_given && !ret) {
- ret = -1;
- PARA_EMERG_LOG("can not read config file %s\n", cf);
- goto out;
+ if (!mmd || getpid() != afs_pid) {
+ if (OPT_GIVEN(USER_LIST))
+ user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
+ else
+ user_list_file = make_message("%s/.paraslash/server.users", home);
}
- if (ret) {
- int tmp = conf.daemon_given;
- struct server_cmdline_parser_params params = {
- .override = override,
- .initialize = 0,
- .check_required = 1,
- .check_ambiguity = 0,
- .print_errors = !conf.daemon_given
- };
- server_cmdline_parser_config_file(cf, &conf, ¶ms);
- daemon_set_loglevel(conf.loglevel_arg);
- conf.daemon_given = tmp;
+ free(home);
+ ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
+ if (ret < 0) {
+ if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT))
+ goto free_cf;
+ if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
+ goto free_cf;
+ server_lpr = cmdline_lpr;
+ goto success;
}
- if (conf.logfile_given) {
- daemon_set_logfile(conf.logfile_arg);
+ ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
+ para_munmap(map, sz);
+ if (ret < 0)
+ goto free_cf;
+ cf_argc = ret;
+ ret = lls(lls_parse(cf_argc, cf_argv, CMD_PTR, &cf_lpr, &errctx));
+ lls_free_argv(cf_argv);
+ if (ret < 0)
+ goto free_cf;
+ if (reload) /* config file overrides command line */
+ ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
+ &errctx));
+ else /* command line options override config file options */
+ ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
+ &errctx));
+ lls_free_parse_result(cf_lpr, CMD_PTR);
+ if (ret < 0)
+ goto free_cf;
+ if (server_lpr != cmdline_lpr)
+ lls_free_parse_result(server_lpr, CMD_PTR);
+ server_lpr = merged_lpr;
+success:
+ daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+ if (OPT_GIVEN(LOGFILE)) {
+ daemon_set_logfile(OPT_STRING_VAL(LOGFILE));
daemon_open_log_or_die();
}
- init_colors_or_die();
+ if (daemon_init_colors_or_die(OPT_UINT32_VAL(COLOR), COLOR_AUTO,
+ COLOR_NO, OPT_GIVEN(LOGFILE))) {
+ int i;
+ for (i = 0; i < OPT_GIVEN(LOG_COLOR); i++)
+ daemon_set_log_color_or_die(lls_string_val(i,
+ OPT_RESULT(LOG_COLOR)));
+ }
daemon_set_flag(DF_LOG_PID);
daemon_set_flag(DF_LOG_LL);
daemon_set_flag(DF_LOG_TIME);
- if (conf.log_timing_given)
+ if (OPT_GIVEN(LOG_TIMING))
daemon_set_flag(DF_LOG_TIMING);
+ daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
+ if (user_list_file)
+ init_user_list(user_list_file);
ret = 1;
-out:
+free_cf:
free(cf);
- free(home);
- if (ret > 0)
- return;
free(user_list_file);
- user_list_file = NULL;
- exit(EXIT_FAILURE);
-}
-
-static void signal_pre_select(struct sched *s, struct task *t)
-{
- struct signal_task *st = container_of(t, struct signal_task, task);
- para_fd_set(st->fd, &s->rfds, &s->max_fileno);
+ if (ret < 0) {
+ if (errctx)
+ PARA_ERROR_LOG("%s\n", errctx);
+ free(errctx);
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
+ }
}
/*
*/
static void handle_sighup(void)
{
+
PARA_NOTICE_LOG("SIGHUP\n");
- parse_config_or_die(1); /* reopens log */
- init_user_list(user_list_file); /* reload user list */
- if (mmd->afs_pid)
- kill(mmd->afs_pid, SIGHUP);
+ parse_config_or_die(true);
+ if (afs_pid != 0)
+ kill(afs_pid, SIGHUP);
}
-static int signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused void *context)
{
int signum = para_next_signal(&s->rfds);
int ret = para_reap_child(&pid);
if (ret <= 0)
break;
- if (pid != mmd->afs_pid)
+ if (pid != afs_pid)
continue;
PARA_EMERG_LOG("fatal: afs died\n");
kill(0, SIGTERM);
* processes get killed immediately by the above kill().
*/
PARA_INFO_LOG("waiting for afs (pid %d) to die\n",
- (int)mmd->afs_pid);
- waitpid(mmd->afs_pid, NULL, 0);
+ (int)afs_pid);
+ waitpid(afs_pid, NULL, 0);
cleanup:
free(mmd->afd.afhi.chunk_table);
close_listed_fds();
static void init_signal_task(void)
{
- static struct signal_task signal_task_struct,
- *st = &signal_task_struct;
-
- st->task.pre_select = signal_pre_select;
- st->task.post_select = signal_post_select;
- sprintf(st->task.status, "signal task");
-
- PARA_NOTICE_LOG("setting up signal handling\n");
- st->fd = para_signal_init(); /* always successful */
+ signal_task = signal_init_or_die();
para_install_sighandler(SIGINT);
para_install_sighandler(SIGTERM);
para_install_sighandler(SIGHUP);
para_install_sighandler(SIGCHLD);
para_sigaction(SIGPIPE, SIG_IGN);
- add_close_on_fork_list(st->fd);
- register_task(&sched, &st->task);
+ add_close_on_fork_list(signal_task->fd);
+ signal_task->task = task_register(&(struct task_info) {
+ .name = "signal",
+ .pre_select = signal_pre_select,
+ .post_select = signal_post_select,
+ .context = signal_task,
+
+ }, &sched);
}
-static void command_pre_select(struct sched *s, struct task *t)
+static void command_pre_select(struct sched *s, void *context)
{
- struct server_command_task *sct = container_of(t, struct server_command_task, task);
+ struct server_command_task *sct = context;
para_fd_set(sct->listen_fd, &s->rfds, &s->max_fileno);
}
-static int command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, void *context)
{
- struct server_command_task *sct = container_of(t, struct server_command_task, task);
+ struct server_command_task *sct = context;
int new_fd, ret, i;
char *peer_name;
ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd);
if (ret <= 0)
goto out;
- peer_name = remote_name(new_fd);
- PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
mmd->num_connects++;
mmd->active_connections++;
/*
/* parent keeps accepting connections */
return 0;
}
+ peer_name = remote_name(new_fd);
+ PARA_INFO_LOG("accepted connection from %s\n", peer_name);
/* mmd might already have changed at this point */
free(chunk_table);
alarm(ALARM_TIMEOUT);
close_listed_fds();
- para_signal_shutdown();
+ signal_shutdown(signal_task);
/*
* put info on who we are serving into argv[0] to make
* client ip visible in top/ps
*/
for (i = sct->argc - 1; i >= 0; i--)
memset(sct->argv[i], 0, strlen(sct->argv[i]));
- sprintf(sct->argv[0], "para_server (serving %s)", peer_name);
- handle_connect(new_fd, peer_name);
+ i = sct->argc - 1 - lls_num_inputs(cmdline_lpr);
+ sprintf(sct->argv[i], "para_server (serving %s)", peer_name);
+ handle_connect(new_fd);
/* never reached*/
out:
if (ret < 0)
*sct = &server_command_task_struct;
PARA_NOTICE_LOG("initializing tcp command socket\n");
- sct->task.pre_select = command_pre_select;
- sct->task.post_select = command_post_select;
sct->argc = argc;
sct->argv = argv;
- ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);
+ ret = para_listen_simple(IPPROTO_TCP, OPT_UINT32_VAL(PORT));
if (ret < 0)
goto err;
sct->listen_fd = ret;
if (ret < 0)
goto err;
add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
- sprintf(sct->task.status, "server command task");
- register_task(&sched, &sct->task);
+ sct->task = task_register(&(struct task_info) {
+ .name = "server command",
+ .pre_select = command_pre_select,
+ .post_select = command_post_select,
+ .context = sct,
+ }, &sched);
return;
err:
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
static int init_afs(int argc, char **argv)
{
int ret, afs_server_socket[2];
- pid_t afs_pid;
+ char c;
- ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
+ ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket);
if (ret < 0)
exit(EXIT_FAILURE);
get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
exit(EXIT_FAILURE);
if (afs_pid == 0) { /* child (afs) */
int i;
+
+ afs_pid = getpid();
for (i = argc - 1; i >= 0; i--)
memset(argv[i], 0, strlen(argv[i]));
- sprintf(argv[0], "para_server (afs)");
+ i = argc - lls_num_inputs(cmdline_lpr) - 1;
+ sprintf(argv[i], "para_server (afs)");
close(afs_server_socket[0]);
- afs_init(afs_socket_cookie, afs_server_socket[1]);
+ afs_init(afs_server_socket[1]);
}
- mmd->afs_pid = afs_pid;
close(afs_server_socket[1]);
+ if (read(afs_server_socket[0], &c, 1) <= 0) {
+ PARA_EMERG_LOG("early afs exit\n");
+ exit(EXIT_FAILURE);
+ }
ret = mark_fd_nonblocking(afs_server_socket[0]);
if (ret < 0)
exit(EXIT_FAILURE);
return afs_server_socket[0];
}
-__noreturn static void print_help_and_die(void)
+static void handle_help_flags(void)
{
- struct ggo_help h = DEFINE_GGO_HELP(server);
- bool d = conf.detailed_help_given;
+ char *help;
+ bool d = OPT_GIVEN(DETAILED_HELP);
- ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
- exit(0);
+ if (d)
+ help = lls_long_help(CMD_PTR);
+ else if (OPT_GIVEN(HELP))
+ help = lls_short_help(CMD_PTR);
+ else
+ return;
+ printf("%s\n", help);
+ free(help);
+ exit(EXIT_SUCCESS);
}
static void server_init(int argc, char **argv)
{
- struct server_cmdline_parser_params params = {
- .override = 0,
- .initialize = 1,
- .check_required = 0,
- .check_ambiguity = 0,
- .print_errors = 1
- };
- int afs_socket;
+ int ret, afs_socket, daemon_pipe = -1;
+ char *errctx;
valid_fd_012();
- init_random_seed_or_die();
/* parse command line options */
- server_cmdline_parser_ext(argc, argv, &conf, ¶ms);
- daemon_set_loglevel(conf.loglevel_arg);
- version_handle_flag("server", conf.version_given);
- if (conf.help_given || conf.detailed_help_given)
- print_help_and_die();
- drop_privileges_or_die(conf.user_arg, conf.group_arg);
- /* parse config file, open log and set defaults */
- parse_config_or_die(0);
- log_welcome("para_server");
- init_ipc_or_die(); /* init mmd struct and mmd->lock */
- /* make sure, the global now pointer is uptodate */
- clock_get_realtime(now);
- set_server_start_time(now);
- init_user_list(user_list_file);
+ ret = lls(lls_parse(argc, argv, CMD_PTR, &cmdline_lpr, &errctx));
+ if (ret < 0)
+ goto fail;
+ server_lpr = cmdline_lpr;
+ daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+ daemon_drop_privileges_or_die(OPT_STRING_VAL(USER),
+ OPT_STRING_VAL(GROUP));
+ version_handle_flag("server", OPT_GIVEN(VERSION));
+ handle_help_flags();
+ parse_config_or_die(false);
/* become daemon */
- if (conf.daemon_given)
- daemonize(true /* parent waits for SIGTERM */);
+ if (OPT_GIVEN(DAEMON))
+ daemon_pipe = daemonize(true /* parent waits for SIGTERM */);
+ init_random_seed_or_die();
+ daemon_log_welcome("server");
+ init_ipc_or_die(); /* init mmd struct and mmd->lock */
+ daemon_set_start_time();
PARA_NOTICE_LOG("initializing audio format handlers\n");
afh_init();
* Although afs uses its own signal handling we must ignore SIGUSR1
* _before_ the afs child process gets born by init_afs() below. It's
* racy to do this in the child because the parent might send SIGUSR1
- * before the child gets a chance to ignore this signal -- only the
- * good die young.
- */
- para_sigaction(SIGUSR1, SIG_IGN);
- /*
- * We have to block SIGCHLD before the afs process is being forked off.
- * Otherwise, para_server does not notice if afs dies before the
+ * before the child gets a chance to ignore this signal.
+ *
+ * We also have to block SIGCHLD before the afs process is created
+ * because otherwise para_server does not notice if afs dies before the
* SIGCHLD handler has been installed for the parent process by
* init_signal_task() below.
*/
+ para_sigaction(SIGUSR1, SIG_IGN);
para_block_signal(SIGCHLD);
PARA_NOTICE_LOG("initializing the audio file selector\n");
afs_socket = init_afs(argc, argv);
init_signal_task();
para_unblock_signal(SIGCHLD);
PARA_NOTICE_LOG("initializing virtual streaming system\n");
- init_vss_task(afs_socket, &sched);
+ vss_init(afs_socket, &sched);
init_server_command_task(argc, argv);
- if (conf.daemon_given)
- kill(getppid(), SIGTERM);
+ if (daemon_pipe >= 0) {
+ if (write(daemon_pipe, "\0", 1) < 0) {
+ PARA_EMERG_LOG("daemon_pipe: %s", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ close(daemon_pipe);
+ }
PARA_NOTICE_LOG("server init complete\n");
+ return;
+fail:
+ assert(ret < 0);
+ if (errctx)
+ PARA_ERROR_LOG("%s\n", errctx);
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
}
static void status_refresh(void)
{
static int prev_uptime = -1, prev_events = -1;
- int uptime = get_server_uptime(now);
+ int uptime = daemon_get_uptime(now);
if (prev_events != mmd->events)
goto out;
prev_uptime = uptime;
prev_events = mmd->events;
mmd->vss_status_flags = mmd->new_vss_status_flags;
- PARA_DEBUG_LOG("%d events, forcing status update\n", mmd->events);
+ PARA_DEBUG_LOG("%u events, forcing status update\n", mmd->events);
killpg(0, SIGUSR1);
}
server_init(argc, argv);
mutex_lock(mmd_mutex);
ret = schedule(&sched);
- if (ret < 0) {
+ sched_shutdown(&sched);
+ lls_free_parse_result(server_lpr, CMD_PTR);
+ if (server_lpr != cmdline_lpr)
+ lls_free_parse_result(cmdline_lpr, CMD_PTR);
+ if (ret < 0)
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- exit(EXIT_FAILURE);
- }
- exit(EXIT_SUCCESS);
+ exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
}
projects / paraslash.git / blobdiff