diff options
| author | Damien Wedhorn <voip@facts.com.au> | 2013-02-06 08:44:32 +0000 |
|---|---|---|
| committer | Damien Wedhorn <voip@facts.com.au> | 2013-02-06 08:44:32 +0000 |
| commit | c0832b47657f2c12ee49319229fe9c3ca1666c19 (patch) | |
| tree | a77a467f92e7f6e571821e9326adbfd1862082c6 /channels/chan_skinny.c | |
| parent | 44872e797c1208876ba527136c144a3ce686a1b9 (diff) | |
Fix reload skinny with active devices.
Patch ensures that d->activeline and l->activesub are moved over to the
new device and line so that on callend the appropriate subs can be found
to complete hangup before device resets.
(closes issue ASTERISK-16610)
Reported by: wedhorn
Tested by: snuffy, myself
Patches:
skinny-reloadactive01.diff uploaded by wedhorn (license 5019)
........
Merged revisions 380942 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 5e18859e9..ac5974e8b 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -7955,9 +7955,13 @@ static struct skinny_device *config_device(const char *dname, struct ast_variabl } ast_mutex_lock(<emp->lock); l->instance = ltemp->instance; + if (l == temp->activeline) { + d->activeline = l; + } if (!AST_LIST_EMPTY(<emp->sub)) { ast_mutex_lock(&l->lock); l->sub = ltemp->sub; + l->activesub = ltemp->activesub; AST_LIST_TRAVERSE(&l->sub, sub, list) { sub->line = l; } |