projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce the vss task.
[paraslash.git]
/
command.c
diff --git
a/command.c
b/command.c
index c1bbba9aef86d7fccc936d2230f591ce3eb734d4..b6c2de2788a131f446f48893717a826ea3fd8845 100644
(file)
--- a/
command.c
+++ b/
command.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1997-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-200
8
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-20,12
+20,12
@@
#include "afs.h"
#include "server.h"
#include "vss.h"
#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 "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"
#include "user_list.h"
#include "server_command_list.h"
#include "afs_command_list.h"
@@
-40,8
+40,16
@@
static unsigned char rc4_buf[2 * RC4_KEY_LEN];
extern struct misc_meta_data *mmd;
extern struct sender senders[];
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 void mmd_dup(struct misc_meta_data *new_mmd)
{
@@
-108,7
+116,7
@@
static char *get_status(struct misc_meta_data *nmmd)
flags = vss_get_status_flags(nmmd->vss_status_flags);
if (nmmd->size) { /* parent currently has an audio file open */
localtime_r(&nmmd->mtime, &mtime_tm);
flags = vss_get_status_flags(nmmd->vss_status_flags);
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(
}
gettimeofday(&now, NULL);
ret = make_message(
@@
-234,9
+242,9
@@
int com_sender(int fd, int argc, char * const * argv)
if (scd.sender_num < 0)
return ret;
msg = senders[scd.sender_num].help();
if (scd.sender_num < 0)
return ret;
msg = senders[scd.sender_num].help();
- send_buffer(fd, msg);
+
ret =
send_buffer(fd, msg);
free(msg);
free(msg);
- return
1
;
+ return
ret
;
}
for (i = 0; i < 10; i++) {
mmd_lock();
}
for (i = 0; i < 10; i++) {
mmd_lock();
@@
-278,7
+286,7
@@
int com_si(int fd, int argc, __a_unused char * const * argv)
"supported senders: %s\n"
"%s",
ut, mmd->num_played,
"supported senders: %s\n"
"%s",
ut, mmd->num_played,
- getppid(),
+
(int)
getppid(),
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,
@@
-301,7
+309,7
@@
int com_version(int fd, int argc, __a_unused char * const * argv)
return -E_COMMAND_SYNTAX;
return send_buffer(fd, VERSION_TEXT("server")
"built: " BUILD_DATE "\n"
return -E_COMMAND_SYNTAX;
return send_buffer(fd, VERSION_TEXT("server")
"built: " BUILD_DATE "\n"
-
SYSTEM
", " CC_VERSION "\n"
+
UNAME_RS
", " CC_VERSION "\n"
);
}
);
}
@@
-327,7
+335,7
@@
int com_stat(int fd, int argc, char * const * argv)
if (ret < 0)
goto out;
ret = 1;
if (ret < 0)
goto out;
ret = 1;
- if (num
== 1
)
+ if (num
> 0 && !--num
)
goto out;
sleep(50);
if (getppid() == 1)
goto out;
sleep(50);
if (getppid() == 1)
@@
-570,7
+578,7
@@
out:
*/
static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
{
*/
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;
}
return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
}
@@
-652,12
+660,10
@@
out:
}
/**
}
/**
- * perform user authentication and execute a command
- *
- * \param fd the file descriptor to send output to
- * \param addr socket address info of peer
+ * Perform user authentication and execute a command.
*
*
- * \return EXIT_SUCCESS or EXIT_FAILURE
+ * \param fd The file descriptor to send output to.
+ * \param peername Identifies the connecting peer.
*
* Whenever para_server accepts an incoming tcp connection on
* the port it listens on, it forks and the resulting child
*
* Whenever para_server accepts an incoming tcp connection on
* the port it listens on, it forks and the resulting child
@@
-680,7
+686,7
@@
out:
*
* \sa alarm(2), rc4(3), crypt.c, crypt.h
*/
*
* \sa alarm(2), rc4(3), crypt.c, crypt.h
*/
-
int handle_connect(int fd, struct sockaddr_in *addr
)
+
__noreturn void handle_connect(int fd, const char *peername
)
{
int ret, argc, use_rc4 = 0;
char buf[4096];
{
int ret, argc, use_rc4 = 0;
char buf[4096];
@@
-696,8
+702,11
@@
int handle_connect(int fd, struct sockaddr_in *addr)
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
signal(SIGHUP, SIG_DFL);
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 "
challenge_nr = random();
/* send Welcome message */
ret = send_va_buffer(fd, "This is para_server, version "
@@
-737,15
+746,15
@@
int handle_connect(int fd, struct sockaddr_in *addr)
/* 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)
/* 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)
/* 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)
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;
if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1
|| chall_response != challenge_nr)
goto err_out;
@@
-763,12
+772,14
@@
int handle_connect(int fd, struct sockaddr_in *addr)
numbytes = strlen(buf);
ret = send_bin_buffer(fd, buf, numbytes);
if (ret < 0)
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 (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;
goto err_out;
+ if (ret < 0)
+ goto net_err;
ret = -E_BAD_CMD;
cmd = parse_cmd(command);
if (!cmd)
ret = -E_BAD_CMD;
cmd = parse_cmd(command);
if (!cmd)
@@
-784,17
+795,14
@@
int handle_connect(int fd, struct sockaddr_in *addr)
mmd->num_commands++;
mmd_unlock();
PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
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);
ret = cmd->handler(fd, argc, argv);
- if (ret >= 0) {
- ret = EXIT_SUCCESS;
+ if (ret >= 0)
goto out;
goto out;
- }
err_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));
- ret = EXIT_FAILURE;
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
+net_err:
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
out:
free(command);
free(argv);
out:
free(command);
free(argv);
@@
-803,5
+811,5
@@
out:
mmd->events++;
mmd->active_connections--;
mmd_unlock();
mmd->events++;
mmd->active_connections--;
mmd_unlock();
-
return ret
;
+
exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS)
;
}
}