#include "net.h"
#include "daemon.h"
#include "string.h"
+#include "fd.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;
-extern struct gengetopt_args_info conf;
extern struct audio_file_selector selectors[];
-extern struct audio_format afl[];
extern struct sender senders[];
extern char *user_list;
struct sockaddr_in *in_addr;
nmmd->audio_file_info,
status_item_list[SI_UPTIME], ut,
- status_item_list[SI_STREAM_START], nmmd->stream_start.tv_sec,
- nmmd->stream_start.tv_usec,
- status_item_list[SI_CURRENT_TIME], now.tv_sec, now.tv_usec
+ status_item_list[SI_STREAM_START],
+ (long unsigned)nmmd->stream_start.tv_sec,
+ (long unsigned)nmmd->stream_start.tv_usec,
+ status_item_list[SI_CURRENT_TIME],
+ (long unsigned)now.tv_sec,
+ (long unsigned)now.tv_usec
);
free(bar);
mmd->num_connects,
conf.loglevel_arg,
selector_string,
- SUPPORTED_AUDIO_FORMATS,
+ supported_audio_formats(),
sender_list,
sender_info
);
{
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"
ret = 1;
if (num == 1)
goto out;
- usleep(500000 * 100);
+ sleep(50);
+ if (getppid() == 1)
+ return -E_SERVER_CRASH;
}
out:
return ret;
char line[MAXLINE];
/* keyword, user, key, perms */
char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE];
- int num;
+ int num, ret;
file_ptr = open_user_list(user_list);
if (!file_ptr)
return -E_USERLIST;
- while (fgets(line, MAXLINE, file_ptr)) {
-// PARA_DEBUG_LOG("%s: Read line (%i bytes) "
-// "from config file\n", __func__, strlen(line));
+ for (;;) {
+ ret = para_fgets(line, MAXLINE, file_ptr);
+ if (ret < 0)
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ if (ret <= 0)
+ break;
if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
continue;
- if (!strcmp(w, "user") && !strcmp(user->name, n)) {
- PARA_DEBUG_LOG("found entry for %s\n", n);
- strcpy(user->name, n);
- strcpy(user->pubkey_file, k);
- user->perms = 0;
- char_ptr = p;
- num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
- tmp[0], tmp[1], tmp[2], tmp[3]);
- PARA_DEBUG_LOG("found %i perm entries\n",
- num);
- user->perms = 0;
- while (num > 0) {
- num--;
- //PARA_DEBUG_LOG("%s: tmp[%i]=%s\n", __func__,
- // num, tmp[num]);
- if (!strcmp(tmp[num], "AFS_READ"))
- user->perms =
- user->perms | AFS_READ;
- else if (!strcmp(tmp[num], "AFS_WRITE"))
- user->perms =
- user->perms | AFS_WRITE;
- else if (!strcmp(tmp[num], "DB_READ"))
- user->perms = user->perms | DB_READ;
- else if (!strcmp(tmp[num], "DB_WRITE"))
- user->perms = user->perms | DB_WRITE;
- else /* unknown permission */
- PARA_WARNING_LOG("unknown permission:"
- "%s\n", tmp[num]);
- }
- fclose(file_ptr);
- return 1;
+ if (strcmp(w, "user") || strcmp(user->name, n))
+ continue;
+ PARA_DEBUG_LOG("found entry for %s\n", n);
+ strcpy(user->name, n);
+ strcpy(user->pubkey_file, k);
+ user->perms = 0;
+ char_ptr = p;
+ num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
+ tmp[0], tmp[1], tmp[2], tmp[3]);
+ PARA_DEBUG_LOG("found %i perm entries\n", num);
+ user->perms = 0;
+ while (num > 0) {
+ num--;
+ if (!strcmp(tmp[num], "AFS_READ"))
+ user->perms = user->perms | AFS_READ;
+ else if (!strcmp(tmp[num], "AFS_WRITE"))
+ user->perms = user->perms | AFS_WRITE;
+ else if (!strcmp(tmp[num], "DB_READ"))
+ user->perms = user->perms | DB_READ;
+ else if (!strcmp(tmp[num], "DB_WRITE"))
+ user->perms = user->perms | DB_WRITE;
+ else /* unknown permission */
+ PARA_WARNING_LOG("unknown permission: %s\n",
+ tmp[num]);
}
+ break;
}
fclose(file_ptr);
- return 0;
+ return ret;
}
static void init_rc4_keys(void)
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);
}
-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);
}
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 */
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 encrytion 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);
projects / paraslash.git / blobdiff