#include "user_list.h"
#include "server_command_list.h"
+/** commands including options must be shorter than this */
+#define MAX_COMMAND_LEN 4096
+
static RC4_KEY rc4_recv_key;
static RC4_KEY rc4_send_key;
static unsigned char rc4_buf[2 * RC4_KEY_LEN];
}
/* version */
-int com_version(int socket_fd, int argc, __a_unused char **argv)
+int com_version(int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- return send_buffer(socket_fd, VERSION_TEXT("server")
+ return send_buffer(fd, VERSION_TEXT("server")
"built: " BUILD_DATE "\n"
SYSTEM ", " CC_VERSION "\n"
);
}
/* sc */
-int com_sc(int socket_fd, int argc, char **argv)
+int com_sc(int fd, int argc, char **argv)
{
char *name = NULL;
int ret, old = 0, count = -1; /* print af change forever */
}
mmd_unlock();
if (name) {
- ret = send_va_buffer(socket_fd, "%s\n", name);
+ ret = send_va_buffer(fd, "%s\n", name);
free(name);
name = NULL;
if (ret < 0)
}
/* sb */
-int com_sb(int socket_fd, int argc, char **argv)
+int com_sb(int fd, int argc, char **argv)
{
char *sb;
int ret, nr = -1; /* status bar will be printed that many
mmd_lock();
sb = get_sb_string(mmd);
mmd_unlock();
- ret = send_va_buffer(socket_fd, "%s\n", sb);
+ ret = send_va_buffer(fd, "%s\n", sb);
free(sb);
if (ret < 0)
return ret;
}
/* stat */
-int com_stat(int socket_fd, int argc, char **argv)
+int com_stat(int fd, int argc, char **argv)
{
int ret, num = 0;/* status will be printed that many
* times. num <= 0 means: print forever
mmd_dup(nmmd);
s = get_status(nmmd);
- ret = send_buffer(socket_fd, s);
+ ret = send_buffer(fd, s);
free(s);
if (ret < 0)
goto out;
}
/* hup */
-int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* term */
-int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_term(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
return 1;
}
-int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_play(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* stop */
-int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* pause */
-int com_pause(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* next */
-int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_next(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* nomore */
-int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* ff */
-int com_ff(__a_unused int socket_fd, int argc, char **argv)
+int com_ff(__a_unused int fd, int argc, char **argv)
{
long promille;
int ret, backwards = 0;
}
/* jmp */
-int com_jmp(__a_unused int socket_fd, int argc, char **argv)
+int com_jmp(__a_unused int fd, int argc, char **argv)
{
long unsigned int i;
int ret;
int handle_connect(int fd, struct sockaddr_in *addr)
{
int numbytes, ret, argc, use_rc4 = 0;
- char buf[STRINGSIZE];
+ char buf[4096];
unsigned char crypt_buf[MAXLINE];
- struct user u;
+ struct user *u;
struct server_command *cmd = NULL;
long unsigned challenge_nr, chall_response;
char **argv = NULL;
goto err_out;
if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
- u.name = para_strdup(buf + 5); /* client version < 0.2.6 */
+ p = buf + 5; /* client version < 0.2.6 */
else {
- u.name = para_strdup(buf + 9); /* client version >= 0.2.6 */
+ p = buf + 9; /* client version >= 0.2.6 */
use_rc4 = 1;
}
PARA_DEBUG_LOG("received %s request for user %s\n",
- use_rc4? "rc4" : "auth", u.name);
- if ((ret = lookup_user(&u)) < 0)
+ use_rc4? "rc4" : "auth", p);
+ ret = -E_BAD_USER;
+ u = lookup_user(p);
+ if (!u)
goto err_out;
- ret = para_encrypt_challenge(u.rsa, challenge_nr, crypt_buf);
+ ret = para_encrypt_challenge(u->rsa, challenge_nr, crypt_buf);
if (ret <= 0)
goto err_out;
numbytes = ret;
|| chall_response != challenge_nr)
goto err_out;
/* auth successful. Send 'Proceed' message */
- PARA_INFO_LOG("good auth for %s (%lu)\n", u.name, challenge_nr);
+ PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
sprintf(buf, "%s", PROCEED_MSG);
if (use_rc4) {
init_rc4_keys();
- ret = para_encrypt_buffer(u.rsa, rc4_buf, 2 * RC4_KEY_LEN,
+ ret = para_encrypt_buffer(u->rsa, rc4_buf, 2 * RC4_KEY_LEN,
(unsigned char *)buf + PROCEED_MSG_LEN + 1);
if (ret <= 0)
goto err_out;
while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
// PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);
ret = -E_COMMAND_SYNTAX;
- if (command && numbytes + strlen(command) > STRINGSIZE) /* DOS */
+ if (command && numbytes + strlen(command) > MAX_COMMAND_LEN) /* DOS */
goto err_out;
command = para_strcat(command, buf);
if ((p = strstr(command, EOC_MSG))) {
if (!(cmd = parse_cmd(command)))
goto err_out;
/* valid command, check permissions */
- ret = check_perms(u.perms, cmd);
+ ret = check_perms(u->perms, cmd);
if (ret < 0)
goto err_out;
/* valid command and sufficient perms */
mmd_lock();
mmd->num_commands++;
mmd_unlock();
- PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u.name,
+ PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
inet_ntoa(addr->sin_addr));
ret = cmd->handler(fd, argc, argv);
if (ret >= 0) {