[svn-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r199017 - /team/jpeeler/asteri...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Jun  3 16:49:43 2009
New Revision: 199017

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=199017
Log:
remove some unneeded code

Modified:
    team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
    team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.c

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c?view=diff&rev=199017&r1=199016&r2=199017
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c Wed Jun  3 16:49:43 2009
@@ -10728,7 +10728,7 @@
 		tmp->answeronpolarityswitch = conf->chan.answeronpolarityswitch;
 		tmp->hanguponpolarityswitch = conf->chan.hanguponpolarityswitch;
 		tmp->sendcalleridafter = conf->chan.sendcalleridafter;
-	/* jpeeler, make pri service function */
+
 		if (!here) {
 			tmp->locallyblocked = tmp->remotelyblocked = 0;
 			if ((chan_sig == SIG_PRI) || (chan_sig == SIG_BRI) || (chan_sig == SIG_BRI_PTMP) || (chan_sig == SIG_SS7)) {

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.c?view=diff&rev=199017&r1=199016&r2=199017
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.c Wed Jun  3 16:49:43 2009
@@ -1900,17 +1900,7 @@
 		pri_rel(p->pri);
 		return -1;
 	}
-	/* jpeeler
-	if (p->bearer || (mysig == SIG_FXSKS)) {
-			if (p->bearer) {
-				ast_debug(1, "Oooh, I have a bearer on %d (%d:%d)\n", PVT_TO_CHANNEL(p->bearer), p->bearer->logicalspan, p->bearer->channel);
-				p->bearer->call = p->call;
-			} else
-				ast_debug(1, "I'm being setup with no bearer right now...\n");
-
-			pri_set_crv(p->pri->pri, p->call, p->channel, 0);
-		}
-	*/
+
 	p->digital = IS_DIGITAL(ast->transfercapability);
 	/* Add support for exclusive override */
 	if (p->priexclusive)
@@ -2171,7 +2161,7 @@
 				}
 			}
 			p->proceeding = 1;
-			p->dialing = 0; /* jpeeler */
+			p->dialing = 0;
 		}
 		/* don't continue in ast_indicate */
 		res = 0;
@@ -2253,8 +2243,7 @@
 	/* Send a pri acknowledge */
 	if (!pri_grab(p, p->pri)) {
 		p->proceeding = 1;
-		/* jpeeler */
-		//p->dialing = 0;
+		p->dialing = 0;
 		res = pri_answer(p->pri->pri, p->call, 0, !p->digital);
 		pri_rel(p->pri);
 	} else {