kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-23 21:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 82865 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82865 | mmichelson | 2007-09-18 15:09:02 -0500 (Tue, 18 Sep 2007) | 4 lines

Moving the logic for handling an empty membername to the create_member function so that there is a common place
where this occurs instead of being spread out to several different places.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-09-18 20:10:59 +00:00
parent ef87383055
commit b33123cf87
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/app_queue.c
View File

@@ -722,7 +722,10 @@ static struct member *create_queue_member(const char *interface, const char *mem
cur->penalty = penalty; cur->penalty = penalty;
cur->paused = paused; cur->paused = paused;
ast_copy_string(cur->interface, interface, sizeof(cur->interface)); ast_copy_string(cur->interface, interface, sizeof(cur->interface));
ast_copy_string(cur->membername, membername, sizeof(cur->membername)); if(!ast_strlen_zero(membername))
ast_copy_string(cur->membername, membername, sizeof(cur->membername));
else
ast_copy_string(cur->membername, interface, sizeof(cur->membername));
if (!strchr(cur->interface, '/')) if (!strchr(cur->interface, '/'))
ast_log(LOG_WARNING, "No location at interface '%s'\n", interface); ast_log(LOG_WARNING, "No location at interface '%s'\n", interface);
cur->status = ast_device_state(interface); cur->status = ast_device_state(interface);
@@ -1237,7 +1240,7 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
while ((interface = ast_category_browse(member_config, interface))) { while ((interface = ast_category_browse(member_config, interface))) {
rt_handle_member_record(q, interface, rt_handle_member_record(q, interface,
S_OR(ast_variable_retrieve(member_config, interface, "membername"), interface), ast_variable_retrieve(member_config, interface, "membername"),
ast_variable_retrieve(member_config, interface, "penalty"), ast_variable_retrieve(member_config, interface, "penalty"),
ast_variable_retrieve(member_config, interface, "paused")); ast_variable_retrieve(member_config, interface, "paused"));
} }
@@ -3282,7 +3285,7 @@ static void reload_queue_members(void)
char *queue_name; char *queue_name;
char *member; char *member;
char *interface; char *interface;
char *membername; char *membername = NULL;
char *penalty_tok; char *penalty_tok;
int penalty = 0; int penalty = 0;
char *paused_tok; char *paused_tok;
@@ -3525,10 +3528,6 @@ static int aqm_exec(struct ast_channel *chan, void *data)
} }
} }
if (ast_strlen_zero(args.membername))
args.membername = args.interface;
switch (add_to_queue(args.queuename, args.interface, args.membername, penalty, 0, queue_persistent_members)) { switch (add_to_queue(args.queuename, args.interface, args.membername, penalty, 0, queue_persistent_members)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(args.queuename, chan->uniqueid, args.interface, "ADDMEMBER", "%s", ""); ast_queue_log(args.queuename, chan->uniqueid, args.interface, "ADDMEMBER", "%s", "");
@@ -4169,8 +4168,7 @@ static int reload_queues(int reload)
if (!ast_strlen_zero(args.membername)) { if (!ast_strlen_zero(args.membername)) {
membername = args.membername; membername = args.membername;
while (*membername && *membername < 33) membername++; while (*membername && *membername < 33) membername++;
} else }
membername = interface;
/* Find the old position in the list */ /* Find the old position in the list */
ast_copy_string(tmpmem.interface, interface, sizeof(tmpmem.interface)); ast_copy_string(tmpmem.interface, interface, sizeof(tmpmem.interface));
@@ -4570,9 +4568,6 @@ static int manager_add_queue_member(struct mansession *s, const struct message *
else else
paused = abs(ast_true(paused_s)); paused = abs(ast_true(paused_s));
if (ast_strlen_zero(membername))
membername = interface;
switch (add_to_queue(queuename, interface, membername, penalty, paused, queue_persistent_members)) { switch (add_to_queue(queuename, interface, membername, penalty, paused, queue_persistent_members)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(queuename, "MANAGER", interface, "ADDMEMBER", "%s", ""); ast_queue_log(queuename, "MANAGER", interface, "ADDMEMBER", "%s", "");
@@ -4670,7 +4665,7 @@ static int manager_queue_log_custom(struct mansession *s, const struct message *
static int handle_queue_add_member(int fd, int argc, char *argv[]) static int handle_queue_add_member(int fd, int argc, char *argv[])
{ {
char *queuename, *interface, *membername; char *queuename, *interface, *membername = NULL;
int penalty; int penalty;
if ((argc != 6) && (argc != 8) && (argc != 10)) { if ((argc != 6) && (argc != 8) && (argc != 10)) {
@@ -4701,8 +4696,6 @@ static int handle_queue_add_member(int fd, int argc, char *argv[])
if (argc >= 10) { if (argc >= 10) {
membername = argv[9]; membername = argv[9];
} else {
membername = interface;
} }
switch (add_to_queue(queuename, interface, membername, penalty, 0, queue_persistent_members)) { switch (add_to_queue(queuename, interface, membername, penalty, 0, queue_persistent_members)) {