[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "session_cookies" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 26 12:21:26 CDT 2011
branch "session_cookies" has been updated
via 6b78d3f7b20a765c2e888919af96c9c488bfc170 (commit)
via de1c49f45105d4a62b9572f8bf4efbf8c718933c (commit)
via 0791f44ddb97bced3ded5da19580ba16966e9f63 (commit)
via 2d535b3c8813521ba060c544c80baabc2b452f76 (commit)
via 4c8c74c547955dd93c9e15d2f5c188918517aeeb (commit)
via ca95f560a6c8ccf5b3ffd2bff26249b982ecedea (commit)
via 307e2b902ca3b1466aff00951914feb31bdedfec (commit)
via 0fafee70d034c4406eb11b37817b12a70b50304e (commit)
via 1f886e1225940e228bec9a983cf4a7b844e69cb4 (commit)
via 24244fa6392253ffe2ff6c60757435be1b26da20 (commit)
via 2b68a207e8b733c5d32f7f3baa63ab743a4a4f82 (commit)
via 872dc33703f403a63e896a8b778a1e43fa7bad09 (commit)
via 929982dac23f77950f2b7ff18ec85b51a42de558 (commit)
via 95c838e77ca99e63a13721981e2aa07867c4bea1 (commit)
via d7418a0d23a8a23431e859442c782501abfc0553 (commit)
via 7a25b8073e1e0d2bb2391a3feafb61b6bdacb380 (commit)
via 6ced932f19f094541afd5c7ef8b069ea83f26438 (commit)
via 238e6bb3ddcb4d697e3ac5189c73e0683132ad5e (commit)
via 04e2c162bc7f6cd6b9bceb74089d1a9a29148b59 (commit)
via 0c1ba29dc6631ac5ce38a3d2629fe17afcd39627 (commit)
via df6502431fb6d495c88eb9a223820f063432bd7e (commit)
via 6fa0d1a69f5290d1154951965017380dc4e61825 (commit)
via 06ba07d7d56ed8447eeb188eb4bb5770a9c41adc (commit)
via a2ce7d678f3574f6f63691dacead5e2574ded080 (commit)
via 413bb6369fb40c99a952305fa924dc087da7792c (commit)
via 626ae7f220d8b0ad44820a5110eeceb61248d032 (commit)
via ab478a5684fed6d71a1169104ff9067a240b1e81 (commit)
via dd6f1be516148b8f328adf3f174c43fe949a1b61 (commit)
via 0024d93bcf841b13eec471b2d3f726cdbe686978 (commit)
via db6b6404ec286000fcb921edfe080fc6c2cc1c9d (commit)
via 148efc74ad128c054300d461fb29ae8e31392bed (commit)
via 827fc662e122ea00689893d167e77a46adf47a15 (commit)
via dc0dbb97620670914e030aab47cf1e0f90915ef1 (commit)
via c5ed0db396867362132166c17aac2a74274bb48d (commit)
via 891cedd06767489bf8e00b9c1b98318d9c09d3ef (commit)
via 0f17de699ae1b4e8f7abdb69053405a30b4b7952 (commit)
via 4c5178bacdf897e9717c93187b2bcb657f2e1871 (commit)
via d17c5711691e51a7a46e787da409c568e8dc6cfd (commit)
via e37d9494e7db63a6f9e0798020dc3de62533da91 (commit)
via 72138cabee93955fb3d648ac78c1faea422e2733 (commit)
via 01940e42606ff1b41b53778a2b5148021be8d80b (commit)
via 053aefa444ff4d34070d67d6f45809005c9c7c57 (commit)
via 8b96c2315423a29b508d1d32622b5fd28b386653 (commit)
via 116744bd3cb957d26797c50bcc63e4c673ec49ad (commit)
via 7560c60db1c62ab3b846eba93098d9e81f1be09d (commit)
via db9137c28c816f89efc2f9d69accd5e60cc7ec95 (commit)
via 1cc1ec91224cb05370e8e996433ecb7b5f8201fe (commit)
via 49098782accde3746af4857574c15ceac1ea7916 (commit)
via 475da6c6e49647d883663e3b93e443c57f415169 (commit)
via 0adc89a842ccb2893a472539fe89ffb2e032f41a (commit)
via f9be80d1e56708c2673f952d14a0a42b35cb891e (commit)
via c004843947a6e1724a08225c7791cb46eee01304 (commit)
from 928dba7dd84db90557a2259854d6dcc3ece04db0 (commit)
Summary of changes:
config/Configurator.py | 179 +++++
config/Sip.config | 77 ++
config/SipConfigurator.py | 166 +++++
local-slice/SipConfigurationIf.ice | 535 ++++++++++-----
local-slice/SipStateReplicationIf.ice | 2 +-
src/CMakeLists.txt | 3 +
src/PJSipLoggingModule.cpp | 4 +-
src/PJSipManager.cpp | 83 ++-
src/PJSipManager.h | 30 +-
src/PJSipModule.cpp | 9 +-
src/PJSipSessionModule.cpp | 224 ++++--
src/PJSipSessionModule.h | 16 +-
src/PJSipSessionModuleConstruction.cpp | 13 +-
src/SipConfiguration.cpp | 1180 +++++++++++++++++++++++++++++++
src/SipConfiguration.h | 66 ++
src/SipEndpoint.cpp | 102 ++-
src/SipEndpoint.h | 48 +-
src/SipEndpointFactory.cpp | 24 +-
src/SipEndpointFactory.h | 20 +-
src/SipSession.cpp | 233 ++++---
src/SipSession.h | 21 +-
src/SipSessionManagerApp.cpp | 71 ++-
src/SipSessionManagerEndpointLocator.h | 6 +-
src/SipSessionManagerEventPublisher.cpp | 7 +-
src/SipSessionManagerEventPublisher.h | 2 +-
src/SipStateReplicator.h | 25 +-
src/SipStateReplicatorApp.cpp | 30 +-
src/SipStateReplicatorListener.cpp | 43 +-
28 files changed, 2679 insertions(+), 540 deletions(-)
create mode 100755 config/Configurator.py
create mode 100644 config/Sip.config
create mode 100755 config/SipConfigurator.py
create mode 100644 src/SipConfiguration.cpp
create mode 100644 src/SipConfiguration.h
- Log -----------------------------------------------------------------
commit 6b78d3f7b20a765c2e888919af96c9c488bfc170
Merge: 928dba7 de1c49f
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Apr 26 14:21:02 2011 -0300
Merge remote branch 'origin/master' into session_cookies
Conflicts:
src/PJSipSessionModule.cpp
diff --cc src/PJSipSessionModule.cpp
index 03269c3,0d15243..9ab66bd
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@@ -813,9 -861,9 +862,9 @@@ void PJSipSessionModule::handleInviteRe
try
{
ListenerCallbackPtr cb(new ListenerCallback(RingingCallbackName));
- Callback_SessionListener_ringingPtr ringingCB =
- newCallback_SessionListener_ringing(cb, &ListenerCallback::failure);
- (*listener)->begin_ringing(session->getSessionProxy(), session->getCookies(), ringingCB);
+ Callback_SessionListener_indicatedPtr ringingCB =
+ newCallback_SessionListener_indicated(cb, &ListenerCallback::failure);
- (*listener)->begin_indicated(session->getSessionProxy(), new RingingIndication(), ringingCB);
++ (*listener)->begin_indicated(session->getSessionProxy(), new RingingIndication(), session->getCookies(), ringingCB);
}
catch (const Ice::Exception &ex)
{
@@@ -836,9 -884,11 +885,11 @@@
try
{
ListenerCallbackPtr cb(new ListenerCallback(ProgressingCallbackName));
- Callback_SessionListener_progressingPtr progressingCB =
- newCallback_SessionListener_progressing(cb, &ListenerCallback::failure);
- (*listener)->begin_progressing(session->getSessionProxy(), session->getCookies(), response, progressingCB);
+ Callback_SessionListener_indicatedPtr progressingCB =
+ newCallback_SessionListener_indicated(cb, &ListenerCallback::failure);
+ ProgressingIndicationPtr progressing(new ProgressingIndication());
+ progressing->response = response;
- (*listener)->begin_indicated(session->getSessionProxy(), progressing, progressingCB);
++ (*listener)->begin_indicated(session->getSessionProxy(), progressing, session->getCookies(), progressingCB);
}
catch (const Ice::Exception &ex)
{
@@@ -859,9 -909,9 +910,9 @@@
try
{
ListenerCallbackPtr cb(new ListenerCallback(ConnectedCallbackName));
- Callback_SessionListener_connectedPtr connectedCB =
- newCallback_SessionListener_connected(cb, &ListenerCallback::failure);
- (*listener)->begin_connected(session->getSessionProxy(), session->getCookies(), connectedCB);
+ Callback_SessionListener_indicatedPtr connectedCB =
+ newCallback_SessionListener_indicated(cb, &ListenerCallback::failure);
- (*listener)->begin_indicated(session->getSessionProxy(), new ConnectedIndication(), connectedCB);
++ (*listener)->begin_indicated(session->getSessionProxy(), new ConnectedIndication(), session->getCookies(), connectedCB);
}
catch (const Ice::Exception &ex)
{
@@@ -911,7 -965,7 +966,7 @@@ void PJSipSessionModule::invOnStateChan
{
try
{
- (*listener)->stopped(session->getSessionProxy(), session->getCookies(), response);
- (*listener)->indicated(session->getSessionProxy(), stopped);
++ (*listener)->indicated(session->getSessionProxy(), stopped, session->getCookies());
}
catch (const Ice::Exception &ex)
{
-----------------------------------------------------------------------
--
asterisk-scf/integration/sip.git
More information about the asterisk-scf-commits
mailing list