const char *name;
/** pointer to the function that handles the command */
int (*handler)(int, int, char**);
+int (*line_handler)(int, char*);
/** one-line description of the command */
const char *description;
/** summary of the command line options */
extern const char *status_item_list[NUM_STAT_ITEMS];
-static int com_grab(int, int, char **);
+static int com_grab(int, char *);
static int com_cycle(int, int, char **);
static int com_help(int, int, char **);
static int com_off(int, int, char **);
},
{
.name = "grab",
-.handler = com_grab,
+.line_handler = com_grab,
.description = "grab the audio stream",
.synopsis = "-- grab [grab_options]",
.help =
flag += 1;
if (s->wpid > 0)
flag += 2;
- if (flag != '0')
- flag += s->format * 4;
decoder_flags[i] = flag;
}
decoder_flags[MAX_STREAM_SLOTS] = '\0';
long unsigned sec, usec;
char *tmp;
- PARA_INFO_LOG("line: %s\n", line);
+// PARA_INFO_LOG("line: %s\n", line);
if (!line)
return;
itemnum = stat_line_valid(line);
free(tmp);
if (ret < 0)
goto out;
- PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i], filters[j].name);
- ret = add_filter(i, para_strdup("wav"));
+ PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
+ filters[j].name);
+ ret = add_filter(i, "wav");
if (ret < 0)
goto out;
PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]);
}
#endif
-static int com_grab(int fd, int argc, char **argv)
+
+static int com_grab(int fd, char *cmdline)
{
struct grab_client *gc;
struct filter_node *fn;
int i, err;
char *msg;
- PARA_INFO_LOG("argc: %d, argv[0]: %s, optind: %d\n", argc, argv[0], optind);
- gc = grab_client_new(fd, argc, argv, &err);
- PARA_INFO_LOG("argc: %d, argv[0]: %s, optind: %d\n", argc, argv[0], optind);
+ gc = grab_client_new(fd, cmdline, &err);
if (!gc)
goto err_out;
fn = find_filter_node(gc->conf->slot_arg, gc->audio_format_num, gc->conf->filter_num_arg);
static int handle_connect(void)
{
int i, argc, ret, clifd = -1;
- char *buf = para_malloc(MAXLINE), **argv = NULL;
+ char *p, *buf = para_malloc(MAXLINE), **argv = NULL;
struct sockaddr_un unix_addr;
ret = para_accept(audiod_socket, &unix_addr, sizeof(struct sockaddr_un));
ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
if (ret < 0)
goto out;
- PARA_INFO_LOG("connection from user %i\n", ret);
+ PARA_INFO_LOG("connection from user %i, buf: %s\n", ret, buf);
ret = check_perms(ret);
if (ret < 0)
goto out;
- argc = split_args(buf, &argv, "\n");
- PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
+ ret = -E_INVALID_AUDIOD_CMD;
+ p = strchr(buf, '\n');
+ if (!p)
+ p = "";
+ else {
+ *p = '\0';
+ p++;
+ }
for (i = 0; cmds[i].name; i++) {
- if (strcmp(cmds[i].name, argv[0]))
+ int j;
+ if (strcmp(cmds[i].name, buf))
continue;
- ret = cmds[i].handler(clifd, argc, argv);
+ if (cmds[i].handler) {
+ argc = split_args(buf, &argv, "\n");
+ PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
+ ret = cmds[i].handler(clifd, argc, argv);
+ goto out;
+ }
+ for (j = 0; p[j]; j++)
+ if (p[j] == '\n')
+ p[j] = ' ';
+ PARA_INFO_LOG("cmd: %s, options: %s\n", buf, p);
+ ret = cmds[i].line_handler(clifd, p);
goto out;
}
ret = -E_INVALID_AUDIOD_CMD; /* cmd not found */
repeat:
FD_ZERO(&wfds);
FD_ZERO(&rfds);
+ max_fileno = -1;
/* always check signal pipe and the local socket */
para_fd_set(signal_pipe, &rfds, &max_fileno);
para_fd_set(audiod_socket, &rfds, &max_fileno);
char *cf;
int i;
- fprintf(stderr, "argc: %d\n", argc);
valid_fd_012();
hostname = para_hostname();
cmdline_parser(argc, argv, &conf);