04da92c379
There are many benefits to making the ast_channel an opaque handle, from
increasing maintainability to presenting ways to kill masquerades. This patch
kicks things off by taking things a field at a time, renaming the field to
'__do_not_use_${fieldname}' and then writing setters/getters and converting the
existing code to using them. When all fields are done, we can move ast_channel
to a C file from channel.h and lop off the '__do_not_use_'.
This patch sets up main/channel_interal_api.c to be the only file that actually
accesses the ast_channel's fields directly. The intent would be for any API
functions in channel.c to use the accessor functions. No more monkeying around
with channel internals. We should use our own APIs.
The interesting changes in this patch are the addition of
channel_internal_api.c, the moving of the AST_DATA stuff from channel.c to
channel_internal_api.c (note: the AST_DATA stuff will have to be reworked to
use accessor functions when ast_channel is really opaque), and some re-working
of the way channel iterators/callbacks are handled so as to avoid creating fake
ast_channels on the stack to pass in matching data by directly accessing fields
(since "name" is a stringfield and the fake channel doesn't init the
stringfields, you can't use the ast_channel_name_set() function). I went with
ast_channel_name(chan) for a getter, and ast_channel_name_set(chan, name) for a
setter.
The majority of the grunt-work for this change was done by writing a semantic
patch using Coccinelle ( http://coccinelle.lip6.fr/ ).
Review: https://reviewboard.asterisk.org/r/1655/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
95 lines
2.5 KiB
C
95 lines
2.5 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2009, Digium, Inc.
|
|
*
|
|
* Mark Michelson <mmichelson@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*!
|
|
* \file
|
|
* \brief "smart" channels
|
|
*
|
|
* \author Mark Michelson <mmichelson@digium.com>
|
|
*/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include "asterisk/autochan.h"
|
|
#include "asterisk/utils.h"
|
|
#include "asterisk/linkedlists.h"
|
|
#include "asterisk/options.h"
|
|
#include "asterisk/channel.h"
|
|
|
|
struct ast_autochan *ast_autochan_setup(struct ast_channel *chan)
|
|
{
|
|
struct ast_autochan *autochan;
|
|
|
|
if (!chan) {
|
|
return NULL;
|
|
}
|
|
|
|
if (!(autochan = ast_calloc(1, sizeof(*autochan)))) {
|
|
return NULL;
|
|
}
|
|
|
|
autochan->chan = ast_channel_ref(chan);
|
|
|
|
ast_channel_lock(autochan->chan);
|
|
AST_LIST_INSERT_TAIL(&autochan->chan->autochans, autochan, list);
|
|
ast_channel_unlock(autochan->chan);
|
|
|
|
ast_debug(1, "Created autochan %p to hold channel %s (%p)\n", autochan, ast_channel_name(chan), chan);
|
|
|
|
return autochan;
|
|
}
|
|
|
|
void ast_autochan_destroy(struct ast_autochan *autochan)
|
|
{
|
|
struct ast_autochan *autochan_iter;
|
|
|
|
ast_channel_lock(autochan->chan);
|
|
AST_LIST_TRAVERSE_SAFE_BEGIN(&autochan->chan->autochans, autochan_iter, list) {
|
|
if (autochan_iter == autochan) {
|
|
AST_LIST_REMOVE_CURRENT(list);
|
|
ast_debug(1, "Removed autochan %p from the list, about to free it\n", autochan);
|
|
break;
|
|
}
|
|
}
|
|
AST_LIST_TRAVERSE_SAFE_END;
|
|
ast_channel_unlock(autochan->chan);
|
|
|
|
autochan->chan = ast_channel_unref(autochan->chan);
|
|
|
|
ast_free(autochan);
|
|
}
|
|
|
|
void ast_autochan_new_channel(struct ast_channel *old_chan, struct ast_channel *new_chan)
|
|
{
|
|
struct ast_autochan *autochan;
|
|
|
|
AST_LIST_APPEND_LIST(&new_chan->autochans, &old_chan->autochans, list);
|
|
|
|
AST_LIST_TRAVERSE(&new_chan->autochans, autochan, list) {
|
|
if (autochan->chan == old_chan) {
|
|
autochan->chan = ast_channel_unref(old_chan);
|
|
autochan->chan = ast_channel_ref(new_chan);
|
|
|
|
ast_debug(1, "Autochan %p used to hold channel %s (%p) but now holds channel %s (%p)\n",
|
|
autochan, ast_channel_name(old_chan), old_chan, ast_channel_name(new_chan), new_chan);
|
|
}
|
|
}
|
|
}
|