[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  08ef6e2c7c84cb48fe7fa0c4eec503239ef401ee (commit)
       via  c12b191b62b738cb0033c17794d6241de9c882d6 (commit)
      from  86577567d70f7680a1907428d7a0d3058db3b71e (commit)

Summary of changes:
 src/CMakeLists.txt   |    3 +++
 src/PJSipManager.cpp |   10 +++++-----
 src/PJSipManager.h   |    4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 08ef6e2c7c84cb48fe7fa0c4eec503239ef401ee
Merge: c12b191 8657756
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Aug 23 14:46:52 2010 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/sip


commit c12b191b62b738cb0033c17794d6241de9c882d6
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Aug 23 14:41:21 2010 -0500

    Fix up some build problems.
    
    Fixed some syntax errors in PJSipManager files. Added link
    operation for pjlib-util.
    
    There's a single undefined reference at this point. Pushing so
    Joshua may have a look.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33c2dd7..afd1c94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,8 @@ hydra_component_add_file(SipChannelService SipEndpointFactory.cpp)
 hydra_component_add_file(SipChannelService SipEndpointFactory.h)
 hydra_component_add_file(SipChannelService SipEndpoint.cpp)
 hydra_component_add_file(SipChannelService SipEndpoint.h)
+hydra_component_add_file(SipChannelService PJSipManager.cpp)
+hydra_component_add_file(SipChannelService PJSipManager.h)
 
 hydra_component_add_ice_libraries(SipChannelService IceStorm)
 
@@ -29,6 +31,7 @@ hydra_component_add_boost_libraries(SipChannelService thread core)
 hydra_component_build_standalone(SipChannelService)
 
 pjproject_link(SipChannelService pjlib)
+pjproject_link(SipChannelService pjlib-util)
 pjproject_link(SipChannelService pjsip)
 
 
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index f2966ed..2e65b34 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -8,7 +8,7 @@ namespace Hydra
 namespace SIP
 {
 
-PJSipManager *PJSipManager::mInstance = NULL;
+PJSipManager *PJSipManager::mInstance = 0;
 
 static void *monitorThread(void *endpt)
 {
@@ -16,7 +16,7 @@ static void *monitorThread(void *endpt)
 	pj_thread_desc desc;
 	pj_bzero(desc, sizeof(desc));
 	pj_thread_register("SIP Maintenance", desc, &this_thread);
-	pjsip_endpoint *endpoint = endpt;
+	pjsip_endpoint *endpoint = static_cast<pjsip_endpoint *> (endpt);
 	for (;;)
 	{
 		// No timeout is a bad idea in the long run, but for now,
@@ -27,7 +27,7 @@ static void *monitorThread(void *endpt)
 
 PJSipManager *PJSipManager::getInstance()
 {
-	if (mInstance == NULL)
+	if (mInstance == 0)
 	{
 		mInstance = new PJSipManager;
 	}
@@ -52,14 +52,14 @@ PJSipManager::PJSipManager()
 		std::cerr << "[ERROR] Failed to create a memory pool" << std::endl;
 	}
 	status = pj_thread_create(mMemoryPool, "SIP", (pj_thread_proc *) &monitorThread,
-			NULL, PJ_THREAD_DEFAULT_STACK_SIZE, mEndpoint, &mPjThread);
+			NULL, PJ_THREAD_DEFAULT_STACK_SIZE, 0, &mPjThread);
 	if (status != PJ_SUCCESS)
 	{
 		std::cerr << "[ERROR] Failed to create SIP maintenance thread" << std::endl;
 	}
 }
 
-pjsip_endpt *PJSipManager::getEndpoint()
+pjsip_endpoint *PJSipManager::getEndpoint()
 {
 	return mEndpoint;
 }
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index 5f827de..3427c3a 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -32,7 +32,7 @@ public:
 	 * Get a handle to the PJSipEndpoint for operations
 	 * that may require it
 	 */
-	pjsip_endpt *getEndpoint();
+	pjsip_endpoint *getEndpoint();
 	/**
 	 * Register a module with PJsip
 	 * This will result in the module's load and
@@ -50,7 +50,7 @@ public:
 protected:
 	PJSipManager();
 private:
-	static Boost::shared_ptr<PJSipManager> mInstance;
+	static PJSipManager* mInstance;
 	pjsip_endpoint *mEndpoint;
 	std::vector<pjsip_module *> mModules;
 	pj_thread_t *mPjThread;

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


-- 
asterisk-scf/integration/sip.git