if (ll < conf.loglevel_arg)
return;
- if (!logfile && conf.logfile_given)
- logfile = open_log(conf.logfile_arg);
- if (!logfile && conf.daemon_given)
- return;
- if (!logfile) {
- if (ll < WARNING)
- outfd = stdout;
- else
- outfd = stderr;
- } else
- outfd = logfile;
+ outfd = logfile? logfile : stderr;
time(&t1);
tm = localtime(&t1);
strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
struct timeval tv;
char *tmp;
+ PARA_INFO_LOG("line: %s\n", line);
if (!line)
return;
itemnum = stat_line_valid(line);
static int init_stream_io(void)
{
- int i, ret, receiver_num;
+ int i, ret, receiver_num, nf;
char *cmd;
for (i = 0; i < conf.stream_write_cmd_given; i++) {
free(cmd);
/* filters */
filter_init(filters);
+ nf = PARA_MAX(2, conf.filter_given) + 1;
+ PARA_INFO_LOG("allocating space for %d filters\n", nf);
FOR_EACH_AUDIO_FORMAT(i) {
- afi[i].filter_conf = para_malloc((conf.filter_given + 1) * sizeof(char *));
- afi[i].filters = para_malloc((conf.filter_given + 1) * sizeof(struct filter *));
+ afi[i].filter_conf = para_malloc(nf * sizeof(char *));
+ afi[i].filters = para_malloc(nf * sizeof(struct filter *));
}
if (!conf.no_default_filters_given)
return setup_default_filters();
return ret;
}
-static int com_stat(int fd, __unused int argc, __unused char **argv)
+static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
{
int i, ret;
char *buf = NULL;
return 1;
}
-static int __noreturn com_term(int fd, __unused int argc, __unused char **argv)
+static int __noreturn com_term(int fd, __a_unused int argc, __a_unused char **argv)
{
close(fd);
clean_exit(EXIT_SUCCESS, "terminating on user request");
}
-static int com_on(int fd, __unused int argc, __unused char **argv)
+static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
{
audiod_status = AUDIOD_ON;
close(fd);
return 1;
}
-static int com_off(int fd, __unused int argc, __unused char **argv)
+static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
{
audiod_status = AUDIOD_OFF;
close(fd);
return 1;
}
-static int com_sb(int fd, __unused int argc, __unused char **argv)
+static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
{
audiod_status = AUDIOD_STANDBY;
close(fd);
return 1;
}
-static int check_perms(struct ucred *c)
+static int check_perms(uid_t uid)
{
int i;
if (!conf.user_allow_given)
return 1;
for (i = 0; i < conf.user_allow_given; i++)
- if (c->uid == conf.user_allow_arg[i])
+ if (uid == conf.user_allow_arg[i])
return 1;
return -E_UCRED_PERM;
}
static int handle_connect(void)
{
int i, argc, ret, clifd = -1;
- struct ucred c;
char *buf = para_malloc(MAXLINE), **argv = NULL;
struct sockaddr_un unix_addr;
if (ret < 0)
goto out;
clifd = ret;
- ret = recv_cred_buffer(clifd, buf, MAXLINE - 1, &c);
+ ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
if (ret < 0)
goto out;
- PARA_INFO_LOG("pid: %i, uid: %i, gid: %i, ret: %i, buf: %s\n", c.pid, c.uid, c.gid, ret, buf);
- buf[ret] = '\0';
- ret = check_perms(&c);
+ PARA_INFO_LOG("connection from user %i\n", ret);
+ ret = check_perms(ret);
if (ret < 0)
goto out;
- argc = split_args(buf, &argv, '\n');
- PARA_INFO_LOG("argv[0]: %s\n", argv[0]);
+ argc = split_args(buf, &argv, "\n");
+ PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
for (i = 0; cmds[i].name; i++) {
if (strcmp(cmds[i].name, argv[0]))
continue;
- ret = cmds[i].handler(clifd, argc + 1, argv);
+ ret = cmds[i].handler(clifd, argc, argv);
goto out;
}
ret = -E_INVALID_AUDIOD_CMD; /* cmd not found */
a = &afi[s->format];
ret = a->receiver->pre_select(rn, rfds, wfds, tv);
// PARA_NOTICE_LOG("%s preselect: %d\n", a->receiver->name, ret);
- *max_fileno = MAX(*max_fileno, ret);
+ *max_fileno = PARA_MAX(*max_fileno, ret);
}
}
static void audiod_post_select(int select_ret, fd_set *rfds, fd_set *wfds)
char *cf;
int i;
+ fprintf(stderr, "argc: %d\n", argc);
valid_fd_012();
hostname = para_hostname();
cmdline_parser(argc, argv, &conf);
- para_drop_privileges(conf.user_arg);
+ para_drop_privileges(conf.user_arg, conf.group_arg);
cf = configfile_exists();
if (cf) {
if (cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
- fprintf(stderr, "parse error in config file\n");
+ PARA_EMERG_LOG("%s", "parse error in config file\n");
exit(EXIT_FAILURE);
}
}
+ if (conf.logfile_given)
+ logfile = open_log(conf.logfile_arg);
log_welcome("para_audiod", conf.loglevel_arg);
i = init_stream_io();
if (i < 0) {
- fprintf(stderr, "init stream io error: %s\n",
- PARA_STRERROR(-i));
+ PARA_EMERG_LOG("init stream io error: %s\n", PARA_STRERROR(-i));
exit(EXIT_FAILURE);
}
server_uptime(UPTIME_SET);