FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Tear down conference links when conferences are emptied out.

Browse Source 
Otherwise, it's possible for a link to remain in use if a process quits without
unlinking the conferences. Now when all the channels are removed from the
conference, any links are also cleaned up.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Shaun Ruffell 2013-01-21 15:45:52 -06:00
parent a4feafc124
commit d5e5b19a02
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/dahdi/dahdi-base.c
View File

@ -1072,10 +1072,27 @@ static unsigned long _chan_in_conf(struct dahdi_chan *chan, unsigned long x)
confmode == DAHDI_CONF_REALANDPSEUDO)) ? 1 : 0;
}
#ifdef CONFIG_DAHDI_CONFLINK
static void recalc_maxlinks(void)
{
int x;
for (x = DAHDI_MAX_CONF - 1; x > 0; x--) {
if (conf_links[x].src || conf_links[x].dst) {
maxlinks = x + 1;
return;
}
}
maxlinks = 0;
}
#endif
static void dahdi_check_conf(int x)
{
unsigned long res;
unsigned long flags;
int i;
/* return if no valid conf number */
if (x <= 0)
@ -1098,6 +1115,17 @@ static void dahdi_check_conf(int x)
/* Highest conference may have changed */
recalc_maxconfs();
#ifdef CONFIG_DAHDI_CONFLINK
/* And unlink it from any conflinks */
for (i = DAHDI_MAX_CONF - 1; i > 0; i--) {
if (conf_links[i].src == x)
conf_links[i].src = 0;
if (conf_links[i].dst == x)
conf_links[i].dst = 0;
}
recalc_maxlinks();
#endif
}
/* enqueue an event on a channel */
@ -4519,20 +4547,6 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data)
}
#ifdef CONFIG_DAHDI_CONFLINK
static void recalc_maxlinks(void)
{
int x;
for (x = DAHDI_MAX_CONF - 1; x > 0; x--) {
if (conf_links[x].src || conf_links[x].dst) {
maxlinks = x + 1;
return;
}
}
maxlinks = 0;
}
static int dahdi_ioctl_conflink(struct file *file, unsigned long data)
{
struct dahdi_chan *chan;