[svn-commits] wedhorn: trunk r380943 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Digium repositories]

Author: wedhorn
Date: Wed Feb  6 02:44:32 2013
New Revision: 380943

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380943
Log:
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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=380943&r1=380942&r2=380943
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Wed Feb  6 02:44:32 2013
@@ -7955,9 +7955,13 @@
 					}
 					ast_mutex_lock(&ltemp->lock);
 					l->instance = ltemp->instance;
+					if (l == temp->activeline) {
+						d->activeline = l;
+					}
 					if (!AST_LIST_EMPTY(&ltemp->sub)) {
 						ast_mutex_lock(&l->lock);
 						l->sub = ltemp->sub;
+						l->activesub = ltemp->activesub;
 						AST_LIST_TRAVERSE(&l->sub, sub, list) {
 							sub->line = l;
 						}