Merged revisions 312949 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r312949 | rmudgett | 2011-04-05 13:45:24 -0500 (Tue, 05 Apr 2011) | 6 lines

  Crash if ISDN span layer 1 is down on initial load.

  Regression from -r312575 B channel shifting during negotiation.

  * Also combine updating the alarm flag with clearing the resetting flag.
........

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index e1c4a26bc8816d62b92c21d104855577cb6e4f38..04105ad5965e097792e2eb7e256b3606a7772e0e 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -12757,9 +12757,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                                switch (tmp->sig) {
 #ifdef HAVE_PRI
                                case SIG_PRI_LIB_HANDLE_CASES:
-                                       ast_mutex_lock(&tmp->lock);
-                                       sig_pri_chan_alarm_notify(tmp->sig_pvt, si.alarms);
-                                       ast_mutex_unlock(&tmp->lock);
+                                       sig_pri_set_alarm(tmp->sig_pvt, !si.alarms);
                                        break;
 #endif
 #if defined(HAVE_SS7)

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 0e76fda53404dfd17f51ddd189e0bd3b3f329e44..197caec9734e321b979db92392a034c0e2d90025 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -178,8 +178,15 @@ static void sig_pri_set_digital(struct sig_pri_chan *p, int is_digital)
        }
 }
 
-static void sig_pri_set_alarm(struct sig_pri_chan *p, int in_alarm)
+void sig_pri_set_alarm(struct sig_pri_chan *p, int in_alarm)
 {
+       /*
+        * Clear the channel restart flag when the channel alarm changes
+        * to prevent the flag from getting stuck when the link goes
+        * down.
+        */
+       p->resetting = 0;
+
        p->inalarm = in_alarm;
        if (p->calls->set_alarm) {
                p->calls->set_alarm(p->chan_pvt, in_alarm);
@@ -5555,7 +5562,6 @@ static void *pri_dchannel(void *vpri)
                                for (i = 0; i < pri->numchans; i++) {
                                        if (pri->pvts[i]) {
                                                sig_pri_set_alarm(pri->pvts[i], 0);
-                                               pri->pvts[i]->resetting = 0;
                                        }
                                }
                                sig_pri_span_devstate_changed(pri);
@@ -5584,7 +5590,6 @@ static void *pri_dchannel(void *vpri)
                                                                        p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
                                                        }
                                                        sig_pri_set_alarm(p, 1);
-                                                       p->resetting = 0;
                                                }
                                        }
                                        sig_pri_span_devstate_changed(pri);
@@ -8488,7 +8493,6 @@ int sig_pri_start_pri(struct sig_pri_span *pri)
 void sig_pri_chan_alarm_notify(struct sig_pri_chan *p, int noalarm)
 {
        pri_grab(p, p->pri);
-       p->resetting = 0;
        sig_pri_set_alarm(p, !noalarm);
        if (!noalarm) {
                if (pri_get_timer(p->pri->pri, PRI_TIMER_T309) < 0) {

diff --git a/channels/sig_pri.h b/channels/sig_pri.h
index f75646e3ffe60d521eb9e217d047b30c5ed115eb..148397fc6463ae020c90763633cd863d927d7eac 100644 (file)
--- a/channels/sig_pri.h
+++ b/channels/sig_pri.h
@@ -581,6 +581,7 @@ int sig_pri_digit_begin(struct sig_pri_chan *pvt, struct ast_channel *ast, char
 void sig_pri_stop_pri(struct sig_pri_span *pri);
 int sig_pri_start_pri(struct sig_pri_span *pri);
 
+void sig_pri_set_alarm(struct sig_pri_chan *p, int in_alarm);
 void sig_pri_chan_alarm_notify(struct sig_pri_chan *p, int noalarm);
 
 void pri_event_alarm(struct sig_pri_span *pri, int index, int before_start_pri);