[svn-commits] pabelanger: trunk r355667 - /trunk/apps/app_rpt.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Feb 16 16:00:31 2012
New Revision: 355667

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=355667
Log:
Fix channel opaquification for app_rpt

Modified:
    trunk/apps/app_rpt.c

Modified: trunk/apps/app_rpt.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_rpt.c?view=diff&rev=355667&r1=355666&r2=355667
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Thu Feb 16 16:00:31 2012
@@ -10843,10 +10843,10 @@
 #ifndef	NEW_ASTERISK
 		myrpt->rxchannel->whentohangup = 0;
 #endif
-		myrpt->rxchannel->appl = "Apprpt";
-		myrpt->rxchannel->data = "(Repeater Rx)";
+		ast_channel_appl_set(myrpt->rxchannel, "Apprpt");
+		ast_channel_data_set(myrpt->rxchannel, "(Repeater Rx)");
 		ast_verb(3, "rpt (Rx) initiating call to %s/%s on %s\n",
-				tmpstr,tele,myrpt->rxchannel->name);
+				tmpstr, tele, ast_channel_name(myrpt->rxchannel));
 		ast_call(myrpt->rxchannel,tele,999);
 		if (myrpt->rxchannel->_state != AST_STATE_UP)
 		{
@@ -10901,10 +10901,10 @@
 #ifndef	NEW_ASTERISK
 			myrpt->txchannel->whentohangup = 0;
 #endif
-			myrpt->txchannel->appl = "Apprpt";
-			myrpt->txchannel->data = "(Repeater Tx)";
+			ast_channel_appl_set(myrpt->txchannel, "Apprpt");
+			ast_channel_data_set(myrpt->txchannel, "(Repeater Tx)");
 			ast_verb(3, "rpt (Tx) initiating call to %s/%s on %s\n",
-					tmpstr,tele,myrpt->txchannel->name);
+					tmpstr, tele, ast_channel_name(myrpt->txchannel));
 			ast_call(myrpt->txchannel,tele,999);
 			if (myrpt->rxchannel->_state != AST_STATE_UP)
 			{
@@ -11032,7 +11032,7 @@
 	myrpt->conf = ci.confno;
 	/* make a conference for the pseudo */
 	ci.chan = 0;
-	if ((strstr(myrpt->txchannel->name,"pseudo") == NULL) &&
+	if ((strstr(ast_channel_name(myrpt->txchannel), "pseudo") == NULL) &&
 		(myrpt->dahditxchannel == myrpt->txchannel))
 	{
 		/* get tx channel's port number */