summaryrefslogtreecommitdiff
path: root/channels/chan_gtalk.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels/chan_gtalk.c')
-rw-r--r--channels/chan_gtalk.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 9b41ab106..3b5354cae 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -530,7 +530,7 @@ static int gtalk_ringing_ack(void *data, ikspak *pak)
static int gtalk_answer(struct ast_channel *ast)
{
- struct gtalk_pvt *p = ast->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(ast);
int res = 0;
ast_debug(1, "Answer!\n");
@@ -544,7 +544,7 @@ static int gtalk_answer(struct ast_channel *ast)
static enum ast_rtp_glue_result gtalk_get_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance **instance)
{
- struct gtalk_pvt *p = chan->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(chan);
enum ast_rtp_glue_result res = AST_RTP_GLUE_RESULT_FORBID;
if (!p)
@@ -563,7 +563,7 @@ static enum ast_rtp_glue_result gtalk_get_rtp_peer(struct ast_channel *chan, str
static void gtalk_get_codec(struct ast_channel *chan, struct ast_format_cap *result)
{
- struct gtalk_pvt *p = chan->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(chan);
ast_mutex_lock(&p->lock);
ast_format_cap_copy(result, p->peercap);
ast_mutex_unlock(&p->lock);
@@ -573,7 +573,7 @@ static int gtalk_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance
{
struct gtalk_pvt *p;
- p = chan->tech_pvt;
+ p = ast_channel_tech_pvt(chan);
if (!p)
return -1;
ast_mutex_lock(&p->lock);
@@ -1129,7 +1129,7 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
ast_log(LOG_WARNING, "Unable to allocate Gtalk channel structure!\n");
return NULL;
}
- tmp->tech = &gtalk_tech;
+ ast_channel_tech_set(tmp, &gtalk_tech);
/* Select our native format based on codec preference until we receive
something from another device to the contrary. */
@@ -1147,12 +1147,12 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
}
ast_codec_choose(&i->prefs, what, 1, &tmpfmt);
- ast_format_cap_add(tmp->nativeformats, &tmpfmt);
+ ast_format_cap_add(ast_channel_nativeformats(tmp), &tmpfmt);
ast_format_cap_iter_start(i->jointcap);
while (!(ast_format_cap_iter_next(i->jointcap, &tmpfmt))) {
if (AST_FORMAT_GET_TYPE(tmpfmt.id) == AST_FORMAT_TYPE_VIDEO) {
- ast_format_cap_add(tmp->nativeformats, &tmpfmt);
+ ast_format_cap_add(ast_channel_nativeformats(tmp), &tmpfmt);
}
}
ast_format_cap_iter_end(i->jointcap);
@@ -1166,15 +1166,15 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
ast_channel_set_fd(tmp, 3, ast_rtp_instance_fd(i->vrtp, 1));
}
if (state == AST_STATE_RING)
- tmp->rings = 1;
- tmp->adsicpe = AST_ADSI_UNAVAILABLE;
+ ast_channel_rings_set(tmp, 1);
+ ast_channel_adsicpe_set(tmp, AST_ADSI_UNAVAILABLE);
- ast_best_codec(tmp->nativeformats, &tmpfmt);
+ ast_best_codec(ast_channel_nativeformats(tmp), &tmpfmt);
ast_format_copy(&tmp->writeformat, &tmpfmt);
ast_format_copy(&tmp->rawwriteformat, &tmpfmt);
ast_format_copy(&tmp->readformat, &tmpfmt);
ast_format_copy(&tmp->rawreadformat, &tmpfmt);
- tmp->tech_pvt = i;
+ ast_channel_tech_pvt_set(tmp, i);
tmp->callgroup = client->callgroup;
tmp->pickupgroup = client->pickupgroup;
@@ -1183,7 +1183,7 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
if (!ast_strlen_zero(client->accountcode))
ast_channel_accountcode_set(tmp, client->accountcode);
if (client->amaflags)
- tmp->amaflags = client->amaflags;
+ ast_channel_amaflags_set(tmp, client->amaflags);
if (!ast_strlen_zero(client->language))
ast_channel_language_set(tmp, client->language);
if (!ast_strlen_zero(client->musicclass))
@@ -1198,12 +1198,12 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) {
tmp->dialed.number.str = ast_strdup(i->exten);
}
- tmp->priority = 1;
+ ast_channel_priority_set(tmp, 1);
if (i->rtp)
ast_jb_configure(tmp, &global_jbconf);
if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp));
- tmp->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
+ ast_channel_hangupcause_set(tmp, AST_CAUSE_SWITCH_CONGESTION);
ast_hangup(tmp);
tmp = NULL;
} else {
@@ -1624,10 +1624,10 @@ static struct ast_frame *gtalk_rtp_read(struct ast_channel *ast, struct gtalk_pv
if (p->owner) {
/* We already hold the channel lock */
if (f->frametype == AST_FRAME_VOICE) {
- if (!ast_format_cap_iscompatible(p->owner->nativeformats, &f->subclass.format)) {
+ if (!ast_format_cap_iscompatible(ast_channel_nativeformats(p->owner), &f->subclass.format)) {
ast_debug(1, "Oooh, format changed to %s\n", ast_getformatname(&f->subclass.format));
- ast_format_cap_remove_bytype(p->owner->nativeformats, AST_FORMAT_TYPE_AUDIO);
- ast_format_cap_add(p->owner->nativeformats, &f->subclass.format);
+ ast_format_cap_remove_bytype(ast_channel_nativeformats(p->owner), AST_FORMAT_TYPE_AUDIO);
+ ast_format_cap_add(ast_channel_nativeformats(p->owner), &f->subclass.format);
ast_set_read_format(p->owner, &p->owner->readformat);
ast_set_write_format(p->owner, &p->owner->writeformat);
}
@@ -1644,7 +1644,7 @@ static struct ast_frame *gtalk_rtp_read(struct ast_channel *ast, struct gtalk_pv
static struct ast_frame *gtalk_read(struct ast_channel *ast)
{
struct ast_frame *fr;
- struct gtalk_pvt *p = ast->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(ast);
ast_mutex_lock(&p->lock);
fr = gtalk_rtp_read(ast, p);
@@ -1655,17 +1655,17 @@ static struct ast_frame *gtalk_read(struct ast_channel *ast)
/*! \brief Send frame to media channel (rtp) */
static int gtalk_write(struct ast_channel *ast, struct ast_frame *frame)
{
- struct gtalk_pvt *p = ast->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(ast);
int res = 0;
char buf[256];
switch (frame->frametype) {
case AST_FRAME_VOICE:
- if (!(ast_format_cap_iscompatible(ast->nativeformats, &frame->subclass.format))) {
+ if (!(ast_format_cap_iscompatible(ast_channel_nativeformats(ast), &frame->subclass.format))) {
ast_log(LOG_WARNING,
"Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n",
ast_getformatname(&frame->subclass.format),
- ast_getformatname_multiple(buf, sizeof(buf), ast->nativeformats),
+ ast_getformatname_multiple(buf, sizeof(buf), ast_channel_nativeformats(ast)),
ast_getformatname(&ast->readformat),
ast_getformatname(&ast->writeformat));
return 0;
@@ -1701,7 +1701,7 @@ static int gtalk_write(struct ast_channel *ast, struct ast_frame *frame)
static int gtalk_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{
- struct gtalk_pvt *p = newchan->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(newchan);
ast_mutex_lock(&p->lock);
if ((p->owner != oldchan)) {
@@ -1737,7 +1737,7 @@ static int gtalk_sendtext(struct ast_channel *chan, const char *text)
{
int res = 0;
struct aji_client *client = NULL;
- struct gtalk_pvt *p = chan->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(chan);
if (!p->parent) {
ast_log(LOG_ERROR, "Parent channel not found\n");
@@ -1754,7 +1754,7 @@ static int gtalk_sendtext(struct ast_channel *chan, const char *text)
static int gtalk_digit_begin(struct ast_channel *chan, char digit)
{
- struct gtalk_pvt *p = chan->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(chan);
int res = 0;
ast_mutex_lock(&p->lock);
@@ -1770,7 +1770,7 @@ static int gtalk_digit_begin(struct ast_channel *chan, char digit)
static int gtalk_digit_end(struct ast_channel *chan, char digit, unsigned int duration)
{
- struct gtalk_pvt *p = chan->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(chan);
int res = 0;
ast_mutex_lock(&p->lock);
@@ -1854,9 +1854,9 @@ static int gtalk_sendhtml(struct ast_channel *ast, int subclass, const char *dat
* dest is the dial string */
static int gtalk_call(struct ast_channel *ast, const char *dest, int timeout)
{
- struct gtalk_pvt *p = ast->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(ast);
- if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) {
+ if ((ast_channel_state(ast) != AST_STATE_DOWN) && (ast_channel_state(ast) != AST_STATE_RESERVED)) {
ast_log(LOG_WARNING, "gtalk_call called on %s, neither down nor reserved\n", ast_channel_name(ast));
return -1;
}
@@ -1878,13 +1878,13 @@ static int gtalk_call(struct ast_channel *ast, const char *dest, int timeout)
/*! \brief Hangup a call through the gtalk proxy channel */
static int gtalk_hangup(struct ast_channel *ast)
{
- struct gtalk_pvt *p = ast->tech_pvt;
+ struct gtalk_pvt *p = ast_channel_tech_pvt(ast);
struct gtalk *client;
ast_mutex_lock(&p->lock);
client = p->parent;
p->owner = NULL;
- ast->tech_pvt = NULL;
+ ast_channel_tech_pvt_set(ast, NULL);
if (!p->alreadygone) {
gtalk_action(client, p, "terminate");
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-23 19:38:58 +0000