From: Matthew Nicholson <mnicholson@digium.com>
Date: Fri, 16 Jul 2010 18:33:05 +0000 (+0000)
Subject: Merged revisions 277331 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=102e3499b08dad00c2644866d77c683be8f77bc9;p=thirdparty%2Fasterisk.git

Merged revisions 277331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r277331 | mnicholson | 2010-07-16 13:31:08 -0500 (Fri, 16 Jul 2010) | 15 lines

  Merged revisions 277327 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r277327 | mnicholson | 2010-07-16 13:30:22 -0500 (Fri, 16 Jul 2010) | 8 lines

    Interpret device state AST_DEVICE_UNKNOWN as extension state AST_EXTENSION_NOT_INUSE.

    (closes issue #16035)
    Reported by: francesco_r
    Patches:
          pbx.c.patch uploaded by viniciusfontes (license 978)
    Tested by: francesco_r, agx, lawbar
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@277338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 84d168d9a8..505abf382d 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3774,8 +3774,9 @@ enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devst
 		return AST_EXTENSION_ONHOLD;
 	case AST_DEVICE_BUSY:
 		return AST_EXTENSION_BUSY;
-	case AST_DEVICE_UNAVAILABLE:
 	case AST_DEVICE_UNKNOWN:
+		return AST_EXTENSION_NOT_INUSE;
+	case AST_DEVICE_UNAVAILABLE:
 	case AST_DEVICE_INVALID:
 		return AST_EXTENSION_UNAVAILABLE;
 	case AST_DEVICE_RINGINUSE: