projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add sender subcommand "status".
[paraslash.git]
/
command.c
diff --git
a/command.c
b/command.c
index 92002c340e62c0593bc2b534193d8fecb1ea997b..585bb31c54b8df7395c8330f7f4d6e7b15890ad8 100644
(file)
--- a/
command.c
+++ b/
command.c
@@
-344,7
+344,10
@@
static int com_sender(struct command_context *cc)
if (ret < 0) {
if (scd.sender_num < 0)
return ret;
if (ret < 0) {
if (scd.sender_num < 0)
return ret;
- msg = senders[scd.sender_num].help();
+ if (strcmp(cc->argv[2], "status") == 0)
+ msg = senders[scd.sender_num].status();
+ else
+ msg = senders[scd.sender_num].help();
return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
}
return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
}
@@
-374,17
+377,12
@@
static int com_sender(struct command_context *cc)
/* server info */
static int com_si(struct command_context *cc)
{
/* server info */
static int com_si(struct command_context *cc)
{
- int
i,
ret;
- char *msg, *ut
, *sender_info = NULL
;
+ int ret;
+ char *msg, *ut;
if (cc->argc != 1)
return -E_COMMAND_SYNTAX;
mutex_lock(mmd_mutex);
if (cc->argc != 1)
return -E_COMMAND_SYNTAX;
mutex_lock(mmd_mutex);
- for (i = 0; senders[i].name; i++) {
- char *info = senders[i].info();
- sender_info = para_strcat(sender_info, info);
- free(info);
- }
ut = get_server_uptime_str(now);
ret = xasprintf(&msg,
"up: %s\nplayed: %u\n"
ut = get_server_uptime_str(now);
ret = xasprintf(&msg,
"up: %s\nplayed: %u\n"
@@
-392,8
+390,7
@@
static int com_si(struct command_context *cc)
"afs_pid: %d\n"
"connections (active/accepted/total): %u/%u/%u\n"
"current loglevel: %s\n"
"afs_pid: %d\n"
"connections (active/accepted/total): %u/%u/%u\n"
"current loglevel: %s\n"
- "supported audio formats: %s\n"
- "%s",
+ "supported audio formats: %s\n",
ut, mmd->num_played,
(int)getppid(),
(int)mmd->afs_pid,
ut, mmd->num_played,
(int)getppid(),
(int)mmd->afs_pid,
@@
-401,12
+398,10
@@
static int com_si(struct command_context *cc)
mmd->num_commands,
mmd->num_connects,
conf.loglevel_arg,
mmd->num_commands,
mmd->num_connects,
conf.loglevel_arg,
- AUDIO_FORMAT_HANDLERS,
- sender_info
+ AUDIO_FORMAT_HANDLERS
);
mutex_unlock(mmd_mutex);
free(ut);
);
mutex_unlock(mmd_mutex);
free(ut);
- free(sender_info);
return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
}
return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
}