[svn-commits] qwell: tag 1.8.8.0-rc2 r341282 - in /tags/1.8.8.0-rc2: ./ autoconf/ channels/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Oct 18 16:26:54 CDT 2011
Author: qwell
Date: Tue Oct 18 16:26:48 2011
New Revision: 341282
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341282
Log:
Update ChangeLog. Merge revisions 339719,340878,341088 from branches/1.8/
Modified:
tags/1.8.8.0-rc2/ (props changed)
tags/1.8.8.0-rc2/ChangeLog
tags/1.8.8.0-rc2/autoconf/ast_ext_lib.m4
tags/1.8.8.0-rc2/channels/chan_sip.c
tags/1.8.8.0-rc2/configure
tags/1.8.8.0-rc2/configure.ac
tags/1.8.8.0-rc2/include/asterisk/autoconfig.h.in
tags/1.8.8.0-rc2/main/channel.c
Propchange: tags/1.8.8.0-rc2/
------------------------------------------------------------------------------
svn:mergeinfo = /branches/1.8:339719,339779,340878,341088
Modified: tags/1.8.8.0-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/ChangeLog?view=diff&rev=341282&r1=341281&r2=341282
==============================================================================
--- tags/1.8.8.0-rc2/ChangeLog (original)
+++ tags/1.8.8.0-rc2/ChangeLog Tue Oct 18 16:26:48 2011
@@ -2,9 +2,46 @@
* Asterisk 1.8.8.0-rc2 Released.
-2011-10-07 15:58:07 +0000 [r943] Jason Parker <jparker at digium.com>
-
* menuselect/menuselect.c: Fix --enable/--enable-category.
+
+ ------------------------------------------------------------------------
+ r339719 | rmudgett | 2011-10-06 17:47:50 -0500 (Thu, 06 Oct 2011) | 20 lines
+ Fix regression in configure script for libpri capability checks.
+
+ JIRA AST-598 added the PRI_L2_PERSISTENCE option to fix BRI PTMP TE layer
+ 2 persistence issues with some telcos. ASTERISK-18535 attempted to fix
+ the unexpected requirement that libpri *must* have that feature to work
+ with Asterisk. The AST_EXT_LIB_SETUP_DEPENDENT lines made the PRI
+ optional features required. Unfortunately, I thought
+ AST_EXT_LIB_SETUP_DEPENDENT didn't do anything useful for libpri and
+ deleted those lines for libpri. The result was the HAVE_PRI_xxx defines
+ that control the ability to use optional libpri features were also
+ deleted.
+
+ * Created AST_EXT_LIB_SETUP_OPTIONAL configuration macro to allow optional
+ features in a library that the source code could take advantage of if the
+ code supports the feature.
+
+ (closes issue ASTERISK-18687)
+ Reported by: Norbert
+ Tested by: rmudgett
+ ------------------------------------------------------------------------
+ r340878 | twilson | 2011-10-14 11:33:28 -0500 (Fri, 14 Oct 2011) | 8 lines
+
+ Avoid unnecessary WARNING message
+
+ Add AST_CONTROL_UPDATE_RTP_PEER frame to be ignored here to avoid
+ displaying a WARNING message.
+
+ (closes issue ASTERISK-18610)
+ Patch by: Kristijan_Vrban
+ ------------------------------------------------------------------------
+ r341088 | twilson | 2011-10-17 10:35:05 -0500 (Mon, 17 Oct 2011) | 4 lines
+
+ Don't try to remove peers without IPs from peers_by_ip
+
+ (closes issue ASTERISK-18696)
+ ------------------------------------------------------------------------
2011-10-05 Asterisk Development Team <asteriskteam at digium.com>
Modified: tags/1.8.8.0-rc2/autoconf/ast_ext_lib.m4
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/autoconf/ast_ext_lib.m4?view=diff&rev=341282&r1=341281&r2=341282
==============================================================================
--- tags/1.8.8.0-rc2/autoconf/ast_ext_lib.m4 (original)
+++ tags/1.8.8.0-rc2/autoconf/ast_ext_lib.m4 Tue Oct 18 16:26:48 2011
@@ -58,7 +58,8 @@
AC_SUBST($2)
])
-# AST_EXT_LIB_SETUP_DEPENDENT([package symbol name], [package friendly name], [master package symbol name], [master package option name])
+# Setup required dependent package
+# AST_EXT_LIB_SETUP_DEPENDENT([dependent package symbol name], [dependent package friendly name], [master package symbol name], [master package name])
AC_DEFUN([AST_EXT_LIB_SETUP_DEPENDENT],
[
@@ -75,6 +76,23 @@
])
PBX_$1=0
AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])
+AC_SUBST([$1_LIB])
+AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
+AC_SUBST([PBX_$1])
+])
+
+# Setup optional dependent package
+# AST_EXT_LIB_SETUP_OPTIONAL([optional package symbol name], [optional package friendly name], [master package symbol name], [master package name])
+
+AC_DEFUN([AST_EXT_LIB_SETUP_OPTIONAL],
+[
+$1_DESCRIP="$2"
+m4_ifval([$4], [$1_OPTION=$4])
+m4_ifval([$3], [$1_DIR=${$3_DIR}
+])
+PBX_$1=0
+AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if $3 has the $2 feature.])
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
AC_SUBST([$1_DIR])
Modified: tags/1.8.8.0-rc2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/channels/chan_sip.c?view=diff&rev=341282&r1=341281&r2=341282
==============================================================================
--- tags/1.8.8.0-rc2/channels/chan_sip.c (original)
+++ tags/1.8.8.0-rc2/channels/chan_sip.c Tue Oct 18 16:26:48 2011
@@ -26580,7 +26580,9 @@
found++;
/* we've unlinked the peer from the peers container but not unlinked from the peers_by_ip container yet
this leads to a wrong refcounter and the peer object is never destroyed */
- ao2_t_unlink(peers_by_ip, peer, "ao2_unlink peer from peers_by_ip table");
+ if (!ast_sockaddr_isnull(&peer->addr)) {
+ ao2_t_unlink(peers_by_ip, peer, "ao2_unlink peer from peers_by_ip table");
+ }
if (!(peer->the_mark))
firstpass = 0;
} else {
Modified: tags/1.8.8.0-rc2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/configure.ac?view=diff&rev=341282&r1=341281&r2=341282
==============================================================================
--- tags/1.8.8.0-rc2/configure.ac (original)
+++ tags/1.8.8.0-rc2/configure.ac Tue Oct 18 16:26:48 2011
@@ -408,6 +408,26 @@
AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_L2_PERSISTENCE], [ISDN Layer 2 persistence option], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_MWI], [ISDN PRI Message Waiting Indication], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_MCID], [ISDN PRI Malicious Call ID], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_CALL_WAITING], [ISDN PRI call waiting supplementary service], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_AOC_EVENTS], [ISDN PRI advice of charge supplementary service events], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_TRANSFER], [ISDN PRI call transfer supplementary service], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_CCSS], [ISDN PRI call completion supplementary service], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_HANGUP_FIX], [ISDN PRI hangup fix], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_SUBADDR], [ISDN PRI subaddressing], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_CALL_HOLD], [ISDN PRI call hold], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_CALL_REROUTING], [ISDN PRI call rerouting and call deflection], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_SETUP_KEYPAD], [ISDN PRI keypad facility in SETUP], [PRI], [pri])
+# ------------------------------------v
+# TODO: The code can be changed to always include these features now.
+# These features will always be present if pri_connected_line_update is available.
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])
+AST_EXT_LIB_SETUP_OPTIONAL([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])
+# ------------------------------------^
AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
Modified: tags/1.8.8.0-rc2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/include/asterisk/autoconfig.h.in?view=diff&rev=341282&r1=341281&r2=341282
==============================================================================
--- tags/1.8.8.0-rc2/include/asterisk/autoconfig.h.in (original)
+++ tags/1.8.8.0-rc2/include/asterisk/autoconfig.h.in Tue Oct 18 16:26:48 2011
@@ -560,6 +560,59 @@
/* Define to 1 if you have the ISDN PRI library. */
#undef HAVE_PRI
+/* Define to 1 if PRI has the ISDN PRI advice of charge supplementary service
+ events feature. */
+#undef HAVE_PRI_AOC_EVENTS
+
+/* Define to 1 if PRI has the ISDN PRI call hold feature. */
+#undef HAVE_PRI_CALL_HOLD
+
+/* Define to 1 if PRI has the ISDN PRI call rerouting and call deflection
+ feature. */
+#undef HAVE_PRI_CALL_REROUTING
+
+/* Define to 1 if PRI has the ISDN PRI call waiting supplementary service
+ feature. */
+#undef HAVE_PRI_CALL_WAITING
+
+/* Define to 1 if PRI has the ISDN PRI call completion supplementary service
+ feature. */
+#undef HAVE_PRI_CCSS
+
+/* Define to 1 if PRI has the ISDN PRI hangup fix feature. */
+#undef HAVE_PRI_HANGUP_FIX
+
+/* Define to 1 if PRI has the ISDN PRI set_inbanddisconnect feature. */
+#undef HAVE_PRI_INBANDDISCONNECT
+
+/* Define to 1 if PRI has the ISDN Layer 2 persistence option feature. */
+#undef HAVE_PRI_L2_PERSISTENCE
+
+/* Define to 1 if PRI has the ISDN PRI Malicious Call ID feature. */
+#undef HAVE_PRI_MCID
+
+/* Define to 1 if PRI has the ISDN PRI Message Waiting Indication feature. */
+#undef HAVE_PRI_MWI
+
+/* Define to 1 if PRI has the ISDN progress with cause feature. */
+#undef HAVE_PRI_PROG_W_CAUSE
+
+/* Define to 1 if PRI has the ISDN reverse charge feature. */
+#undef HAVE_PRI_REVERSE_CHARGE
+
+/* Define to 1 if PRI has the ISDN service messages feature. */
+#undef HAVE_PRI_SERVICE_MESSAGES
+
+/* Define to 1 if PRI has the ISDN PRI keypad facility in SETUP feature. */
+#undef HAVE_PRI_SETUP_KEYPAD
+
+/* Define to 1 if PRI has the ISDN PRI subaddressing feature. */
+#undef HAVE_PRI_SUBADDR
+
+/* Define to 1 if PRI has the ISDN PRI call transfer supplementary service
+ feature. */
+#undef HAVE_PRI_TRANSFER
+
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
@@ -772,16 +825,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
-/* Define to 1 if `uid' is a member of `struct ucred'. */
+/* Define to 1 if `uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1055,9 +1108,6 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
Modified: tags/1.8.8.0-rc2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/main/channel.c?view=diff&rev=341282&r1=341281&r2=341282
==============================================================================
--- tags/1.8.8.0-rc2/main/channel.c (original)
+++ tags/1.8.8.0-rc2/main/channel.c Tue Oct 18 16:26:48 2011
@@ -3563,6 +3563,7 @@
case AST_CONTROL_SRCCHANGE:
case AST_CONTROL_CONNECTED_LINE:
case AST_CONTROL_REDIRECTING:
+ case AST_CONTROL_UPDATE_RTP_PEER:
case -1:
/* Unimportant */
break;
More information about the svn-commits
mailing list