[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  913141817e1a0b96744170af628828498375bcca (commit)
       via  4de287495c05c09e618fffd813b148236865ac5c (commit)
       via  370c8f1982d5f61078132083204ff017ee63488e (commit)
       via  001a7f23072d819926e28efd63c463a1877fe951 (commit)
      from  e53a95c97d142b2ec2cd276a2a794d899a3c3305 (commit)

Summary of changes:
 src/PJSipManager.cpp |   23 +++++++++++++++++++++++
 src/PJSipManager.h   |   12 ++++++++++++
 src/SipEndpoint.h    |   21 +++++++++++++++++++++
 3 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 src/SipEndpoint.h


- Log -----------------------------------------------------------------
commit 913141817e1a0b96744170af628828498375bcca
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Aug 20 17:22:56 2010 -0500

    Make sure to use the mModules vector when registering and unregistering pjsip_modules.

diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 6c9578e..f2966ed 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -71,6 +71,7 @@ bool PJSipManager::registerModule(pjsip_module *module)
 	{
 		return false;
 	}
+	mModules.push_back(module);
 	return true;
 }
 
@@ -81,6 +82,16 @@ bool PJSipManager::unregisterModule(pjsip_module *module)
 	{
 		return false;
 	}
+	for (std::vector<pjsip_module *>::iterator iter = mModules.begin();
+			iter != mModules.end();
+			++iter)
+	{
+		if (*iter == module)
+		{
+			mModules.erase(iter);
+			break;
+		}
+	}
 	return true;
 }
 

commit 4de287495c05c09e618fffd813b148236865ac5c
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Aug 20 17:17:02 2010 -0500

    Add missing header files to PJSipManager.h and PJSipManager.cpp

diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 669a671..6c9578e 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include "PJSipManager.h"
 
 namespace Hydra
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index 0f0778c..5f827de 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 #include <pjlib.h>
 #include <pjsip.h>
 

commit 370c8f1982d5f61078132083204ff017ee63488e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Aug 20 17:15:51 2010 -0500

    Add proper namespaces to the PJSipManager files.

diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 2fc8c21..669a671 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -1,5 +1,11 @@
 #include "PJSipManager.h"
 
+namespace Hydra
+{
+
+namespace SIP
+{
+
 PJSipManager *PJSipManager::mInstance = NULL;
 
 static void *monitorThread(void *endpt)
@@ -75,3 +81,7 @@ bool PJSipManager::unregisterModule(pjsip_module *module)
 	}
 	return true;
 }
+
+}; //End namespace SIP
+
+}; //End namespace Hydra
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index 558164e..0f0778c 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -5,6 +5,12 @@
 
 #include <boost/shared_ptr.hpp>
 
+namespace Hydra
+{
+
+namespace SIP
+{
+
 /**
  * This class is responsible for providing
  * access to the pjsip_endpt for the Asterisk
@@ -49,3 +55,7 @@ private:
 	pj_caching_pool mCachingPool;
 	pj_pool_t *mMemoryPool;
 };
+
+}; //End namespace SIP
+
+}; //End namespace Hydra

commit 001a7f23072d819926e28efd63c463a1877fe951
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Aug 20 17:15:22 2010 -0500

    Create a barebones skeleton for a SipEndpoint class.

diff --git a/src/SipEndpoint.h b/src/SipEndpoint.h
new file mode 100644
index 0000000..5a07f0e
--- /dev/null
+++ b/src/SipEndpoint.h
@@ -0,0 +1,21 @@
+#include <Core/Endpoint/EndpointIf.h>
+#include <Session/SessionIf.h>
+
+namespace Hydra
+{
+
+namespace SIP
+{
+
+class SipEndpoint : public Hydra::Core::Endpoint::BaseEndpoint
+{
+public:
+	SipEndpoint();
+	class SipSessionManager : public Hydra::Session::SessionManager;
+	class SipSignalCommand : public Hydra::Session::SignalCommand;
+	class SipSignalCallbacks : public Hydra::Session::SignalCallbacks;
+};
+
+}; //End namespace SIP
+
+}; //End namespace Hydra

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


-- 
asterisk-scf/integration/sip.git