[asterisk-commits] rmudgett: branch 1.6.2 r277485 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jul 16 15:35:34 2010
New Revision: 277485

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277485
Log:
Merged revisions 277467 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r277467 | rmudgett | 2010-07-16 15:27:51 -0500 (Fri, 16 Jul 2010) | 22 lines
  
  Merged revisions 277419 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r277419 | rmudgett | 2010-07-16 15:18:54 -0500 (Fri, 16 Jul 2010) | 15 lines
    
    priexclusive in chan_dahdi.conf ignored when reloading dahdi module
    
    During a reload, the priexclusive and outsignalling parameters are not
    read in from the config file as intended.  Unfortunately, they get set to
    defaults as a result.  This patch makes sure that they do not get set to
    defaults during a reload.
    
    (closes issue #17441)
    Reported by: mtryfoss
    Patches:
          issue17441_v1.4.patch uploaded by rmudgett (license 664)
          issue17441_v1.6.2.patch uploaded by rmudgett (license 664)
          issue17441_trunk.patch uploaded by rmudgett (license 664)
    Tested by: rmudgett
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=277485&r1=277484&r2=277485
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Fri Jul 16 15:35:34 2010
@@ -10192,6 +10192,8 @@
 					return NULL;
 				}
 			}
+			tmp->outsigmod = conf->chan.outsigmod;
+
 #ifdef HAVE_SS7
 			if (chan_sig == SIG_SS7) {
 				struct dahdi_ss7 *ss7;
@@ -10401,6 +10403,8 @@
 						tmp->pri = &pris[span];
 						tmp->prioffset = offset;
 						tmp->call = NULL;
+
+						tmp->priexclusive = conf->chan.priexclusive;
 					} else {
 						ast_log(LOG_ERROR, "Channel %d is reserved for D-channel.\n", offset);
 						destroy_dahdi_pvt(&tmp);
@@ -10515,7 +10519,6 @@
 			tmp->mwimonitor_rpas = conf->chan.mwimonitor_rpas;
 		}
 		tmp->sig = chan_sig;
-		tmp->outsigmod = conf->chan.outsigmod;
 		tmp->ringt_base = ringt_base;
 		tmp->firstradio = 0;
 		if ((chan_sig == SIG_FXOKS) || (chan_sig == SIG_FXOLS) || (chan_sig == SIG_FXOGS))
@@ -10570,7 +10573,6 @@
 		tmp->dahditrcallerid = conf->chan.dahditrcallerid;
 		tmp->restrictcid = conf->chan.restrictcid;
 		tmp->use_callingpres = conf->chan.use_callingpres;
-		tmp->priexclusive = conf->chan.priexclusive;
 		if (tmp->usedistinctiveringdetection) {
 			if (!tmp->use_callerid) {
 				ast_log(LOG_NOTICE, "Distinctive Ring detect requires 'usecallerid' be on\n");