[svn-commits] rmudgett: branch rmudgett/dahdi_facility r225689 - in /team/rmudgett/dahdi_fa...

Fri Oct 23 11:27:31 CDT 2009

Author: rmudgett
Date: Fri Oct 23 11:27:27 2009
New Revision: 225689

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225689
Log:
Prepare to merge to trunk.

Modified:
    team/rmudgett/dahdi_facility/CHANGES
    team/rmudgett/dahdi_facility/channels/chan_dahdi.c
    team/rmudgett/dahdi_facility/channels/sig_pri.c
    team/rmudgett/dahdi_facility/channels/sig_pri.h

Modified: team/rmudgett/dahdi_facility/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/CHANGES?view=diff&rev=225689&r1=225688&r2=225689
==============================================================================

--- team/rmudgett/dahdi_facility/CHANGES (original)
+++ team/rmudgett/dahdi_facility/CHANGES Fri Oct 23 11:27:27 2009
@@ -7,24 +7,6 @@
 === and the other UPGRADE files for older releases.
 ===
 ======================================================================
-
-***** Anticipated changes for 1.10 *******************************************
-------------------------------------------------------------------------------
---- Functionality changes from Asterisk 1.8 to Asterisk 1.10 -----------------
-------------------------------------------------------------------------------
-
-libpri channel driver (chan_dahdi) DAHDI changes
--------------------------------------------
- * Added support for BRI PTMP NT mode. (Requires latest LibPRI.)
- * Added handling of received HOLD/RETRIEVE messages and the optional ability
-   to transfer a held call on disconnect similar to an analog phone.
- * Added CallRerouting/CallDeflection support for Q.SIG, ETSI PTP, ETSI PTMP.
-   Will reroute/deflect an outgoing call when receive the message.
-   Can use the DAHDISendCallreroutingFacility to send the message for the
-   supported switches.
- * Added ability to send/receive keypad digits in the SETUP message.
-   Send keypad digits in SETUP message: Dial(DAHDI/g1[/K<keypad_digits>][/extension])
-   Access any received keypad digits in SETUP message by: ${CHANNEL(keypad_digits)}
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
@@ -242,6 +224,16 @@
    configured via the rxdrc and txdrc parameters in chan_dahdi.conf.
  * Added support for ISDN calling and called subaddress with partial support
    for connected line subaddress.
+ * Added support for BRI PTMP NT mode. (Requires latest LibPRI.)
+ * Added handling of received HOLD/RETRIEVE messages and the optional ability
+   to transfer a held call on disconnect similar to an analog phone.
+ * Added CallRerouting/CallDeflection support for Q.SIG, ETSI PTP, ETSI PTMP.
+   Will reroute/deflect an outgoing call when receive the message.
+   Can use the DAHDISendCallreroutingFacility to send the message for the
+   supported switches.
+ * Added ability to send/receive keypad digits in the SETUP message.
+   Send keypad digits in SETUP message: Dial(DAHDI/g1[/K<keypad_digits>][/extension])
+   Access any received keypad digits in SETUP message by: ${CHANNEL(keypad_digits)}
 
 Asterisk Manager Interface
 --------------------------

Modified: team/rmudgett/dahdi_facility/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/channels/chan_dahdi.c?view=diff&rev=225689&r1=225688&r2=225689
==============================================================================
--- team/rmudgett/dahdi_facility/channels/chan_dahdi.c (original)
+++ team/rmudgett/dahdi_facility/channels/chan_dahdi.c Fri Oct 23 11:27:27 2009
@@ -4892,7 +4892,7 @@
 /*!
  * \internal
  * \brief Insert the given chan_dahdi interface structure into the no B channel list.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri span control structure holding no B channel list.
  * \param pvt chan_dahdi private interface structure to insert.
@@ -4947,7 +4947,7 @@
 /*!
  * \internal
  * \brief Extract the given chan_dahdi interface structure from the no B channel list.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri span control structure holding no B channel list.
  * \param pvt chan_dahdi private interface structure to extract.
@@ -11807,7 +11807,7 @@
 /*!
  * \internal
  * \brief Create a no B channel interface.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri span controller to add interface.
  *
@@ -16087,8 +16087,12 @@
 					confp->chan.sig = SIG_BRI_PTMP;
 					confp->pri.pri.nodetype = PRI_CPE;
 				} else if (!strcasecmp(v->value, "bri_net_ptmp")) {
+#if defined(HAVE_PRI_CALL_HOLD)
 					confp->chan.sig = SIG_BRI_PTMP;
 					confp->pri.pri.nodetype = PRI_NETWORK;
+#else
+					ast_log(LOG_WARNING, "How cool would it be if someone implemented this mode!  For now, sucks for you. (line %d)\n", v->lineno);
+#endif	/* !defined(HAVE_PRI_CALL_HOLD) */
 #endif
 #ifdef HAVE_SS7
 				} else if (!strcasecmp(v->value, "ss7")) {

Modified: team/rmudgett/dahdi_facility/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/channels/sig_pri.c?view=diff&rev=225689&r1=225688&r2=225689
==============================================================================
--- team/rmudgett/dahdi_facility/channels/sig_pri.c (original)
+++ team/rmudgett/dahdi_facility/channels/sig_pri.c Fri Oct 23 11:27:27 2009
@@ -1104,7 +1104,7 @@
 /*!
  * \internal
  * \brief Find or create an empty no-B-channel interface to use.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri span controller to find interface.
  *
@@ -1141,7 +1141,7 @@
 /*!
  * \internal
  * \brief Find the channel associated with the libpri call.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri span controller to find interface.
  * \param call LibPRI opaque call pointer to find.
@@ -1628,7 +1628,7 @@
 /*!
  * \internal
  * \brief Attempt to transfer the active call to the held call.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri PRI control structure.
  * \param active_call Active call to transfer.
@@ -1700,7 +1700,7 @@
 /*!
  * \internal
  * \brief Handle the hold event from libpri.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri PRI control structure.
  * \param ev Hold event received.
@@ -1776,7 +1776,7 @@
 /*!
  * \internal
  * \brief Handle the retrieve event from libpri.
- * \since 1.6.4
+ * \since 1.6.3
  *
  * \param pri sig_pri PRI control structure.
  * \param ev Retrieve event received.

Modified: team/rmudgett/dahdi_facility/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/channels/sig_pri.h?view=diff&rev=225689&r1=225688&r2=225689
==============================================================================
--- team/rmudgett/dahdi_facility/channels/sig_pri.h (original)
+++ team/rmudgett/dahdi_facility/channels/sig_pri.h Fri Oct 23 11:27:27 2009
@@ -29,9 +29,6 @@
 #include "asterisk/frame.h"
 #include <libpri.h>
 #include <dahdi/user.h>
-#define HAVE_PRI_CALL_HOLD 1	/* BUGBUG remove this line and put test in configure.ac */
-#define HAVE_PRI_CALL_REROUTING 1	/* BUGBUG remove this line and put test in configure.ac */
-#define HAVE_PRI_SETUP_KEYPAD 1	/* BUGBUG remove this line and put test in configure.ac */
 
 enum sig_pri_tone {
 	SIG_PRI_TONE_RINGTONE = 0,


