From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 23 Jul 2014 18:31:06 +0000 (-0500)
Subject: FS-6685 mod_skinny: fix behavior of ring if other SLA extension is active
X-Git-Tag: v1.4.8~10^2~38^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf786b184dccf641f3af332acb592c1a4d3d3381;p=thirdparty%2Ffreeswitch.git

FS-6685 mod_skinny: fix behavior of ring if other SLA extension is active
---

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index ab319b2d1b..a6c50d2816 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -528,8 +528,9 @@ uint32_t skinny_line_count_active(listener_t *listener)
 	if ((sql = switch_mprintf(
 			"SELECT call_state FROM skinny_active_lines "
 			"WHERE device_name='%s' AND device_instance=%d "
-			"AND call_state != 2",
-			listener->device_name, listener->device_instance
+			"AND call_state not in (%d,%d,%d)",
+			listener->device_name, listener->device_instance, 
+			SKINNY_ON_HOOK, SKINNY_IN_USE_REMOTELY, SKINNY_HOLD
 			))) {
 
 		skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_count_active_callback, &helper);