[asterisk-commits] jpeeler: branch 1.6.1 r218569 - /branches/1.6.1/channels/chan_dahdi.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Sep 15 10:41:15 CDT 2009
Author: jpeeler
Date: Tue Sep 15 10:41:09 2009
New Revision: 218569
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218569
Log:
Merged revisions 218430 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r218430 | jpeeler | 2009-09-14 17:38:25 -0500 (Mon, 14 Sep 2009) | 18 lines
Merged revisions 218401 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r218401 | jpeeler | 2009-09-14 16:47:11 -0500 (Mon, 14 Sep 2009) | 11 lines
Fix handling of DAHDI_EVENT_REMOVED event to prevent crash in do_monitor.
After talking to rmudgett about some of his recent iflist locking changes, it
was determined that the only place that would destroy a channel without being
explicitly to do so was in handle_init_event. The loop to walk the interface
list has been modified to wait to destroy the channel until the dahdi_pvt of
the channel to be destroyed is no longer needed.
(closes issue #15378)
Reported by: samy
........
................
Modified:
branches/1.6.1/channels/chan_dahdi.c
Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=218569&r1=218568&r2=218569
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Tue Sep 15 10:41:09 2009
@@ -1192,7 +1192,7 @@
static int dahdi_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
static int dahdi_setoption(struct ast_channel *chan, int option, void *data, int datalen);
static int dahdi_func_read(struct ast_channel *chan, const char *function, char *data, char *buf, size_t len);
-static int handle_init_event(struct dahdi_pvt *i, int event);
+static struct dahdi_pvt *handle_init_event(struct dahdi_pvt *i, int event);
static const struct ast_channel_tech dahdi_tech = {
.type = "DAHDI",
@@ -8083,11 +8083,9 @@
return RESULT_FAILURE;
}
-/* returns < 0 = error, 0 event handled, >0 event handled and thread spawned */
-static int handle_init_event(struct dahdi_pvt *i, int event)
+static struct dahdi_pvt *handle_init_event(struct dahdi_pvt *i, int event)
{
int res;
- int thread_spawned = 0;
pthread_t threadid;
struct ast_channel *chan;
@@ -8141,8 +8139,6 @@
if (res < 0)
ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", i->channel);
ast_hangup(chan);
- } else {
- thread_spawned = 1;
}
} else
ast_log(LOG_WARNING, "Unable to create channel\n");
@@ -8184,8 +8180,6 @@
ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", i->channel);
}
ast_hangup(chan);
- } else {
- thread_spawned = 1;
}
break;
default:
@@ -8193,7 +8187,7 @@
res = tone_zone_play_tone(i->subs[SUB_REAL].dfd, DAHDI_TONE_CONGESTION);
if (res < 0)
ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", i->channel);
- return -1;
+ return NULL;
}
break;
case DAHDI_EVENT_NOALARM:
@@ -8258,7 +8252,7 @@
default:
ast_log(LOG_WARNING, "Don't know how to handle on hook with signalling %s on channel %d\n", sig2str(i->sig), i->channel);
res = tone_zone_play_tone(i->subs[SUB_REAL].dfd, -1);
- return -1;
+ return NULL;
}
break;
case DAHDI_EVENT_POLARITY:
@@ -8282,8 +8276,6 @@
ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", i->channel);
} else if (ast_pthread_create_detached(&threadid, NULL, ss_thread, chan)) {
ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel);
- } else {
- thread_spawned = 1;
}
}
break;
@@ -8293,12 +8285,11 @@
"interface %d\n", i->channel);
}
break;
- case DAHDI_EVENT_REMOVED: /* destroy channel */
+ case DAHDI_EVENT_REMOVED: /* destroy channel, will actually do so in do_monitor */
ast_log(LOG_NOTICE,
"Got DAHDI_EVENT_REMOVED. Destroying channel %d\n",
i->channel);
- dahdi_destroy_channel_bynum(i->channel);
- break;
+ return i;
case DAHDI_EVENT_NEONMWI_ACTIVE:
if (i->mwimonitor_neon) {
notify_message(i->mailbox, 1);
@@ -8312,7 +8303,7 @@
}
break;
}
- return thread_spawned;
+ return NULL;
}
static void *do_monitor(void *data)
@@ -8320,6 +8311,7 @@
int count, res, res2, spoint, pollres=0;
struct dahdi_pvt *i;
struct dahdi_pvt *last = NULL;
+ struct dahdi_pvt *doomed;
time_t thispass = 0, lastpass = 0;
int found;
char buf[1024];
@@ -8397,7 +8389,20 @@
lastpass = thispass;
thispass = time(NULL);
i = iflist;
- while (i) {
+ doomed = NULL;
+ for (i = iflist;; i = i->next) {
+ if (doomed) {
+ int res;
+ res = dahdi_destroy_channel_bynum(doomed->channel);
+ if (!res) {
+ ast_log(LOG_WARNING, "Couldn't find channel to destroy, hopefully another destroy operation just happened.\n");
+ }
+ doomed = NULL;
+ }
+ if (!i) {
+ break;
+ }
+
if (thispass != lastpass) {
if (!found && ((i == last) || ((i == iflist) && !last))) {
last = i;
@@ -8445,10 +8450,9 @@
ast_debug(1, "Monitor doohicky got event %s on radio channel %d\n", event2str(res), i->channel);
/* Don't hold iflock while handling init events */
ast_mutex_unlock(&iflock);
- handle_init_event(i, res);
+ doomed = handle_init_event(i, res);
ast_mutex_lock(&iflock);
}
- i = i->next;
continue;
}
pollres = ast_fdisset(pfds, i->subs[SUB_REAL].dfd, count, &spoint);
@@ -8458,12 +8462,10 @@
if (!i->pri)
#endif
ast_log(LOG_WARNING, "Whoa.... I'm owned but found (%d) in read...\n", i->subs[SUB_REAL].dfd);
- i = i->next;
continue;
}
if (!i->cidspill && !i->mwimonitor_fsk) {
ast_log(LOG_WARNING, "Whoa.... I'm reading but have no cidspill (%d)...\n", i->subs[SUB_REAL].dfd);
- i = i->next;
continue;
}
res = read(i->subs[SUB_REAL].dfd, buf, sizeof(buf));
@@ -8500,18 +8502,16 @@
if (!i->pri)
#endif
ast_log(LOG_WARNING, "Whoa.... I'm owned but found (%d)...\n", i->subs[SUB_REAL].dfd);
- i = i->next;
continue;
}
res = dahdi_get_event(i->subs[SUB_REAL].dfd);
ast_debug(1, "Monitor doohicky got event %s on channel %d\n", event2str(res), i->channel);
/* Don't hold iflock while handling init events */
ast_mutex_unlock(&iflock);
- handle_init_event(i, res);
+ doomed = handle_init_event(i, res);
ast_mutex_lock(&iflock);
}
}
- i=i->next;
}
ast_mutex_unlock(&iflock);
}
More information about the asterisk-commits
mailing list