/** \file command.c does client authentication and executes server commands */
-#include <sys/time.h> /* gettimeofday */
-#include "para.h" /* gettimeofday */
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <openssl/rc4.h>
+#include "para.h"
+#include "error.h"
#include "server.cmdline.h"
#include "afs_common.h"
+#include "string.h"
#include "afh.h"
+#include "afs.h"
#include "server.h"
#include "vss.h"
#include "send.h"
#include "rc4.h"
-#include <openssl/rc4.h>
-#include "error.h"
#include "net.h"
#include "daemon.h"
-#include "string.h"
#include "fd.h"
#include "list.h"
#include "user_list.h"
#include "afs_command_list.h"
/** commands including options must be shorter than this */
-#define MAX_COMMAND_LEN 4096
+#define MAX_COMMAND_LEN 32768
static RC4_KEY rc4_recv_key;
static RC4_KEY rc4_send_key;
extern const char *status_item_list[NUM_STAT_ITEMS];
extern struct misc_meta_data *mmd;
-extern struct audio_file_selector selectors[];
extern struct sender senders[];
static void dummy(__a_unused int s)
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:%s\n"
- "%s:%li\n" "%s:%s\n" "%s" "%s"
+ "%s:%li\n" "%s:%s\n" "%s"
"%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n",
status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
status_item_list[SI_MTIME], mtime,
status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
status_item_list[SI_STATUS], status,
status_item_list[SI_STATUS_FLAGS], flags,
- status_item_list[SI_SELECTOR], selectors[nmmd->selector_num].name,
+ status_item_list[SI_SELECTOR], "FIXME",
status_item_list[SI_OFFSET], offset,
status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
- nmmd->selector_info,
nmmd->afi.info_string,
status_item_list[SI_UPTIME], ut,
case SENDER_ALLOW:
if (argc != 4 && argc != 5)
return -E_COMMAND_SYNTAX;
- if (!inet_aton(argv[3], &scd->addr))
+ if (!inet_pton(AF_INET, argv[3], &scd->addr))
return -E_COMMAND_SYNTAX;
scd->netmask = 32;
if (argc == 5) {
case SENDER_DELETE:
if (argc != 4 && argc != 5)
return -E_COMMAND_SYNTAX;
- if (!inet_aton(argv[3], &scd->addr))
+ if (!inet_pton(AF_INET, argv[3], &scd->addr))
return -E_COMMAND_SYNTAX;
scd->port = -1;
if (argc == 5) {
{
int i, ret;
char *ut;
- char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
+ char *sender_info = NULL, *sender_list = NULL;
if (argc != 1)
return -E_COMMAND_SYNTAX;
mmd_lock();
- for (i = 0; selectors[i].name; i++) {
- selector_string = para_strcat(selector_string, selectors[i].name);
- selector_string = para_strcat(selector_string, " ");
- }
for (i = 0; senders[i].name; i++) {
char *info = senders[i].info();
sender_info = para_strcat(sender_info, info);
"pid: %d\n"
"connections (active/accepted/total): %u/%u/%u\n"
"current loglevel: %i\n"
- "supported audio file selectors: %s\n"
"supported audio formats: %s\n"
"supported senders: %s\n"
"%s",
mmd->num_commands,
mmd->num_connects,
conf.loglevel_arg,
- selector_string,
supported_audio_formats(),
sender_list,
sender_info
);
mmd_unlock();
free(ut);
- free(selector_string);
free(sender_list);
free(sender_info);
return ret;
*handler = para_strdup("para_server"); /* server commands */
return cmd;
}
- /* not found, look for commands supported by the current selector */
- mmd_lock();
- if (handler)
- *handler = make_message("the %s selector",
- selectors[mmd->selector_num].name);
- cmd = selectors[mmd->selector_num].cmd_list;
- mmd_unlock();
- for (; cmd->name; cmd++)
- if (!strcmp(cmd->name, name))
- return cmd;
/* not found, look for commands supported by afs */
- for (cmd = afs_cmds; cmd; cmd++)
+ for (cmd = afs_cmds; cmd->name; cmd++)
if (!strcmp(cmd->name, name))
return cmd;
return NULL;
/* no argument given, print list of commands */
if ((ret = send_list_of_commands(fd, server_cmds, "server")) < 0)
return ret;
- mmd_lock();
- handler = para_strdup(selectors[mmd->selector_num].name);
- cmd = selectors[mmd->selector_num].cmd_list;
- mmd_unlock();
- ret = send_list_of_commands(fd, cmd, handler);
- free(handler);
- if (ret < 0)
- return ret;
- cmd = afs_cmds;
- ret = send_list_of_commands(fd, cmd, "afs");
+ return send_list_of_commands(fd, afs_cmds, "afs");
}
/* argument given for help */
cmd = get_cmd_ptr(argv[1], &handler);
return 1;
}
-int com_chs(int fd, int argc, char * const * argv)
-{
- int i, ret;
-
- if (argc == 1) {
- char *selector;
- mmd_lock();
- selector = para_strdup(selectors[mmd->selector_num].name);
- mmd_unlock();
- ret = send_va_buffer(fd, "%s\n", selector);
- free(selector);
- return ret;
- }
- for (i = 0; selectors[i].name; i++) {
- if (strcmp(selectors[i].name, argv[1]))
- continue;
- mmd_lock();
- mmd->selector_change = i;
- mmd->events++;
- mmd_unlock();
- return 1;
- }
- return -E_BAD_SELECTOR;
-}
-
/* next */
int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
{
* encrypted with its RSA public key. From this point on,
* all transfers are crypted with this session key.
*
- * Next it is checked if the peer supplied a valid server
- * command or a command for the audio file selector currently
- * in use. If yes, and if the user has sufficient
- * permissions to execute that command, the function calls
- * the corresponding command handler which does argument
- * checking and further processing.
+ * Next it is checked if the peer supplied a valid server command or a command
+ * for the audio file selector. If yes, and if the user has sufficient
+ * permissions to execute that command, the function calls the corresponding
+ * command handler which does argument checking and further processing.
*
* In order to cope with a DOS attacks, a timeout is set up
* which terminates the function if the connection was not
projects / paraslash.git / blobdiff