Skip to content
Snippets Groups Projects
Commit 213f7a65 authored by Terry Wilson's avatar Terry Wilson
Browse files

Fix channel opaquification of stringfields for chan_vpb

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 0fe90432
No related branches found
No related tags found
No related merge requests found
...@@ -2475,7 +2475,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st ...@@ -2475,7 +2475,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st
else else
strcpy(tmp->exten, "s"); strcpy(tmp->exten, "s");
if (!ast_strlen_zero(me->language)) if (!ast_strlen_zero(me->language))
ast_string_field_set(tmp, language, me->language); ast_channel_language_set(tmp, me->language);
me->owner = tmp; me->owner = tmp;
...@@ -2538,13 +2538,13 @@ static struct ast_channel *vpb_request(const char *type, struct ast_format_cap * ...@@ -2538,13 +2538,13 @@ static struct ast_channel *vpb_request(const char *type, struct ast_format_cap *
if (group == -1) { if (group == -1) {
if (strncmp(s, p->dev + 4, sizeof p->dev) == 0) { if (strncmp(s, p->dev + 4, sizeof p->dev) == 0) {
if (!p->owner) { if (!p->owner) {
tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? requestor->linkedid : NULL); tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? ast_channel_linkedid(requestor) : NULL);
break; break;
} }
} }
} else { } else {
if ((p->group == group) && (!p->owner)) { if ((p->group == group) && (!p->owner)) {
tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? requestor->linkedid : NULL); tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? ast_channel_linkedid(requestor) : NULL);
break; break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment