X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=1ca5db3c97aea79477fd935569e989de7052064d;hp=b7795a002a20f36349bd450522b99f746f3256ba;hb=d5538ff0dd9f6531a1a319b49c32bd72597fb2c3;hpb=ffb2eaa90429f6d5c3d369509efcdf91c5463dad diff --git a/command.c b/command.c index b7795a00..1ca5db3c 100644 --- a/command.c +++ b/command.c @@ -23,9 +23,9 @@ #include "afh.h" #include "afs.h" #include "server.h" -#include "vss.h" #include "list.h" #include "send.h" +#include "vss.h" #include "rc4.h" #include "net.h" #include "daemon.h" @@ -191,10 +191,10 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) { int i, ret; + char *msg = NULL; struct sender_command_data scd; if (argc < 2) { - char *msg = NULL; for (i = 0; senders[i].name; i++) { char *tmp = make_message("%s%s\n", msg? msg : "", senders[i].name); @@ -207,7 +207,6 @@ int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) } ret = check_sender_args(argc, argv, &scd); if (ret < 0) { - char *msg; if (scd.sender_num < 0) return ret; msg = senders[scd.sender_num].help(); @@ -215,6 +214,16 @@ int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) free(msg); return ret; } + + switch (scd.cmd_num) { + case SENDER_ADD: + case SENDER_DELETE: + assert(senders[scd.sender_num].resolve_target); + ret = senders[scd.sender_num].resolve_target(argv[3], &scd); + if (ret < 0) + return ret; + } + for (i = 0; i < 10; i++) { mutex_lock(mmd_mutex); if (mmd->sender_cmd_data.cmd_num >= 0) { @@ -259,7 +268,7 @@ int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv) mmd->num_commands, mmd->num_connects, conf.loglevel_arg, - supported_audio_formats(), + SERVER_AUDIO_FORMATS, sender_info ); mutex_unlock(mmd_mutex);