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

* Add channel locking around datastore operations that expect the channel

Browse Source 
to be locked.
* Document why we don't record Local channels in the dialed interfaces list.
* Remove the dialed variable as it isn't needed.
* Restructure some code for clarity and coding guidelines stuff


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@91783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-12-07 16:38:48 +00:00
parent d1f1b3c4d6
commit 3e913c706f
1 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
apps/app_dial.c
View File

@@ -1103,7 +1103,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
char *interface = ast_strdupa(number); char *interface = ast_strdupa(number);
char *tech = strsep(&number, "/"); char *tech = strsep(&number, "/");
/* find if we already dialed this interface */ /* find if we already dialed this interface */
int dialed = 0;
struct ast_dialed_interface *di; struct ast_dialed_interface *di;
AST_LIST_HEAD(, ast_dialed_interface) *dialed_interfaces; AST_LIST_HEAD(, ast_dialed_interface) *dialed_interfaces;
num_dialed++; num_dialed++;
@@ -1124,49 +1123,67 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
} }
ast_copy_string(numsubst, number, sizeof(numsubst)); ast_copy_string(numsubst, number, sizeof(numsubst));
/* Request the peer */ /* Request the peer */
if (!(datastore = ast_channel_datastore_find(chan, &dialed_interface_info, NULL))) {
if(!(datastore = ast_channel_datastore_alloc(&dialed_interface_info, NULL))) { ast_channel_lock(chan);
datastore = ast_channel_datastore_find(chan, &dialed_interface_info, NULL);
ast_channel_unlock(chan);
if (datastore)
dialed_interfaces = datastore->data;
else {
if (!(datastore = ast_channel_datastore_alloc(&dialed_interface_info, NULL))) {
ast_log(LOG_WARNING, "Unable to create channel datastore for dialed interfaces. Aborting!\n"); ast_log(LOG_WARNING, "Unable to create channel datastore for dialed interfaces. Aborting!\n");
free(tmp); free(tmp);
goto out; goto out;
} }
else {
datastore->inheritance = DATASTORE_INHERIT_FOREVER; datastore->inheritance = DATASTORE_INHERIT_FOREVER;
if((dialed_interfaces = ast_calloc(1, sizeof(*dialed_interfaces)))) {
datastore->data = dialed_interfaces; if (!(dialed_interfaces = ast_calloc(1, sizeof(*dialed_interfaces)))) {
AST_LIST_HEAD_INIT(dialed_interfaces); free(tmp);
ast_channel_datastore_add(chan, datastore); goto out;
} else {
free(tmp);
goto out;
}
} }
} else
dialed_interfaces = datastore->data; datastore->data = dialed_interfaces;
AST_LIST_HEAD_INIT(dialed_interfaces);
ast_channel_lock(chan);
ast_channel_datastore_add(chan, datastore);
ast_channel_unlock(chan);
}
AST_LIST_LOCK(dialed_interfaces); AST_LIST_LOCK(dialed_interfaces);
AST_LIST_TRAVERSE(dialed_interfaces, di, list) { AST_LIST_TRAVERSE(dialed_interfaces, di, list) {
/* XXX case sensitive??? */ if (!strcasecmp(di->interface, interface)) {
if(!strcasecmp(di->interface, interface)) { ast_log(LOG_WARNING, "Skipping dialing interface '%s' again since it has already been dialed\n",
dialed = 1; di->interface);
break; break;
} }
} }
if(!dialed && strcasecmp(tech, "Local")) { AST_LIST_UNLOCK(dialed_interfaces);
if(!(di = ast_calloc(1, sizeof(*di) + strlen(interface)))) {
if (di) {
fulldial++;
free(tmp);
continue;
}
/* It is always ok to dial a Local interface. We only keep track of
* which "real" interfaces have been dialed. The Local channel will
* inherit this list so that if it ends up dialing a real interface,
* it won't call one that has already been called. */
if (strcasecmp(tech, "Local")) {
if (!(di = ast_calloc(1, sizeof(*di) + strlen(interface)))) {
AST_LIST_UNLOCK(dialed_interfaces); AST_LIST_UNLOCK(dialed_interfaces);
free(tmp); free(tmp);
goto out; goto out;
} }
strcpy(di->interface, interface); strcpy(di->interface, interface);
AST_LIST_LOCK(dialed_interfaces);
AST_LIST_INSERT_TAIL(dialed_interfaces, di, list); AST_LIST_INSERT_TAIL(dialed_interfaces, di, list);
} else if (dialed) {
ast_log(LOG_WARNING, "Skipping dialing interface '%s' again since it has already been dialed\n", di->interface);
AST_LIST_UNLOCK(dialed_interfaces); AST_LIST_UNLOCK(dialed_interfaces);
fulldial++;
free(tmp);
continue;
} }
AST_LIST_UNLOCK(dialed_interfaces);
tmp->chan = ast_request(tech, chan->nativeformats, numsubst, &cause); tmp->chan = ast_request(tech, chan->nativeformats, numsubst, &cause);
if (!tmp->chan) { if (!tmp->chan) {