[asterisk-commits] kmoore: branch kmoore/pimp_sip_media r383106 - in /team/kmoore/pimp_sip_media...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Mar 14 15:00:37 2013
New Revision: 383106

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383106
Log:
Multiple revisions 383066,383104

........
  r383066 | root | 2013-03-14 12:18:10 -0500 (Thu, 14 Mar 2013) | 11 lines
  
  Fix whitespace in AST_EXT_LIB_CHECK macro.
  ........
  
  Merged revisions 383061 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 383062 from http://svn.asterisk.org/svn/asterisk/branches/11
  ........
  
  Merged revisions 383063 from file:///srv/subversion/repos/asterisk/trunk
........
  r383104 | file | 2013-03-14 14:58:25 -0500 (Thu, 14 Mar 2013) | 1 line
  
  Move initialization of the transaction and UA layers to res_sip as they are required for all SIP operation.
........

Merged revisions 383066,383104 from http://svn.asterisk.org/svn/asterisk/team/group/pimp_my_sip

Modified:
    team/kmoore/pimp_sip_media/   (props changed)
    team/kmoore/pimp_sip_media/autoconf/ast_ext_lib.m4
    team/kmoore/pimp_sip_media/res/res_sip.c
    team/kmoore/pimp_sip_media/res/res_sip_session.c

Propchange: team/kmoore/pimp_sip_media/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/kmoore/pimp_sip_media/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 14 15:00:37 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-383054
+/team/group/pimp_my_sip:1-383105

Modified: team/kmoore/pimp_sip_media/autoconf/ast_ext_lib.m4
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pimp_sip_media/autoconf/ast_ext_lib.m4?view=diff&rev=383106&r1=383105&r2=383106
==============================================================================
--- team/kmoore/pimp_sip_media/autoconf/ast_ext_lib.m4 (original)
+++ team/kmoore/pimp_sip_media/autoconf/ast_ext_lib.m4 Thu Mar 14 15:00:37 2013
@@ -112,9 +112,9 @@
    # if --with-$1=DIR has been specified, use it.
    if test "x${$1_DIR}" != "x"; then
       if test -d ${$1_DIR}/lib; then
-      	 pbxlibdir="-L${$1_DIR}/lib"
+         pbxlibdir="-L${$1_DIR}/lib"
       else
-      	 pbxlibdir="-L${$1_DIR}"
+         pbxlibdir="-L${$1_DIR}"
       fi
    fi
    pbxfuncname="$3"

Modified: team/kmoore/pimp_sip_media/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pimp_sip_media/res/res_sip.c?view=diff&rev=383106&r1=383105&r2=383106
==============================================================================
--- team/kmoore/pimp_sip_media/res/res_sip.c (original)
+++ team/kmoore/pimp_sip_media/res/res_sip.c Thu Mar 14 15:00:37 2013
@@ -534,6 +534,9 @@
 		goto error;
 	}
 
+	pjsip_tsx_layer_init_module(ast_pjsip_endpoint);
+	pjsip_ua_init_module(ast_pjsip_endpoint, NULL);
+
 	monitor_continue = 1;
 	status = pj_thread_create(memory_pool, "SIP", (pj_thread_proc *) &monitor_thread_exec,
 			NULL, PJ_THREAD_DEFAULT_STACK_SIZE * 2, 0, &monitor_thread);

Modified: team/kmoore/pimp_sip_media/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pimp_sip_media/res/res_sip_session.c?view=diff&rev=383106&r1=383105&r2=383106
==============================================================================
--- team/kmoore/pimp_sip_media/res/res_sip_session.c (original)
+++ team/kmoore/pimp_sip_media/res/res_sip_session.c Thu Mar 14 15:00:37 2013
@@ -1424,8 +1424,6 @@
 		return AST_MODULE_LOAD_DECLINE;
 	}
 	endpt = ast_sip_get_pjsip_endpoint();
-	pjsip_tsx_layer_init_module(endpt);
-	pjsip_ua_init_module(endpt, NULL);
 	pjsip_inv_usage_init(endpt, &inv_callback);
 	pjsip_100rel_init_module(endpt);
 	pjsip_timer_init_module(endpt);