[svn-commits] jpeeler: branch 1.6.0 r160326 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Dec  2 12:03:31 2008
New Revision: 160326

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

........
r160319 | jpeeler | 2008-12-02 12:00:24 -0600 (Tue, 02 Dec 2008) | 7 lines

(closes issue #13786)
Reported by: tzafrir

Readding DAHDI_CHECK_HOOKSTATE define that was removed in r134260 which fixes not being able to make outgoing calls on some FXO adapters:
http://lists.digium.com/pipermail/asterisk-users/2008-November/thread.html#221553


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

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

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=160326&r1=160325&r2=160326
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Dec  2 12:03:31 2008
@@ -137,6 +137,13 @@
  * even though their web site says they support their products for life.
  */
 /* #define ZHONE_HACK */
+
+/*! \note
+ * Define if you want to check the hook state for an FXO (FXS signalled) interface
+ * before dialing on it.  Certain FXO interfaces always think they're out of
+ * service with this method however.
+ */
+/* #define DAHDI_CHECK_HOOKSTATE */
 
 /*! \note
  * Define if you want to check the hook state for an FXO (FXS signalled) interface
@@ -8730,7 +8737,11 @@
 			} else if (par.rxisoffhook) {
 				ast_debug(1, "Channel %d off hook, can't use\n", p->channel);
 				/* Not available when the other end is off hook */
+#ifdef DAHDI_CHECK_HOOKSTATE
 				return 0;
+#else
+				return 1;
+#endif
 			}
 		}
 		return 1;