Merge ../paraslash.fml/paraslash

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index f2c5497..55070a3 100644 (file)
--- a/command.c
+++ b/command.c
@@ -32,17 +32,12 @@
 #include "daemon.h"
 #include "string.h"
 
 #include "daemon.h"
 #include "string.h"
 

-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata,
-       unsigned char *outdata) = NULL;
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata,
-       unsigned char *outdata) = NULL;

 static RC4_KEY rc4_recv_key;
 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;
 static RC4_KEY rc4_recv_key;
 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 gengetopt_args_info conf;

 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 extern char *user_list;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 extern char *user_list;


@@ -591,7 +586,7 @@ static int com_si(int fd, int argc, __a_unused char **argv)
                mmd->num_connects,
                conf.loglevel_arg,
                selector_string,
                mmd->num_connects,
                conf.loglevel_arg,
                selector_string,

-               SUPPORTED_AUDIO_FORMATS,
+               supported_audio_formats(),

                sender_list,
                sender_info
        );
                sender_list,
                sender_info
        );


@@ -608,7 +603,8 @@ static int com_version(int socket_fd, int argc, __a_unused char **argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;

-       return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
+       return send_buffer(socket_fd, "para_server-" PACKAGE_VERSION ", \""
+                       CODENAME "\"\n"

                        COPYRIGHT "\n"
                        "built: " BUILD_DATE "\n"
                        SYSTEM ", " CC_VERSION "\n"
                        COPYRIGHT "\n"
                        "built: " BUILD_DATE "\n"
                        SYSTEM ", " CC_VERSION "\n"


@@ -694,7 +690,9 @@ static int com_stat(int socket_fd, int argc, char **argv)
                ret = 1;
                if (num == 1)
                        goto out;
                ret = 1;
                if (num == 1)
                        goto out;

-               usleep(500000 * 100);
+               sleep(50);
+               if (getppid() == 1)
+                       return -E_SERVER_CRASH;

        }
 out:
        return ret;
        }
 out:
        return ret;


@@ -1073,12 +1071,14 @@ static void init_rc4_keys(void)
        RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
 }
 
        RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
 }
 

-static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata)
+static void rc4_recv(unsigned long len, const unsigned char *indata,
+               unsigned char *outdata, __a_unused void *private_data)

 {
        RC4(&rc4_recv_key, len, indata, outdata);
 }
 
 {
        RC4(&rc4_recv_key, len, indata, outdata);
 }
 

-static void rc4_send(unsigned long len, const unsigned char *indata, unsigned char *outdata)
+static void rc4_send(unsigned long len, const unsigned char *indata,
+               unsigned char *outdata, __a_unused void *private_data)

 {
        RC4(&rc4_send_key, len, indata, outdata);
 }
 {
        RC4(&rc4_send_key, len, indata, outdata);
 }


@@ -1103,7 +1103,8 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        in_addr = addr;
        challenge_nr = random();
        /* send Welcome message */
        in_addr = addr;
        challenge_nr = random();
        /* send Welcome message */

-       ret = send_va_buffer(fd, "This is para_server, version " VERSION  ".\n" );
+       ret = send_va_buffer(fd, "This is para_server, version "
+               PACKAGE_VERSION  ".\n" );

        if (ret < 0)
                goto err_out;
        /* recv auth request line */
        if (ret < 0)
                goto err_out;
        /* recv auth request line */


@@ -1171,11 +1172,8 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        ret = send_bin_buffer(fd, buf, numbytes);
        if (ret < 0)
                goto err_out;
        ret = send_bin_buffer(fd, buf, numbytes);
        if (ret < 0)
                goto err_out;

-       if (use_rc4) {
-               crypt_function_recv = rc4_recv;
-               crypt_function_send = rc4_send;
-               PARA_INFO_LOG("%s", "rc4 encryption activated\n");
-       }
+       if (use_rc4)
+               enable_crypt(fd, rc4_recv, rc4_send, NULL);

        /* read command */
        while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
 //             PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);
        /* read command */
        while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
 //             PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);