Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Formatting changes - Removing some red white space and adding some curly brackets.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Olle Johansson 14 years ago
parent 64cb39333e
commit 82e1dda364
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File

33
channels/chan_local.c
Unescape View File

@ -287,7 +287,7 @@ static int local_devicestate(void *data)
if (!(context = strchr(exten, '@'))) { if (!(context = strchr(exten, '@'))) {
ast_log(LOG_WARNING, "Someone used Local/%s somewhere without a @context. This is bad.\n", exten); ast_log(LOG_WARNING, "Someone used Local/%s somewhere without a @context. This is bad.\n", exten);
return AST_DEVICE_INVALID; return AST_DEVICE_INVALID;
} }
*context++ = '\0'; *context++ = '\0';
@ -299,9 +299,9 @@ static int local_devicestate(void *data)
ast_debug(3, "Checking if extension %s@%s exists (devicestate)\n", exten, context); ast_debug(3, "Checking if extension %s@%s exists (devicestate)\n", exten, context);
res = ast_exists_extension(NULL, context, exten, 1, NULL); res = ast_exists_extension(NULL, context, exten, 1, NULL);
if (!res) if (!res)
return AST_DEVICE_INVALID; return AST_DEVICE_INVALID;
res = AST_DEVICE_NOT_INUSE; res = AST_DEVICE_NOT_INUSE;
it = ao2_iterator_init(locals, 0); it = ao2_iterator_init(locals, 0);
@ -335,7 +335,7 @@ static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct
if (ast_test_flag(p, LOCAL_BRIDGE)) { if (ast_test_flag(p, LOCAL_BRIDGE)) {
/* Find the opposite channel */ /* Find the opposite channel */
bridged = (bridge == p->owner ? p->chan : p->owner); bridged = (bridge == p->owner ? p->chan : p->owner);
/* Now see if the opposite channel is bridged to anything */ /* Now see if the opposite channel is bridged to anything */
if (!bridged) { if (!bridged) {
bridged = bridge; bridged = bridge;
@ -406,7 +406,7 @@ query_cleanup:
* local_pvt, it is impossible to guarantee it will not be destroyed by another thread * local_pvt, it is impossible to guarantee it will not be destroyed by another thread
* during deadlock avoidance. * during deadlock avoidance.
*/ */
static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_frame *f, static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_frame *f,
struct ast_channel *us, int us_locked) struct ast_channel *us, int us_locked)
{ {
struct ast_channel *other = NULL; struct ast_channel *other = NULL;
@ -451,8 +451,9 @@ static int local_answer(struct ast_channel *ast)
int isoutbound; int isoutbound;
int res = -1; int res = -1;
if (!p) if (!p) {
return -1; return -1;
}
ao2_lock(p); ao2_lock(p);
ao2_ref(p, 1); ao2_ref(p, 1);
@ -619,8 +620,9 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{ {
struct local_pvt *p = newchan->tech_pvt; struct local_pvt *p = newchan->tech_pvt;
if (!p) if (!p) {
return -1; return -1;
}
ao2_lock(p); ao2_lock(p);
@ -629,10 +631,11 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
ao2_unlock(p); ao2_unlock(p);
return -1; return -1;
} }
if (p->owner == oldchan) if (p->owner == oldchan) {
p->owner = newchan; p->owner = newchan;
else } else {
p->chan = newchan; p->chan = newchan;
}
/* Do not let a masquerade cause a Local channel to be bridged to itself! */ /* Do not let a masquerade cause a Local channel to be bridged to itself! */
if (!ast_check_hangup(newchan) && ((p->owner && p->owner->_bridge == p->chan) || (p->chan && p->chan->_bridge == p->owner))) { if (!ast_check_hangup(newchan) && ((p->owner && p->owner->_bridge == p->chan) || (p->chan && p->chan->_bridge == p->owner))) {
@ -653,8 +656,9 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da
struct ast_frame f = { AST_FRAME_CONTROL, }; struct ast_frame f = { AST_FRAME_CONTROL, };
int isoutbound; int isoutbound;
if (!p) if (!p) {
return -1; return -1;
}
ao2_ref(p, 1); /* ref for local_queue_frame */ ao2_ref(p, 1); /* ref for local_queue_frame */
@ -803,8 +807,8 @@ static int local_sendhtml(struct ast_channel *ast, int subclass, const char *dat
return res; return res;
} }
/*! \brief Initiate new call, part of PBX interface /*! \brief Initiate new call, part of PBX interface
* dest is the dial string */ * dest is the dial string */
static int local_call(struct ast_channel *ast, char *dest, int timeout) static int local_call(struct ast_channel *ast, char *dest, int timeout)
{ {
struct local_pvt *p = ast->tech_pvt; struct local_pvt *p = ast->tech_pvt;
@ -1136,7 +1140,7 @@ static struct ast_channel *local_new(struct local_pvt *p, int state, const char
ama = p->owner->amaflags; ama = p->owner->amaflags;
else else
ama = 0; ama = 0;
if (!(tmp = ast_channel_alloc(1, state, 0, 0, t, p->exten, p->context, linkedid, ama, "Local/%s@%s-%04x;1", p->exten, p->context, randnum)) if (!(tmp = ast_channel_alloc(1, state, 0, 0, t, p->exten, p->context, linkedid, ama, "Local/%s@%s-%04x;1", p->exten, p->context, randnum))
|| !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, t, p->exten, p->context, linkedid, ama, "Local/%s@%s-%04x;2", p->exten, p->context, randnum))) { || !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, t, p->exten, p->context, linkedid, ama, "Local/%s@%s-%04x;2", p->exten, p->context, randnum))) {
if (tmp) { if (tmp) {
tmp = ast_channel_release(tmp); tmp = ast_channel_release(tmp);
@ -1218,8 +1222,9 @@ static char *locals_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
return NULL; return NULL;
} }
if (a->argc != 3) if (a->argc != 3) {
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
}
if (ao2_container_count(locals) == 0) { if (ao2_container_count(locals) == 0) {
ast_cli(a->fd, "No local channels in use\n"); ast_cli(a->fd, "No local channels in use\n");

Write Preview
Loading…
Cancel
Save