[asterisk-commits] russell: branch russell/chan_console r55089 - in
/team/russell/chan_console: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 16 18:57:47 MST 2007
Author: russell
Date: Fri Feb 16 19:57:46 2007
New Revision: 55089
URL: http://svn.digium.com/view/asterisk?view=rev&rev=55089
Log:
Merged revisions 55051,55077,55087-55088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r55051 | russell | 2007-02-16 18:32:16 -0600 (Fri, 16 Feb 2007) | 11 lines
Merged revisions 55050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55050 | russell | 2007-02-16 18:31:42 -0600 (Fri, 16 Feb 2007) | 3 lines
Filter out yet another architecture that does not work with the optimizations
in the built-in libgsm. (issue 8637, ovi)
........
................
r55077 | russell | 2007-02-16 19:11:32 -0600 (Fri, 16 Feb 2007) | 11 lines
Merged revisions 55052 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55052 | russell | 2007-02-16 18:40:34 -0600 (Fri, 16 Feb 2007) | 3 lines
If the pg_config application is found, but there is probably executing it,
then consider postgres unavailable. (issue #8637)
........
................
r55087 | file | 2007-02-16 19:22:01 -0600 (Fri, 16 Feb 2007) | 18 lines
Merged revisions 55086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r55086 | file | 2007-02-16 20:16:59 -0500 (Fri, 16 Feb 2007) | 10 lines
Merged revisions 55073 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r55073 | file | 2007-02-16 20:09:50 -0500 (Fri, 16 Feb 2007) | 2 lines
Allow chan_sip to handle attended transfers from a SIP phone that is sitting behind chan_agent. Yes folks, all it took was one line of code. (issue #8784 reported by pzieba)
........
................
................
r55088 | file | 2007-02-16 19:37:29 -0600 (Fri, 16 Feb 2007) | 2 lines
Update chan_jingle to new definition of set_rtp_peer.
................
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/channels/chan_jingle.c
team/russell/chan_console/channels/chan_sip.c
team/russell/chan_console/codecs/gsm/Makefile
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 16 19:57:46 2007
@@ -1,1 +1,1 @@
-/trunk:1-55044
+/trunk:1-55088
Modified: team/russell/chan_console/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_jingle.c?view=diff&rev=55089&r1=55088&r2=55089
==============================================================================
--- team/russell/chan_console/channels/chan_jingle.c (original)
+++ team/russell/chan_console/channels/chan_jingle.c Fri Feb 16 19:57:46 2007
@@ -183,7 +183,7 @@
static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from, const char *sid);
/*----- RTP interface functions */
static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp,
- struct ast_rtp *vrtp, int codecs, int nat_active);
+ struct ast_rtp *vrtp, struct ast_rtp *tpeer, int codecs, int nat_active);
static enum ast_rtp_get_result jingle_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
static int jingle_get_codec(struct ast_channel *chan);
@@ -429,7 +429,7 @@
return p->peercapability;
}
-static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active)
+static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, struct ast_rtp *tpeer, int codecs, int nat_active)
{
struct jingle_pvt *p;
Modified: team/russell/chan_console/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_sip.c?view=diff&rev=55089&r1=55088&r2=55089
==============================================================================
--- team/russell/chan_console/channels/chan_sip.c (original)
+++ team/russell/chan_console/channels/chan_sip.c Fri Feb 16 19:57:46 2007
@@ -13093,7 +13093,11 @@
} else if (sipmethod == SIP_NOTIFY) {
/* They got the notify, this is the end */
if (p->owner) {
- ast_log(LOG_WARNING, "Notify answer on an owned channel?\n");
+ if (p->refer) {
+ if (option_debug)
+ ast_log(LOG_DEBUG, "Got 200 OK on NOTIFY for transfer\n");
+ } else
+ ast_log(LOG_WARNING, "Notify answer on an owned channel?\n");
/* ast_queue_hangup(p->owner); Disabled */
} else {
if (!p->subscribed && !p->refer)
@@ -13384,7 +13388,7 @@
ast_log(LOG_DEBUG, "-- No target second channel ---\n");
ast_log(LOG_DEBUG, "-- END Sip transfer:--------------------\n");
}
- if (transferer->chan2) { /* We have a bridge on the transferer's channel */
+ if (transferer->chan2 && (ast_bridged_channel(transferer->chan2) == transferer->chan2->_bridge)) { /* We have a bridge on the transferer's channel */
peera = transferer->chan1; /* Transferer - PBX -> transferee channel * the one we hangup */
peerb = target->chan1; /* Transferer - PBX -> target channel - This will get lost in masq */
peerc = transferer->chan2; /* Asterisk to Transferee */
Modified: team/russell/chan_console/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/codecs/gsm/Makefile?view=diff&rev=55089&r1=55088&r2=55089
==============================================================================
--- team/russell/chan_console/codecs/gsm/Makefile (original)
+++ team/russell/chan_console/codecs/gsm/Makefile Fri Feb 16 19:57:46 2007
@@ -209,7 +209,7 @@
# XXX should merge with GSM_OBJECTS
ifeq ($(OSARCH),linux-gnu)
ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring $(PROC) , arm armv5b armeb ia64 s390 bfin mipsel ))
+ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel ))
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
@@ -261,7 +261,7 @@
ifeq ($(OSARCH),linux-gnu)
ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-ifeq (,$(findstring $(PROC) , arm armv5b armeb ia64 bfin mipsel ))
+ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel ))
GSM_OBJECTS+= $(SRC)/k6opt.o
endif
endif
Modified: team/russell/chan_console/configure
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configure?view=diff&rev=55089&r1=55088&r2=55089
==============================================================================
--- team/russell/chan_console/configure (original)
+++ team/russell/chan_console/configure Fri Feb 16 19:57:46 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 53746 .
+# From configure.ac Revision: 53977 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -27950,8 +27950,20 @@
if test "${PG_CONFIG}" != No; then
PGSQL_libdir=`${PG_CONFIG} --libdir`
PGSQL_includedir=`${PG_CONFIG} --includedir`
-
- { echo "$as_me:$LINENO: checking for PQexec in -lpq" >&5
+ if test "x$?" != "x0" ; then
+ if test -n "${PGSQL_MANDATORY}" ; then
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5
+echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;}
+ { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+echo "$as_me: *** Either correct the installation, or run configure" >&6;}
+ { echo "$as_me:$LINENO: *** including --without-postgres" >&5
+echo "$as_me: *** including --without-postgres" >&6;}
+ exit 1
+ fi
+ else
+ { echo "$as_me:$LINENO: checking for PQexec in -lpq" >&5
echo $ECHO_N "checking for PQexec in -lpq... $ECHO_C" >&6; }
if test "${ac_cv_lib_pq_PQexec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28037,10 +28049,22 @@
fi
- if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
- PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
- PGSQL_INCLUDE="-I${PGSQL_includedir}"
- PBX_PGSQL=1
+ if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
+ PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
+ PGSQL_INCLUDE="-I${PGSQL_includedir}"
+ PBX_PGSQL=1
+ elif test -n "${PGSQL_MANDATORY}";
+ then
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5
+echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;}
+ { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+echo "$as_me: *** Either correct the installation, or run configure" >&6;}
+ { echo "$as_me:$LINENO: *** including --without-postgres" >&5
+echo "$as_me: *** including --without-postgres" >&6;}
+ exit 1
+ fi
fi
fi
Modified: team/russell/chan_console/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configure.ac?view=diff&rev=55089&r1=55088&r2=55089
==============================================================================
--- team/russell/chan_console/configure.ac (original)
+++ team/russell/chan_console/configure.ac Fri Feb 16 19:57:46 2007
@@ -694,14 +694,30 @@
if test "${PG_CONFIG}" != No; then
PGSQL_libdir=`${PG_CONFIG} --libdir`
PGSQL_includedir=`${PG_CONFIG} --includedir`
-
- AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
- [Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
-
- if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
- PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
- PGSQL_INCLUDE="-I${PGSQL_includedir}"
- PBX_PGSQL=1
+ if test "x$?" != "x0" ; then
+ if test -n "${PGSQL_MANDATORY}" ; then
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
+ AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+ AC_MSG_NOTICE([*** including --without-postgres])
+ exit 1
+ fi
+ else
+ AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
+ [Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
+
+ if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
+ PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
+ PGSQL_INCLUDE="-I${PGSQL_includedir}"
+ PBX_PGSQL=1
+ elif test -n "${PGSQL_MANDATORY}";
+ then
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
+ AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+ AC_MSG_NOTICE([*** including --without-postgres])
+ exit 1
+ fi
fi
fi
More information about the asterisk-commits
mailing list