[asterisk-commits] qwell: branch qwell/pimp_my_sip-butnotwithpjproject r382857 - in /team/qwell/...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Mar 12 12:07:03 CDT 2013
Author: qwell
Date: Tue Mar 12 12:06:58 2013
New Revision: 382857
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382857
Log:
Multiple revisions 382217,382293
........
r382217 | qwell | 2013-02-27 16:11:20 -0600 (Wed, 27 Feb 2013) | 4 lines
Switch back to pkg-config method of finding pjproject.
It would be unlikely for one lib to exist, and not another.
........
r382293 | qwell | 2013-02-28 15:29:13 -0600 (Thu, 28 Feb 2013) | 10 lines
Don't undefine bzero()/bcopy().
This was causing build failures against external libraries that happened to use
them, unless silly hacks were added to the modules that used those headers.
Review: https://reviewboard.asterisk.org/r/2359/
........
Merged revisions 382292 from http://svn.asterisk.org/svn/asterisk/trunk
........
Merged revisions 382217,382293 from http://svn.asterisk.org/svn/asterisk/team/qwell/pjsip-shared-libs
Modified:
team/qwell/pimp_my_sip-butnotwithpjproject/ (props changed)
team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in
team/qwell/pimp_my_sip-butnotwithpjproject/configure
team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac
team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in
team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in
team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c
Propchange: team/qwell/pimp_my_sip-butnotwithpjproject/
------------------------------------------------------------------------------
Binary property 'branchmerge' - no diff available.
Modified: team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in?view=diff&rev=382857&r1=382856&r2=382857
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/build_tools/menuselect-deps.in Tue Mar 12 12:06:58 2013
@@ -44,10 +44,7 @@
OSPTK=@PBX_OSPTK@
OSS=@PBX_OSS@
PGSQL=@PBX_PGSQL@
-PJLIB=@PBX_PJLIB@
-PJLIB_UTIL=@PBX_PJLIB_UTIL@
-PJMEDIA=@PBX_PJMEDIA@
-PJNATH=@PBX_PJNATH@
+PJPROJECT=@PBX_PJPROJECT@
PJSIP=@PBX_PJSIP@
PJSIP_SIMPLE=@PBX_PJSIP_SIMPLE@
PJSIP_UA=@PBX_PJSIP_UA@
Modified: team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac?view=diff&rev=382857&r1=382856&r2=382857
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/configure.ac Tue Mar 12 12:06:58 2013
@@ -427,10 +427,7 @@
AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
-AST_EXT_LIB_SETUP([PJLIB], [PJLIB], [pj])
-AST_EXT_LIB_SETUP([PJLIB_UTIL], [PJLIB-Util], [pjlib-util])
-AST_EXT_LIB_SETUP([PJMEDIA], [PJMEDIA], [pjmedia])
-AST_EXT_LIB_SETUP([PJNATH], [PJSIP NAT Helper], [pjnath])
+AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject])
AST_EXT_LIB_SETUP([PJSIP], [PJSIP], [pjsip])
AST_EXT_LIB_SETUP([PJSIP_SIMPLE], [PJSIP SIMPLE], [pjsip-simple])
AST_EXT_LIB_SETUP([PJSIP_UA], [PJSIP UA], [pjsip-ua])
@@ -1994,10 +1991,7 @@
fi
fi
-AST_EXT_LIB_CHECK([PJLIB], [pj], [pj_init], [pjlib.h], [], [-DPJ_AUTOCONF=1])
-AST_EXT_LIB_CHECK([PJLIB_UTIL], [pjlib-util], [pjlib_util_init], [pjlib-util.h], [], [-DPJ_AUTOCONF=1])
-AST_EXT_LIB_CHECK([PJMEDIA], [pjmedia], [pjmedia_session_create], [pjmedia.h], [], [-DPJ_AUTOCONF=1])
-AST_EXT_LIB_CHECK([PJNATH], [pjnath], [pjnath_init], [pjnath.h], [], [-DPJ_AUTOCONF=1])
+AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])
AST_EXT_LIB_CHECK([PJSIP], [pjsip], [pjsip_endpt_create], [pjsip.h])
AST_EXT_LIB_CHECK([PJSIP_SIMPLE], [pjsip-simple], [pjsip_subscribe_method], [pjsip_simple.h])
Modified: team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in?view=diff&rev=382857&r1=382856&r2=382857
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/include/asterisk/autoconfig.h.in Tue Mar 12 12:06:58 2013
@@ -551,17 +551,8 @@
/* Define to indicate presence of the pg_encoding_to_char API. */
#undef HAVE_PGSQL_pg_encoding_to_char
-/* Define to 1 if you have the PJLIB library. */
-#undef HAVE_PJLIB
-
-/* Define to 1 if you have the PJLIB-Util library. */
-#undef HAVE_PJLIB_UTIL
-
-/* Define to 1 if you have the PJMEDIA library. */
-#undef HAVE_PJMEDIA
-
-/* Define to 1 if you have the PJSIP NAT Helper library. */
-#undef HAVE_PJNATH
+/* Define if your system has the PJPROJECT libraries. */
+#undef HAVE_PJPROJECT
/* Define to 1 if you have the PJSIP library. */
#undef HAVE_PJSIP
Modified: team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in?view=diff&rev=382857&r1=382856&r2=382857
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/makeopts.in Tue Mar 12 12:06:58 2013
@@ -218,17 +218,8 @@
PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@
-PJLIB_INCLUDE=@PJLIB_INCLUDE@
-PJLIB_LIB=@PJLIB_LIB@
-
-PJLIB_UTIL_INCLUDE=@PJLIB_UTIL_INCLUDE@
-PJLIB_UTIL_LIB=@PJLIB_UTIL_LIB@
-
-PJMEDIA_INCLUDE=@PJMEDIA_INCLUDE@
-PJMEDIA_LIB=@PJMEDIA_LIB@
-
-PJNATH_INCLUDE=@PJNATH_INCLUDE@
-PJNATH_LIB=@PJNATH_LIB@
+PJPROJECT_INCLUDE=@PJPROJECT_INCLUDE@
+PJPROJECT_LIB=@PJPROJECT_LIB@
PJLIB_INCLUDE=@PJLIB_INCLUDE@
PJLIB_LIB=@PJLIB_LIB@
Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c?view=diff&rev=382857&r1=382856&r2=382857
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c Tue Mar 12 12:06:58 2013
@@ -29,7 +29,7 @@
*/
/*** MODULEINFO
- <use type="external">pjnath</use>
+ <use type="external">pjproject</use>
<support_level>core</support_level>
***/
@@ -47,10 +47,10 @@
#include <openssl/bio.h>
#endif
-#ifdef HAVE_PJNATH
-#include "pjlib.h"
-#include "pjlib-util.h"
-#include "pjnath.h"
+#ifdef HAVE_PJPROJECT
+#include <pjlib.h>
+#include <pjlib-util.h>
+#include <pjnath.h>
#endif
#include "asterisk/stun.h"
@@ -132,7 +132,7 @@
#endif
static int strictrtp = DEFAULT_STRICT_RTP; /*< Only accept RTP frames from a defined source. If we receive an indication of a changing source, enter learning mode. */
static int learning_min_sequential = DEFAULT_LEARNING_MIN_SEQUENTIAL; /*< Number of sequential RTP frames needed from a single source during learning mode to accept new source. */
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
static int icesupport = DEFAULT_ICESUPPORT;
static struct sockaddr_in stunaddr;
static pj_str_t turnaddr;
@@ -257,7 +257,7 @@
ast_mutex_t lock; /*!< Lock for synchronization purposes */
ast_cond_t cond; /*!< Condition for signaling */
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
pj_ice_sess *ice; /*!< ICE session */
pj_turn_sock *turn_rtp; /*!< RTP TURN relay */
pj_turn_sock *turn_rtcp; /*!< RTCP TURN relay */
@@ -403,7 +403,7 @@
/*! \brief Helper function which updates an ast_sockaddr with the candidate used for the component */
static void update_address_with_ice_candidate(struct ast_rtp *rtp, int component, struct ast_sockaddr *cand_address)
{
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
char address[PJ_INET6_ADDRSTRLEN];
if (!rtp->ice || (component < 1) || !rtp->ice->comp[component - 1].valid_check) {
@@ -415,7 +415,7 @@
#endif
}
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
/*! \brief Destructor for locally created ICE candidates */
static void ast_rtp_ice_candidate_destroy(void *obj)
{
@@ -1029,7 +1029,7 @@
.stop = ast_rtp_stop,
.qos = ast_rtp_qos_set,
.sendcng = ast_rtp_sendcng,
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
.ice = &ast_rtp_ice,
#endif
#ifdef HAVE_OPENSSL_SRTP
@@ -1038,7 +1038,7 @@
#endif
};
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq);
static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status)
@@ -1463,7 +1463,7 @@
}
#endif
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
if (rtp->ice) {
pj_str_t combined = pj_str(ast_sockaddr_stringify(sa));
pj_sockaddr address;
@@ -1521,7 +1521,7 @@
return -1;
}
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
if (rtp->ice) {
pj_thread_register_check();
@@ -1648,7 +1648,7 @@
return (info->packets == 0);
}
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
static void rtp_add_candidates_to_ice(struct ast_rtp_instance *instance, struct ast_rtp *rtp, struct ast_sockaddr *addr, int port, int component,
int transport, const pj_turn_sock_cb *turn_cb, pj_turn_sock **turn_sock)
{
@@ -1721,7 +1721,7 @@
{
struct ast_rtp *rtp = NULL;
int x, startplace;
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
pj_stun_config stun_config;
pj_str_t ufrag, passwd;
#endif
@@ -1782,7 +1782,7 @@
}
}
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
pj_thread_register_check();
pj_stun_config_init(&stun_config, &cachingpool.factory, 0, ioqueue, timerheap);
@@ -1845,7 +1845,7 @@
ast_free(rtp->red);
}
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
pj_thread_register_check();
/* Destroy the ICE session if being used */
@@ -3932,7 +3932,7 @@
ast_debug(1, "Setup RTCP on RTP instance '%p'\n", instance);
rtp->rtcp->schedid = -1;
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
if (rtp->ice) {
rtp_add_candidates_to_ice(instance, rtp, &rtp->rtcp->us, ast_sockaddr_port(&rtp->rtcp->us), COMPONENT_RTCP, TRANSPORT_SOCKET_RTCP,
&ast_rtp_turn_rtcp_sock_cb, &rtp->turn_rtcp);
@@ -4402,7 +4402,7 @@
* the pool this will cause a small memory leak.
*/
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
icesupport = DEFAULT_ICESUPPORT;
turnport = DEFAULT_TURN_PORT;
memset(&stunaddr, 0, sizeof(stunaddr));
@@ -4460,7 +4460,7 @@
DEFAULT_LEARNING_MIN_SEQUENTIAL);
}
}
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
if ((s = ast_variable_retrieve(cfg, "general", "icesupport"))) {
icesupport = ast_true(s);
}
@@ -4508,7 +4508,7 @@
static int load_module(void)
{
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
pj_lock_t *lock;
pj_log_set_level(0);
@@ -4559,7 +4559,7 @@
#endif
if (ast_rtp_engine_register(&asterisk_rtp_engine)) {
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
worker_terminate = 1;
pj_thread_join(thread);
pj_thread_destroy(thread);
@@ -4570,7 +4570,7 @@
}
if (ast_cli_register_multiple(cli_rtp, ARRAY_LEN(cli_rtp))) {
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
worker_terminate = 1;
pj_thread_join(thread);
pj_thread_destroy(thread);
@@ -4591,7 +4591,7 @@
ast_rtp_engine_unregister(&asterisk_rtp_engine);
ast_cli_unregister_multiple(cli_rtp, ARRAY_LEN(cli_rtp));
-#ifdef HAVE_PJNATH
+#ifdef HAVE_PJPROJECT
worker_terminate = 1;
pj_thread_register_check();
More information about the asterisk-commits
mailing list