sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dont segfault when a MWI event occurs on a line without a registered device 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@171081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Michiel van Baak 2009-01-25 16:50:53 +00:00
parent 131751140d
commit 630fe3ccb8
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
channels/chan_skinny.c
View File

@ -2513,35 +2513,37 @@ static void mwi_event_cb(const struct ast_event *event, void *userdata)
{
struct skinny_line *l = userdata;
struct skinny_device *d = l->device;
struct skinnysession *s = d->session;
struct skinny_line *l2;
int new_msgs = 0;
int dev_msgs = 0;
if (d) {
struct skinnysession *s = d->session;
struct skinny_line *l2;
int new_msgs = 0;
int dev_msgs = 0;
if (s) {
if (event) {
l->newmsgs = ast_event_get_ie_uint(event, AST_EVENT_IE_NEWMSGS);
}
if (l->newmsgs) {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, l->instance, l->mwiblink?SKINNY_LAMP_BLINK:SKINNY_LAMP_ON);
} else {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, l->instance, SKINNY_LAMP_OFF);
}
/* find out wether the device lamp should be on or off */
AST_LIST_TRAVERSE(&d->lines, l2, list) {
if (l2->newmsgs) {
dev_msgs++;
if (s) {
if (event) {
l->newmsgs = ast_event_get_ie_uint(event, AST_EVENT_IE_NEWMSGS);
}
}
if (dev_msgs) {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, 0, d->mwiblink?SKINNY_LAMP_BLINK:SKINNY_LAMP_ON);
} else {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, 0, SKINNY_LAMP_OFF);
if (l->newmsgs) {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, l->instance, l->mwiblink?SKINNY_LAMP_BLINK:SKINNY_LAMP_ON);
} else {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, l->instance, SKINNY_LAMP_OFF);
}
/* find out wether the device lamp should be on or off */
AST_LIST_TRAVERSE(&d->lines, l2, list) {
if (l2->newmsgs) {
dev_msgs++;
}
}
if (dev_msgs) {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, 0, d->mwiblink?SKINNY_LAMP_BLINK:SKINNY_LAMP_ON);
} else {
transmit_lamp_indication(d, STIMULUS_VOICEMAIL, 0, SKINNY_LAMP_OFF);
}
ast_verb(3, "Skinny mwi_event_cb found %d new messages\n", new_msgs);
}
ast_verb(3, "Skinny mwi_event_cb found %d new messages\n", new_msgs);
}
}