[asterisk-commits] wedhorn: trunk r405894 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: wedhorn
Date: Sat Jan 18 18:01:31 2014
New Revision: 405894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405894
Log:
Skinny: fix reversed device reset from CLI.

Existing code would do a full device restart when "skinny reset device"
was entered at the CLI and do a reset when "skinny reset device restart"
entered. 
........

Merged revisions 405893 from http://svn.asterisk.org/svn/asterisk/branches/12

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-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=405894&r1=405893&r2=405894
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Sat Jan 18 18:01:31 2014
@@ -3964,15 +3964,15 @@
 
 	AST_LIST_LOCK(&devices);
 	AST_LIST_TRAVERSE(&devices, d, list) {
-		int fullrestart = 0;
+		int resetonly = 1;
 		if (!strcasecmp(a->argv[2], d->id) || !strcasecmp(a->argv[2], d->name) || !strcasecmp(a->argv[2], "all")) {
 			if (!(d->session))
 				continue;
 
 			if (a->argc == 4 && !strcasecmp(a->argv[3], "restart"))
-				fullrestart = 1;
-
-			transmit_reset(d, fullrestart);
+				resetonly = 0;
+
+			transmit_reset(d, resetonly);
 		}
 	}
 	AST_LIST_UNLOCK(&devices);