[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  e6bf7724dbf3fbf38df56f8b4f947e1bdb22b4d7 (commit)
       via  fcb97e707f5fcbccff827d2323e7dd41758d84f4 (commit)
      from  193e143f766302a60c649d19a8d8ee8dcba71ff1 (commit)

Summary of changes:
 config/test_sip.conf       |    4 ++++
 src/PJSipSessionModule.cpp |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit e6bf7724dbf3fbf38df56f8b4f947e1bdb22b4d7
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Oct 1 11:49:49 2010 -0300

    Add a few comments to the test config which should be adhered to when doing failover.

diff --git a/config/test_sip.conf b/config/test_sip.conf
index 6143a9b..dde0255 100644
--- a/config/test_sip.conf
+++ b/config/test_sip.conf
@@ -1,9 +1,13 @@
 # This is a configuration file used in conjunction with the pjsip sip test driver
 
 # Adapter parameters for this component
+# The IP address and port specified here *must* match between master and slave
+# for Ice proxies to remain valid.
 SipChannelServiceAdapter.Endpoints=tcp -p 9985
 SipChannelServiceAdapter.ThreadPool.Size=4
 
+# Adapter parameters for the object adapter unique to this instance of the component
+# This should have a specified IP address and port so the replica control utility can find it.
 SipChannelServiceLocalAdapter.Endpoints=default
 SipChannelServiceLocalAdapter.ThreadPool.Size=4
 

commit fcb97e707f5fcbccff827d2323e7dd41758d84f4
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Sep 30 18:04:47 2010 -0300

    Add the beginning of REFER support. Initialize the required modules on our endpoint.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index a89ccab..a0592f7 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -531,7 +531,7 @@ static void handle_invite_response(pjsip_inv_session *inv, pjsip_rx_data *rdata,
 	//
 	//XXX There are a BUNCH of response codes we need
 	//to add code to handle.
-	
+
 	//Treat all 1XX messages we don't recognize the same as a 180
 	if (respCode > 100 && respCode < 200 && respCode != 183)
 	{
@@ -897,6 +897,8 @@ PJSipSessionModule::PJSipSessionModule() : mName("Session Module")
 	pjsip_tsx_layer_init_module(endpt);
 	pjsip_ua_init_module(endpt, &mUaParam);
 	pjsip_100rel_init_module(endpt);
+	pjsip_evsub_init_module(endpt);
+	pjsip_xfer_init_module(endpt);
 	pjsip_inv_usage_init(endpt, &mInvCallback);
 	pjsip_endpt_register_module(endpt, &mModule);
 }

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git