projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint'
[paraslash.git]
/
audiod.c
diff --git
a/audiod.c
b/audiod.c
index 1e8591f0c1b1986d5b141217e13295a2c05b6392..6786eeef069921ae78118540af58501d7dbbad99 100644
(file)
--- a/
audiod.c
+++ b/
audiod.c
@@
-5,19
+5,21
@@
*/
/** \file audiod.c the paraslash's audio daemon */
*/
/** \file audiod.c the paraslash's audio daemon */
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include <signal.h>
#include <sys/types.h>
#include <dirent.h>
#include <signal.h>
+#include <openssl/rc4.h>
#include "para.h"
#include "error.h"
#include "para.h"
#include "error.h"
+#include "crypt.h"
#include "audiod.cmdline.h"
#include "list.h"
#include "sched.h"
#include "ggo.h"
#include "recv.h"
#include "filter.h"
#include "audiod.cmdline.h"
#include "list.h"
#include "sched.h"
#include "ggo.h"
#include "recv.h"
#include "filter.h"
-#include "grab_client.cmdline.h"
#include "grab_client.h"
#include "client.cmdline.h"
#include "client.h"
#include "grab_client.h"
#include "client.cmdline.h"
#include "client.h"
@@
-160,7
+162,7
@@
struct command_task {
* \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
* \a name is not a supported audio format.
*/
* \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
* \a name is not a supported audio format.
*/
-int get_audio_format_num(char *name)
+int get_audio_format_num(c
onst c
har *name)
{
int i;
{
int i;
@@
-219,8
+221,7
@@
out:
seconds = PARA_MIN(seconds, length);
seconds = PARA_MAX(seconds, 0);
return make_message(
seconds = PARA_MIN(seconds, length);
seconds = PARA_MAX(seconds, 0);
return make_message(
- "%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
- status_item_list[SI_PLAY_TIME],
+ "%s%d:%02d [%d:%02d] (%d%%/%d:%02d)",
s? "" : "~",
seconds / 60,
seconds % 60,
s? "" : "~",
seconds / 60,
seconds % 60,
@@
-231,7
+232,7
@@
out:
length % 60
);
empty:
length % 60
);
empty:
- return
make_message("%s:\n", status_item_list[SI_PLAY_TIME]
);
+ return
para_strdup(NULL
);
}
static int want_colors(void)
}
static int want_colors(void)
@@
-444,7
+445,7
@@
static void open_writers(int slot_num)
stat_task->server_stream_start : *now;
s->offset_seconds = stat_task->offset_seconds;
s->seconds_total = stat_task->length_seconds;
stat_task->server_stream_start : *now;
s->offset_seconds = stat_task->offset_seconds;
s->seconds_total = stat_task->length_seconds;
- activate_inactive_grab_clients(s
lot_num, s
->format, s->fc);
+ activate_inactive_grab_clients(s->format, s->fc);
}
static int open_receiver(int format)
}
static int open_receiver(int format)
@@
-578,45
+579,31
@@
out:
return count;
}
return count;
}
-static int
check_stat_line(char *line, __a_unused void *data
)
+static int
update_item(int itemnum, char *buf
)
{
{
- int itemnum;
- size_t ilen = 0;
long unsigned sec, usec;
long unsigned sec, usec;
- char *tmp;
- //PARA_INFO_LOG("line: %s\n", line);
- if (!line)
- return 1;
- itemnum = stat_line_valid(line);
- if (itemnum < 0) {
- PARA_WARNING_LOG("invalid status line: %s\n", line);
- return 1;
- }
if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
return 1;
if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
return 1;
- tmp = make_message("%s\n", line);
- stat_client_write(tmp, itemnum);
- free(tmp);
free(stat_item_values[itemnum]);
free(stat_item_values[itemnum]);
- stat_item_values[itemnum] = para_strdup(
line
);
-
ilen = strlen(status_item_list[itemnum]
);
+ stat_item_values[itemnum] = para_strdup(
buf
);
+
stat_client_write_item(itemnum
);
switch (itemnum) {
case SI_STATUS_FLAGS:
stat_task->vss_status = 0;
switch (itemnum) {
case SI_STATUS_FLAGS:
stat_task->vss_status = 0;
- if (strchr(
line
, 'N'))
+ if (strchr(
buf
, 'N'))
stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
- if (strchr(
line
, 'P'))
+ if (strchr(
buf
, 'P'))
stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
break;
case SI_OFFSET:
stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
break;
case SI_OFFSET:
- stat_task->offset_seconds = atoi(
line + ilen + 1
);
+ stat_task->offset_seconds = atoi(
buf
);
break;
case SI_SECONDS_TOTAL:
break;
case SI_SECONDS_TOTAL:
- stat_task->length_seconds = atoi(
line + ilen + 1
);
+ stat_task->length_seconds = atoi(
buf
);
break;
case SI_STREAM_START:
break;
case SI_STREAM_START:
- if (sscanf(
line + ilen + 1
, "%lu.%lu", &sec, &usec) == 2) {
+ if (sscanf(
buf
, "%lu.%lu", &sec, &usec) == 2) {
struct timeval a_start, delay;
delay.tv_sec = conf.stream_delay_arg / 1000;
delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
struct timeval a_start, delay;
delay.tv_sec = conf.stream_delay_arg / 1000;
delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
@@
-634,14
+621,14
@@
static int check_stat_line(char *line, __a_unused void *data)
}
break;
case SI_CURRENT_TIME:
}
break;
case SI_CURRENT_TIME:
- if (sscanf(
line + ilen + 1
, "%lu.%lu", &sec, &usec) == 2) {
+ if (sscanf(
buf
, "%lu.%lu", &sec, &usec) == 2) {
struct timeval tv = {sec, usec};
compute_time_diff(&tv);
}
break;
case SI_FORMAT:
struct timeval tv = {sec, usec};
compute_time_diff(&tv);
}
break;
case SI_FORMAT:
- stat_task->current_audio_format_num
= get_audio_format_num(
-
line + ilen + 1
);
+ stat_task->current_audio_format_num
+
= get_audio_format_num(buf
);
}
return 1;
}
}
return 1;
}
@@
-915,8
+902,15
@@
static void command_post_select(struct sched *s, struct task *t)
{
int ret;
struct command_task *ct = container_of(t, struct command_task, task);
{
int ret;
struct command_task *ct = container_of(t, struct command_task, task);
+ static struct timeval last_status_dump;
+ struct timeval tmp;
+
+ tv_add(&last_status_dump, &(struct timeval){0, 500 * 1000}, &tmp);
+ if (tv_diff(&tmp, now, NULL) < 0) {
+ audiod_status_dump();
+ last_status_dump = *now;
+ }
- audiod_status_dump();
if (!FD_ISSET(ct->fd, &s->rfds))
return;
ret = handle_connect(ct->fd);
if (!FD_ISSET(ct->fd, &s->rfds))
return;
ret = handle_connect(ct->fd);
@@
-935,17
+929,11
@@
static void init_command_task(struct command_task *ct)
static void close_stat_pipe(void)
{
static void close_stat_pipe(void)
{
- int i;
-
if (!stat_task->ct)
return;
client_close(stat_task->ct);
stat_task->ct = NULL;
if (!stat_task->ct)
return;
client_close(stat_task->ct);
stat_task->ct = NULL;
- FOR_EACH_STATUS_ITEM(i) {
- free(stat_item_values[i]);
- stat_item_values[i] = NULL;
- }
- dump_empty_status();
+ clear_and_dump_items();
stat_task->length_seconds = 0;
stat_task->offset_seconds = 0;
stat_task->vss_status = 0;
stat_task->length_seconds = 0;
stat_task->offset_seconds = 0;
stat_task->vss_status = 0;
@@
-1070,7
+1058,7
@@
static void status_pre_select(struct sched *s, struct task *t)
goto out;
}
if (st->ct) {
goto out;
}
if (st->ct) {
-
unsigned bytes_lef
t;
+
int re
t;
if (st->ct->task.error < 0) {
if (st->ct->task.error != -E_TASK_UNREGISTERED)
goto out;
if (st->ct->task.error < 0) {
if (st->ct->task.error != -E_TASK_UNREGISTERED)
goto out;
@@
-1079,11
+1067,15
@@
static void status_pre_select(struct sched *s, struct task *t)
}
if (st->ct->status != CL_RECEIVING)
goto out;
}
if (st->ct->status != CL_RECEIVING)
goto out;
- bytes_left = for_each_line(st->ct->buf, st->ct->loaded,
- &check_stat_line, NULL);
- if (st->ct->loaded != bytes_left) {
+ ret = for_each_stat_item(st->ct->buf, st->ct->loaded,
+ update_item);
+ if (ret < 0) {
+ st->ct->task.error = ret;
+ goto out;
+ }
+ if (st->ct->loaded != ret) {
st->last_status_read = *now;
st->last_status_read = *now;
- st->ct->loaded =
bytes_lef
t;
+ st->ct->loaded =
re
t;
} else {
struct timeval diff;
tv_diff(now, &st->last_status_read, &diff);
} else {
struct timeval diff;
tv_diff(now, &st->last_status_read, &diff);
@@
-1095,25
+1087,23
@@
static void status_pre_select(struct sched *s, struct task *t)
if (tv_diff(now, &st->restart_barrier, NULL) < 0)
goto out;
if (st->clock_diff_count) { /* get status only one time */
if (tv_diff(now, &st->restart_barrier, NULL) < 0)
goto out;
if (st->clock_diff_count) { /* get status only one time */
- char *argv[] = {"audiod", "
stat
", "1", NULL};
- int argc =
3
;
+ char *argv[] = {"audiod", "
--", "stat", "-p
", "1", NULL};
+ int argc =
5
;
PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
st->clock_diff_count--;
client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(2);
} else {
PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
st->clock_diff_count--;
client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(2);
} else {
- char *argv[] = {"audiod", "
stat
", NULL};
- int argc =
2
;
+ char *argv[] = {"audiod", "
--", "stat", "-p
", NULL};
+ int argc =
4
;
client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(5);
}
free(stat_item_values[SI_BASENAME]);
client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(5);
}
free(stat_item_values[SI_BASENAME]);
- stat_item_values[SI_BASENAME] = make_message(
- "%s: no connection to para_server\n",
- status_item_list[SI_BASENAME]);
- stat_client_write(stat_item_values[SI_BASENAME],
- SI_BASENAME);
+ stat_item_values[SI_BASENAME] = para_strdup(
+ "no connection to para_server");
+ stat_client_write_item(SI_BASENAME);
st->last_status_read = *now;
out:
start_stop_decoders(s);
st->last_status_read = *now;
out:
start_stop_decoders(s);
@@
-1214,9
+1204,12
@@
int main(int argc, char *argv[])
drop_privileges_or_die(conf.user_arg, conf.group_arg);
parse_config_or_die();
init_colors_or_die();
drop_privileges_or_die(conf.user_arg, conf.group_arg);
parse_config_or_die();
init_colors_or_die();
+ init_random_seed_or_die();
daemon_set_flag(DF_LOG_TIME);
daemon_set_flag(DF_LOG_HOSTNAME);
daemon_set_flag(DF_LOG_LL);
daemon_set_flag(DF_LOG_TIME);
daemon_set_flag(DF_LOG_HOSTNAME);
daemon_set_flag(DF_LOG_LL);
+ if (conf.log_timing_given)
+ daemon_set_flag(DF_LOG_TIMING);
if (conf.logfile_given) {
daemon_set_logfile(conf.logfile_arg);
daemon_open_log_or_die();
if (conf.logfile_given) {
daemon_set_logfile(conf.logfile_arg);
daemon_open_log_or_die();
@@
-1245,7
+1238,7
@@
int main(int argc, char *argv[])
register_task(&cmd_task->task);
register_task(&stat_task->task);
s.default_timeout.tv_sec = 0;
register_task(&cmd_task->task);
register_task(&stat_task->task);
s.default_timeout.tv_sec = 0;
- s.default_timeout.tv_usec = 99 * 1000;
+ s.default_timeout.tv_usec = 99
9
* 1000;
ret = schedule(&s);
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
ret = schedule(&s);
PARA_EMERG_LOG("%s\n", para_strerror(-ret));