[asterisk-commits] file: branch group/pimp_my_sip r379433 - /team/group/pimp_my_sip/res/

[SVN commits to the Asterisk project]

Author: file
Date: Fri Jan 18 09:42:29 2013
New Revision: 379433

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379433
Log:
Export pjproject symbols from their respective modules.

Modified:
    team/group/pimp_my_sip/res/Makefile
    team/group/pimp_my_sip/res/res_sip.c
    team/group/pimp_my_sip/res/res_sip.exports.in
    team/group/pimp_my_sip/res/res_sip_session.exports.in

Modified: team/group/pimp_my_sip/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/Makefile?view=diff&rev=379433&r1=379432&r2=379433
==============================================================================
--- team/group/pimp_my_sip/res/Makefile (original)
+++ team/group/pimp_my_sip/res/Makefile Fri Jan 18 09:42:29 2013
@@ -91,3 +91,8 @@
 res_sip.o: _ASTCFLAGS+=$(PJ_CFLAGS)
 res_sip.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
 res_sip.so: LIBS+=$(PJ_LDLIBS)
+
+res_sip_session.o: $(PJ_LIB_FILES)
+res_sip_session.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+res_sip_session.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+res_sip_session.so: LIBS+=$(PJ_LDLIBS)

Modified: team/group/pimp_my_sip/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip.c?view=diff&rev=379433&r1=379432&r2=379433
==============================================================================
--- team/group/pimp_my_sip/res/res_sip.c (original)
+++ team/group/pimp_my_sip/res/res_sip.c Fri Jan 18 09:42:29 2013
@@ -430,6 +430,16 @@
      * if necessary.
 	 */
 	pj_status_t status;
+
+        if (pj_init() != PJ_SUCCESS) {
+                return AST_MODULE_LOAD_DECLINE;
+        }
+
+        if (pjlib_util_init() != PJ_SUCCESS) {
+                pj_shutdown();
+                return AST_MODULE_LOAD_DECLINE;
+        }
+
 	pj_caching_pool_init(&caching_pool, NULL, 1024 * 1024);
 	pjsip_endpt_create(&caching_pool.factory, "SIP", &ast_pjsip_endpoint);
 	memory_pool = pj_pool_create(&caching_pool.factory, "SIP", 1024, 1024, NULL);

Modified: team/group/pimp_my_sip/res/res_sip.exports.in
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip.exports.in?view=diff&rev=379433&r1=379432&r2=379433
==============================================================================
--- team/group/pimp_my_sip/res/res_sip.exports.in (original)
+++ team/group/pimp_my_sip/res/res_sip.exports.in Fri Jan 18 09:42:29 2013
@@ -20,6 +20,9 @@
 		LINKER_SYMBOL_PREFIXast_sip_add_body;
 		LINKER_SYMBOL_PREFIXast_sip_add_body_multipart;
 		LINKER_SYMBOL_PREFIXast_sip_append_body;
+		LINKER_SYMBOL_PREFIXast_sip_get_pjsip_endpoint;
+		LINKER_SYMBOL_PREFIXpj_*;
+		LINKER_SYMBOL_PREFIXpjsip_*;
 	local:
 		*;
 };

Modified: team/group/pimp_my_sip/res/res_sip_session.exports.in
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_session.exports.in?view=diff&rev=379433&r1=379432&r2=379433
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_session.exports.in (original)
+++ team/group/pimp_my_sip/res/res_sip_session.exports.in Fri Jan 18 09:42:29 2013
@@ -10,6 +10,7 @@
 		LINKER_SYMBOL_PREFIXast_sip_session_get_identity;
 		LINKER_SYMBOL_PREFIXast_sip_session_send_reinvite;
 		LINKER_SYMBOL_PREFIXast_sip_session_send_response;
+		LINKER_SYMBOL_PREFIXpjsip_inv_*;
 	local:
 		*;
 };