/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "afs.h"
#include "server.h"
#include "vss.h"
+#include "list.h"
#include "send.h"
#include "rc4.h"
#include "net.h"
#include "daemon.h"
#include "fd.h"
-#include "list.h"
#include "user_list.h"
#include "server_command_list.h"
#include "afs_command_list.h"
static RC4_KEY rc4_send_key;
static unsigned char rc4_buf[2 * RC4_KEY_LEN];
-extern const char *status_item_list[NUM_STAT_ITEMS];
extern struct misc_meta_data *mmd;
extern struct sender senders[];
-static void dummy(__a_unused int s)
-{}
+static void dummy(int s)
+{
+ /*
+ * At least on Solaris, SIGUSR1 is one-shot, i.e. the signal action is
+ * restored to the default state once the signal handler has been
+ * called.
+ */
+ if (s == SIGUSR1)
+ signal(SIGUSR1, dummy);
+}
static void mmd_dup(struct misc_meta_data *new_mmd)
{
static char *get_status(struct misc_meta_data *nmmd)
{
- char *basename, *dirname, *ret, mtime[30] = "";
+ char *ret, mtime[30] = "";
char *status, *flags; /* vss status info */
char *ut = uptime_str();
long offset = (nmmd->offset + 500) / 1000;
/* report real status */
status = vss_status_tohuman(nmmd->vss_status_flags);
flags = vss_get_status_flags(nmmd->vss_status_flags);
- basename = para_basename(nmmd->afd.path);
- dirname = para_dirname(nmmd->afd.path);
- if (basename) {
+ if (nmmd->size) { /* parent currently has an audio file open */
localtime_r(&nmmd->mtime, &mtime_tm);
- strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+ strftime(mtime, 29, "%b %d %Y", &mtime_tm);
}
gettimeofday(&now, NULL);
ret = make_message(
- "%s:%zu\n" "%s:%s\n" "%s:%lu\n" "%s:%u\n"
- "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%u\n"
- "%s:%li\n" "%s:%s\n" "%s:%s\n" "%s"
- "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n" "%s:%s\n"
- "%s:%s\n" "%s:%u\n" "%s\n",
+ "%s: %zu\n" /* file size */
+ "%s: %s\n" /* mtime */
+ "%s: %s\n" /* status */
+ "%s: %s\n" /* status flags */
+ "%s: %li\n" /* offset */
+ "%s: %s\n" /* afs mode */
+ "%s: %lu.%lu\n" /* stream start */
+ "%s: %lu.%lu\n" /* current server time */
+ "%s", /* afs status info */
status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
status_item_list[SI_MTIME], mtime,
- status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
- status_item_list[SI_NUM_PLAYED], nmmd->num_played,
-
- status_item_list[SI_BASENAME], basename ? basename : "(none)",
status_item_list[SI_STATUS], status,
status_item_list[SI_STATUS_FLAGS], flags,
- status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,
status_item_list[SI_OFFSET], offset,
- status_item_list[SI_FORMAT], basename?
- audio_format_name(nmmd->afd.afsi.audio_format_id)
- : "",
status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
- nmmd->afd.afhi.info_string,
- status_item_list[SI_UPTIME], ut,
status_item_list[SI_STREAM_START],
(long unsigned)nmmd->stream_start.tv_sec,
(long unsigned)nmmd->stream_start.tv_usec,
status_item_list[SI_CURRENT_TIME],
(long unsigned)now.tv_sec,
(long unsigned)now.tv_usec,
- status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
- status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
- status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id,
- nmmd->afd.afs_status_info
+ nmmd->afd.verbose_ls_output
);
- free(basename);
- free(dirname);
free(flags);
free(status);
free(ut);
if (scd.sender_num < 0)
return ret;
msg = senders[scd.sender_num].help();
- send_buffer(fd, msg);
+ ret = send_buffer(fd, msg);
free(msg);
- return 1;
+ return ret;
}
for (i = 0; i < 10; i++) {
mmd_lock();
"supported senders: %s\n"
"%s",
ut, mmd->num_played,
- getppid(),
+ (int)getppid(),
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,
return -E_COMMAND_SYNTAX;
return send_buffer(fd, VERSION_TEXT("server")
"built: " BUILD_DATE "\n"
- SYSTEM ", " CC_VERSION "\n"
+ UNAME_RS ", " CC_VERSION "\n"
);
}
if (ret < 0)
goto out;
ret = 1;
- if (num == 1)
+ if (num > 0 && !--num)
goto out;
sleep(50);
if (getppid() == 1)
if (argc != 1)
return -E_COMMAND_SYNTAX;
mmd_lock();
- if (!vss_paused())
+ if (!vss_paused() && !vss_stopped()) {
mmd->events++;
- mmd->new_vss_status_flags &= ~VSS_PLAYING;
- mmd->new_vss_status_flags &= ~VSS_NEXT;
+ mmd->new_vss_status_flags &= ~VSS_PLAYING;
+ mmd->new_vss_status_flags &= ~VSS_NEXT;
+ }
mmd_unlock();
return 1;
}
*/
static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
{
- PARA_DEBUG_LOG("%s", "checking permissions\n");
+ PARA_DEBUG_LOG("checking permissions\n");
return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
}
/**
* perform user authentication and execute a command
*
- * \param fd the file descriptor to send output to
- * \param addr socket address info of peer
+ * \param fd The file descriptor to send output to
+ * \param peername Identifies the connecting peer.
*
* \return EXIT_SUCCESS or EXIT_FAILURE
*
*
* \sa alarm(2), rc4(3), crypt.c, crypt.h
*/
-int handle_connect(int fd, struct sockaddr_in *addr)
+int handle_connect(int fd, const char *peername)
{
int ret, argc, use_rc4 = 0;
char buf[4096];
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
signal(SIGHUP, SIG_DFL);
- signal(SIGUSR1, SIG_IGN);
+ /* we need a blocking fd here as recv() might return EAGAIN otherwise. */
+ ret = mark_fd_blocking(fd);
+ if (ret < 0)
+ goto err_out;
challenge_nr = random();
/* send Welcome message */
ret = send_va_buffer(fd, "This is para_server, version "
/* We can't use send_buffer here since buf may contain null bytes */
ret = send_bin_buffer(fd,(char *) crypt_buf, numbytes);
if (ret < 0)
- goto err_out;
+ goto net_err;
/* recv decrypted number */
ret = recv_buffer(fd, buf, sizeof(buf));
if (ret < 0)
- goto err_out;
+ goto net_err;
numbytes = ret;
ret = -E_AUTH;
if (!numbytes)
- goto err_out;
+ goto net_err;
if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1
|| chall_response != challenge_nr)
goto err_out;
numbytes = strlen(buf);
ret = send_bin_buffer(fd, buf, numbytes);
if (ret < 0)
- goto err_out;
+ goto net_err;
if (use_rc4)
enable_crypt(fd, rc4_recv, rc4_send, NULL);
ret = read_command(fd, &command);
- if (ret < 0)
+ if (ret == -E_COMMAND_SYNTAX)
goto err_out;
+ if (ret < 0)
+ goto net_err;
ret = -E_BAD_CMD;
cmd = parse_cmd(command);
if (!cmd)
mmd->num_commands++;
mmd_unlock();
PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
- inet_ntoa(addr->sin_addr));
+ peername);
ret = cmd->handler(fd, argc, argv);
if (ret >= 0) {
ret = EXIT_SUCCESS;
goto out;
}
err_out:
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
- if (ret != -E_SEND && ret != -E_RECV)
- send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
+net_err:
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
ret = EXIT_FAILURE;
out:
free(command);
projects / paraslash.git / blobdiff