[asterisk-commits] rmudgett: trunk r277467 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jul 16 15:27:51 2010
New Revision: 277467

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277467
Log:
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:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=277467&r1=277466&r2=277467
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jul 16 15:27:51 2010
@@ -11768,6 +11768,7 @@
 				chan_sig = 0;
 			}
 			tmp->sig = chan_sig;
+			tmp->outsigmod = conf->chan.outsigmod;
 
 			if (analog_lib_handles(chan_sig, tmp->radio, tmp->oprmode)) {
 				analog_p = analog_new(dahdisig_to_analogsig(chan_sig), &dahdi_analog_callbacks, tmp);
@@ -11968,6 +11969,8 @@
 						tmp->sig_pvt = pri_chan;
 						tmp->pri = &pris[span].pri;
 
+						tmp->priexclusive = conf->chan.priexclusive;
+
 						if (!tmp->pri->cc_params) {
 							tmp->pri->cc_params = ast_cc_config_params_init();
 							if (!tmp->pri->cc_params) {
@@ -12166,7 +12169,6 @@
 			tmp->mwimonitor_neon = conf->chan.mwimonitor_neon;
 			tmp->mwimonitor_rpas = conf->chan.mwimonitor_rpas;
 		}
-		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))
@@ -12221,7 +12223,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");