kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ast_channel_walk become ast_channel_walk_locked

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-20 16:30:10 +00:00
parent e1b72cf020
commit 6195dd35e0
13 changed files with 153 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/res_monitor.c
View File

@@ -333,12 +333,13 @@ static int start_monitor_action(struct mansession *s, struct message *m)
astman_send_error(s, m, "No channel specified");
return 0;
}
c = ast_channel_walk(NULL);
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
c = ast_channel_walk(c);
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
if (!c) {
astman_send_error(s, m, "No such channel");
@@ -360,6 +361,7 @@ static int start_monitor_action(struct mansession *s, struct message *m)
return 0;
}
}
ast_mutex_unlock(&c->lock);
astman_send_ack(s, m, "Started monitoring channel");
return 0;
}
@@ -368,22 +370,26 @@ static int stop_monitor_action(struct mansession *s, struct message *m)
{
struct ast_channel *c = NULL;
char *name = astman_get_header(m, "Channel");
int res;
if((!name)||(!strlen(name))) {
astman_send_error(s, m, "No channel specified");
return 0;
}
c = ast_channel_walk(NULL);
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
c = ast_channel_walk(c);
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
}
if( ast_monitor_stop( c, 1 ) ) {
res = ast_monitor_stop( c, 1 );
ast_mutex_unlock(&c->lock);
if( res ) {
astman_send_error(s, m, "Could not stop monitoring channel");
return 0;
}
@@ -404,12 +410,13 @@ static int change_monitor_action(struct mansession *s, struct message *m)
astman_send_error(s, m, "No filename specified");
return 0;
}
c = ast_channel_walk(NULL);
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
c = ast_channel_walk(c);
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
if (!c) {
astman_send_error(s, m, "No such channel");

6
res/res_parking.c
View File

@@ -737,7 +737,7 @@ int ast_pickup_call(struct ast_channel *chan)
{
struct ast_channel *cur;
int res = -1;
cur = ast_channel_walk(NULL);
cur = ast_channel_walk_locked(NULL);
while(cur) {
if (!cur->pbx &&
(cur != chan) &&
@@ -746,7 +746,8 @@ int ast_pickup_call(struct ast_channel *chan)
(cur->_state == AST_STATE_RING))) {
break;
}
cur = ast_channel_walk(cur);
ast_mutex_unlock(&cur->lock);
cur = ast_channel_walk_locked(cur);
}
if (cur) {
ast_log(LOG_DEBUG, "Call pickup on chan '%s' by '%s'\n",cur->name, chan->name);
@@ -759,6 +760,7 @@ int ast_pickup_call(struct ast_channel *chan)
res = ast_channel_masquerade(cur, chan);
if (res)
ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan->name, cur->name); /* Done */
ast_mutex_unlock(&cur->lock);
} else {
ast_log(LOG_DEBUG, "No call pickup possible...\n");
}