/*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "server.cmdline.h"
#include "db.h"
#include "server.h"
-#include "afs.h"
+#include "vss.h"
#include "send.h"
#include "rc4.h"
#include <openssl/rc4.h>
{
.name = "ff",
.handler = com_ff,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "jmp amount of time forwards or backwards "
"in current audio file",
.synopsis = "ff n[-]",
.help =
-"\tSet the 'R' (reposition request) bit of the afs status flags\n"
+"\tSet the 'R' (reposition request) bit of the vss status flags\n"
"\tand enqueue a request to jump n seconds forwards or backwards\n"
"\tin the current audio file.\n"
"\n"
{
.name = "hup",
.handler = com_hup,
-.perms = AFS_WRITE,
+.perms = VSS_WRITE,
.description = "force reload of config file and log file",
.synopsis = "hup",
.help =
{
.name = "jmp",
.handler = com_jmp,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "jmp to given position in current audio file",
.synopsis = "jmp [n]",
.help =
-"\tSet the 'R' (reposition request) bit of the afs status flags\n"
+"\tSet the 'R' (reposition request) bit of the vss status flags\n"
"\tand enqueue a request to jump to n% of the current audio file,\n"
"\twhere 0 <= n <= 100.\n"
{
.name = "next",
.handler = com_next,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "skip rest of current audio file",
.synopsis = "next",
.help =
-"\tSet the 'N' (next audio file) bit of the afs status flags. When\n"
+"\tSet the 'N' (next audio file) bit of the vss status flags. When\n"
"\tplaying, change audio file immediately. Equivalent to stop\n"
"\tif paused, NOP if stopped.\n"
{
.name = "nomore",
.handler = com_nomore,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "stop playing after current audio file",
.synopsis = "nomore",
.help =
-"Set the 'O' (no more) bit of the afs status flags. This instructs\n"
+"Set the 'O' (no more) bit of the vss status flags. This instructs\n"
"para_server to clear the 'P' (playing) bit as soon as it encounters\n"
"the 'N' (next audio file) bit being set.\n"
"\n"
{
.name ="pause",
.handler = com_pause,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "pause current audio file",
.synopsis = "pause",
.help =
-"\tClear the 'P' (playing) bit of the afs status flags.\n"
+"\tClear the 'P' (playing) bit of the vss status flags.\n"
},
{
.name = "play",
.handler = com_play,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "start playing or resume playing when paused",
.synopsis = "play",
.help =
-"\tSet the 'P' (playing) bit of the afs status flags. This\n"
+"\tSet the 'P' (playing) bit of the vss status flags. This\n"
"\tresults in starting/continuing to stream.\n"
},
{
.name = "sb",
.handler = com_sb,
-.perms = AFS_READ,
+.perms = VSS_READ,
.description = "print status bar for current audio file",
.synopsis = "sb [n]",
.help =
{
.name = "sc",
.handler = com_sc,
-.perms = AFS_READ,
+.perms = VSS_READ,
.description = "print name of audio file whenever it changes",
.synopsis = "sc [n]",
.help =
{
.name = "sender",
.handler = com_sender,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "control paraslash internal senders",
.synopsis = "sender [s cmd [arguments]]",
.help =
{
.name = "stat",
.handler = com_stat,
-.perms = AFS_READ,
+.perms = VSS_READ,
.description = "print status info for current audio file",
.synopsis = "stat [n]",
.help =
{
.name = "stop",
.handler = com_stop,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "stop playing",
.synopsis = "stop",
.help =
-"\tClear the 'P' (play) bit and set the 'N' bit of the afs status\n"
+"\tClear the 'P' (play) bit and set the 'N' bit of the vss status\n"
"\tflags.\n"
},
{
.name = "term",
.handler = com_term,
-.perms = AFS_READ | AFS_WRITE,
+.perms = VSS_READ | VSS_WRITE,
.description = "terminate para_server",
.synopsis = "term",
.help =
/*
* compute human readable string containing
- * afs_status for given integer value
+ * vss status for given integer value
*/
-static char *afs_status_tohuman(unsigned int flags)
+static char *vss_status_tohuman(unsigned int flags)
{
- if (flags & AFS_PLAYING)
+ if (flags & VSS_PLAYING)
return para_strdup("playing");
- else if (flags & AFS_NEXT)
+ else if (flags & VSS_NEXT)
return para_strdup("stopped");
else
return para_strdup("paused");
msg[0] = perms & DB_READ? 'd' : '-';
msg[1] = perms & DB_WRITE? 'D' : '-';
- msg[2] = perms & AFS_READ? 'a' : '-';
- msg[3] = perms & AFS_WRITE? 'A' : '-';
+ msg[2] = perms & VSS_READ? 'a' : '-';
+ msg[3] = perms & VSS_WRITE? 'A' : '-';
msg[4] = '\0';
return msg;
}
/*
* Never returns NULL.
*/
-static char *afs_get_status_flags(unsigned int flags)
+static char *vss_get_status_flags(unsigned int flags)
{
char *msg = para_malloc(5 * sizeof(char));
- msg[0] = (flags & AFS_PLAYING)? 'P' : '_';
- msg[1] = (flags & AFS_NOMORE)? 'O' : '_';
- msg[2] = (flags & AFS_NEXT)? 'N' : '_';
- msg[3] = (flags & AFS_REPOS)? 'R' : '_';
+ msg[0] = (flags & VSS_PLAYING)? 'P' : '_';
+ msg[1] = (flags & VSS_NOMORE)? 'O' : '_';
+ msg[2] = (flags & VSS_NEXT)? 'N' : '_';
+ msg[3] = (flags & VSS_REPOS)? 'R' : '_';
msg[4] = '\0';
return msg;
}
static char *get_status(struct misc_meta_data *nmmd)
{
char *bar, *ret, mtime[30] = "";
- char *status, *flags; /* afs status info */
+ char *status, *flags; /* vss status info */
char *ut = uptime_str();
long offset = (nmmd->offset + 500) / 1000;
struct timeval now;
strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
}
/* report real status */
- status = afs_status_tohuman(nmmd->afs_status_flags);
- flags = afs_get_status_flags(nmmd->afs_status_flags);
+ status = vss_status_tohuman(nmmd->vss_status_flags);
+ flags = vss_get_status_flags(nmmd->vss_status_flags);
bar = para_basename(nmmd->filename);
gettimeofday(&now, NULL);
ret = make_message(
return ret;
}
-static int send_description(int fd, struct server_command *cmd, const char *handler)
+static int send_list_of_commands(int fd, struct server_command *cmd,
+ const char *handler)
{
int ret, i;
if (argc < 2) {
/* no argument given, print list of commands */
- if ((ret = send_description(fd, cmd_struct, "server")) < 0)
+ if ((ret = send_list_of_commands(fd, cmd_struct, "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_description(fd, cmd, handler);
+ ret = send_list_of_commands(fd, cmd, handler);
free(handler);
return ret;
}
if (argc != 1)
return -E_COMMAND_SYNTAX;
mmd_lock();
- mmd->new_afs_status_flags |= AFS_PLAYING;
- mmd->new_afs_status_flags &= ~AFS_NOMORE;
+ mmd->new_vss_status_flags |= VSS_PLAYING;
+ mmd->new_vss_status_flags &= ~VSS_NOMORE;
mmd_unlock();
return 1;
if (argc != 1)
return -E_COMMAND_SYNTAX;
mmd_lock();
- mmd->new_afs_status_flags &= ~AFS_PLAYING;
- mmd->new_afs_status_flags &= ~AFS_REPOS;
- mmd->new_afs_status_flags |= AFS_NEXT;
+ mmd->new_vss_status_flags &= ~VSS_PLAYING;
+ mmd->new_vss_status_flags &= ~VSS_REPOS;
+ mmd->new_vss_status_flags |= VSS_NEXT;
mmd_unlock();
return 1;
}
if (argc != 1)
return -E_COMMAND_SYNTAX;
mmd_lock();
- if (!afs_paused())
+ if (!vss_paused())
mmd->events++;
- mmd->new_afs_status_flags &= ~AFS_PLAYING;
- mmd->new_afs_status_flags &= ~AFS_NEXT;
+ mmd->new_vss_status_flags &= ~VSS_PLAYING;
+ mmd->new_vss_status_flags &= ~VSS_NEXT;
mmd_unlock();
return 1;
}
return -E_COMMAND_SYNTAX;
mmd_lock();
mmd->events++;
- mmd->new_afs_status_flags |= AFS_NEXT;
+ mmd->new_vss_status_flags |= VSS_NEXT;
mmd_unlock();
return 1;
}
if (argc != 1)
return -E_COMMAND_SYNTAX;
mmd_lock();
- if (afs_playing() || afs_paused())
- mmd->new_afs_status_flags |= AFS_NOMORE;
+ if (vss_playing() || vss_paused())
+ mmd->new_vss_status_flags |= VSS_NOMORE;
mmd_unlock();
return 1;
}
if (promille < 0)
promille = 0;
if (promille > 1000) {
- mmd->new_afs_status_flags |= AFS_NEXT;
+ mmd->new_vss_status_flags |= VSS_NEXT;
goto out;
}
mmd->repos_request = (mmd->chunks_total * promille) / 1000;
- mmd->new_afs_status_flags |= AFS_REPOS;
- mmd->new_afs_status_flags &= ~AFS_NEXT;
+ mmd->new_vss_status_flags |= VSS_REPOS;
+ mmd->new_vss_status_flags &= ~VSS_NEXT;
mmd->events++;
ret = 1;
out:
mmd->repos_request = (mmd->chunks_total * i + 50)/ 100;
PARA_INFO_LOG("sent: %lu, offset before jmp: %lu\n",
mmd->chunks_sent, mmd->offset);
- mmd->new_afs_status_flags |= AFS_REPOS;
- mmd->new_afs_status_flags &= ~AFS_NEXT;
+ mmd->new_vss_status_flags |= VSS_REPOS;
+ mmd->new_vss_status_flags &= ~VSS_NEXT;
ret = 1;
mmd->events++;
out:
use_rc4? "rc4" : "auth", u.name);
if ((ret = lookup_user(&u)) < 0)
goto err_out;
- if (!ret) { /* user not found */
- PARA_WARNING_LOG("auth request for unknown user %s\n", u.name);
- ret = -E_BAD_USER;
- goto err_out;
- }
ret = para_encrypt_challenge(u.rsa, challenge_nr, crypt_buf);
if (ret <= 0)
goto err_out;
projects / paraslash.git / blobdiff