From 90a6848c67831b8c4adaa0855bb05705dbf3b00c Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Wed, 22 Feb 2012 17:34:33 +0000
Subject: [PATCH] Fix chan_misdn after the lastest opaquification changes
It now compiles, but there are some unrelated warnings for set but
unused variables.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_misdn.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 535fee4cb4..d760a1ed06 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -653,7 +653,8 @@ static void send_digit_to_chan(struct chan_list *cl, char digit);
static int pbx_start_chan(struct chan_list *ch);
-#define MISDN_ASTERISK_TECH_PVT(ast) ast->tech_pvt
+#define MISDN_ASTERISK_TECH_PVT(ast) ast_channel_tech_pvt(ast)
+#define MISDN_ASTERISK_TECH_PVT_SET(ast, value) ast_channel_tech_pvt_set(ast, value)
#include "asterisk/strings.h"
@@ -7061,7 +7062,7 @@ static int misdn_hangup(struct ast_channel *ast)
ast_mutex_unlock(&release_lock);
return -1;
}
- MISDN_ASTERISK_TECH_PVT(ast) = NULL;
+ MISDN_ASTERISK_TECH_PVT_SET(ast, NULL);
if (!misdn_chan_is_valid(p)) {
ast_mutex_unlock(&release_lock);
@@ -8143,7 +8144,7 @@ static struct ast_channel *misdn_new(struct chan_list *chlist, int state, char
/* Link the channel and private together */
chan_list_ref(chlist, "Give a reference to ast_channel");
- MISDN_ASTERISK_TECH_PVT(tmp) = chlist;
+ MISDN_ASTERISK_TECH_PVT_SET(tmp, chlist);
chlist->ast = tmp;
misdn_cfg_get(0, MISDN_GEN_BRIDGING, &bridging, sizeof(bridging));
@@ -8445,7 +8446,7 @@ static void release_chan(struct chan_list *ch, struct misdn_bchannel *bc)
struct chan_list *ast_ch;
ast_ch = MISDN_ASTERISK_TECH_PVT(ast);
- MISDN_ASTERISK_TECH_PVT(ast) = NULL;
+ MISDN_ASTERISK_TECH_PVT_SET(ast, NULL);
chan_misdn_log(1, bc->port,
"* RELEASING CHANNEL pid:%d context:%s dialed:%s caller:\"%s\" <%s>\n",
bc->pid,
@@ -8509,7 +8510,7 @@ static void release_chan_early(struct chan_list *ch)
struct chan_list *ast_ch;
ast_ch = MISDN_ASTERISK_TECH_PVT(ast);
- MISDN_ASTERISK_TECH_PVT(ast) = NULL;
+ MISDN_ASTERISK_TECH_PVT_SET(ast, NULL);
if (ast_channel_state(ast) != AST_STATE_RESERVED) {
ast_setstate(ast, AST_STATE_DOWN);
--
GitLab