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
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@277485 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 0b14b92410fefaec78a65b2d06f1481cce6347cf..244a156e4c01bb6f5a78150eb3f5709b1f45841b 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -10192,6 +10192,8 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                                        return NULL;
                                }
                        }
+                       tmp->outsigmod = conf->chan.outsigmod;
+
 #ifdef HAVE_SS7
                        if (chan_sig == SIG_SS7) {
                                struct dahdi_ss7 *ss7;
@@ -10401,6 +10403,8 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                                                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 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                        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 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                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");