[svn-commits] file: branch 1.6.0 r107711 - in /branches/1.6.0: ./ apps/app_page.c

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Mar 11 15:37:09 CDT 2008


Author: file
Date: Tue Mar 11 15:37:09 2008
New Revision: 107711

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107711
Log:
Merged revisions 107710 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r107710 | file | 2008-03-11 17:36:14 -0300 (Tue, 11 Mar 2008) | 6 lines

Dial a device even if it's state is unknown.
(closes issue #12184)
Reported by: bluecrow76
Patches:
      asterisk-svn-app_page.c.devicestate_unknown.diff uploaded by bluecrow76 (license 270)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_page.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_page.c?view=diff&rev=107711&r1=107710&r2=107711
==============================================================================
--- branches/1.6.0/apps/app_page.c (original)
+++ branches/1.6.0/apps/app_page.c Tue Mar 11 15:37:09 2008
@@ -124,9 +124,14 @@
 		}
 
 		/* Ensure device is not in use if skip option is enabled */
-		if (ast_test_flag(&flags, PAGE_SKIP) && (state = ast_device_state(tech)) != AST_DEVICE_NOT_INUSE) {
-			ast_log(LOG_WARNING, "Destination '%s' has device state '%s'.\n", tech, devstate2str(state));
-			continue;
+		if (ast_test_flag(&flags, PAGE_SKIP)) {
+			state = ast_device_state(tech);
+			if (state == AST_DEVICE_UNKNOWN) {
+				ast_log(LOG_WARNING, "Destination '%s' has device state '%s'. Paging anyway.\n", tech, devstate2str(state));
+			} else if (state != AST_DEVICE_NOT_INUSE) {
+				ast_log(LOG_WARNING, "Destination '%s' has device state '%s'.\n", tech, devstate2str(state));
+				continue;
+			}
 		}
 
 		*resource++ = '\0';




More information about the svn-commits mailing list