sipwise
/
sems
mirror of https://github.com/sipwise/sems.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#62181 onInvite et al: const updates

Browse Source 
Update the AmArg argument to const as these functions never change it,
and it may come from a const source. (The `string` counterpart in the
other overload is already const qualified.)

Change-Id: I1e527425a70e0c6468b8b59de7e4a20fa1f5c218
mr13.4
Richard Fuchs 1 year ago
parent 5523520c87
commit 1ae07025e7
32 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
apps/announcement/Announcement.cpp
Unescape View File

@ -100,7 +100,7 @@ AmSession* AnnouncementFactory::onInvite(const AmSipRequest& req, const string&
}
AmSession* AnnouncementFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);
AmSession* s = new AnnouncementDialog(getAnnounceFile(req), cred);

2
apps/announcement/Announcement.h
Unescape View File

@ -52,7 +52,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
};

2
apps/annrecorder/AnnRecorder.cpp
Unescape View File

@ -207,7 +207,7 @@ AmSession* AnnRecorderFactory::onInvite(const AmSipRequest& req, const string& a
}
AmSession* AnnRecorderFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

2
apps/annrecorder/AnnRecorder.h
Unescape View File

@ -77,7 +77,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
};

2
apps/callback/CallBack.cpp
Unescape View File

@ -158,7 +158,7 @@ AmSession* CallBackFactory::onInvite(const AmSipRequest& req, const string& app_
// outgoing calls
AmSession* CallBackFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
UACAuthCred* cred = NULL;
if (session_params.getType() == AmArg::AObject) {

2
apps/callback/CallBack.h
Unescape View File

@ -75,7 +75,7 @@ public:
AmSession* onInvite(const AmSipRequest&, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
int onLoad();
void run();

2
apps/click2dial/Click2Dial.cpp
Unescape View File

@ -102,7 +102,7 @@ string Click2DialFactory::getAnnounceFile(const AmSipRequest& req)
}
AmSession* Click2DialFactory::onInvite(const AmSipRequest& req, const string& app_name, AmArg& session_params)
AmSession* Click2DialFactory::onInvite(const AmSipRequest& req, const string& app_name, const AmArg& session_params)
{
string callee_uri, a_realm, a_user, a_pwd;

2
apps/click2dial/Click2Dial.h
Unescape View File

@ -54,7 +54,7 @@ class Click2DialFactory: public AmSessionFactory
int onLoad();
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name, AmArg& session_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name, const AmArg& session_params);
};
class C2DCallerDialog: public AmB2BCallerSession, public CredentialHolder

2
apps/dsm/DSM.cpp
Unescape View File

@ -729,7 +729,7 @@ AmSession* DSMFactory::onInvite(const AmSipRequest& req, const string& app_name,
// outgoing call
AmSession* DSMFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
string start_diag;

2
apps/dsm/DSM.h
Unescape View File

@ -139,7 +139,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
// DI
// DI factory
AmDynInvoke* getInstance() { return instance(); }

2
apps/examples/call_gen/CallGen.cpp
Unescape View File

@ -172,7 +172,7 @@ AmSession* CallGenFactory::onInvite(const AmSipRequest& req, const string& app_n
// outgoing calls
AmSession* CallGenFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& args)
const AmArg& args)
{
size_t cnt = 0;
cnt++; // int ncalls = args.get(cnt++).asInt();

2
apps/examples/call_gen/CallGen.h
Unescape View File

@ -89,7 +89,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& args);
const AmArg& args);
int onLoad();

4
apps/examples/di_dialer/DIDial.cpp
Unescape View File

@ -128,7 +128,7 @@ string DIDial::dialout(const string& application,
const string& user,
const string& from,
const string& to,
AmArg* extra_params) {
const AmArg* extra_params) {
DBG("dialout application '%s', user '%s', from '%s', to '%s'\n",
application.c_str(), user.c_str(), from.c_str(), to.c_str());
@ -148,7 +148,7 @@ string DIDial::dialout_auth(const string& application,
const string& a_realm,
const string& a_user,
const string& a_pwd,
AmArg* extra_params
const AmArg* extra_params
) {
DBG("dialout application '%s', user '%s', from '%s', to '%s', authrealm '%s', authuser '%s', authpass '%s'",
application.c_str(), user.c_str(), from.c_str(), to.c_str(), a_realm.c_str(), a_user.c_str(), a_pwd.c_str());

4
apps/examples/di_dialer/DIDial.h
Unescape View File

@ -24,7 +24,7 @@ class DIDial : public AmDynInvoke
const string& user,
const string& from,
const string& to,
AmArg* extra_params);
const AmArg* extra_params);
string dialout_auth(const string& application,
const string& user,
@ -33,7 +33,7 @@ class DIDial : public AmDynInvoke
const string& realm,
const string& a_user,
const string& pwd,
AmArg* extra_params);
const AmArg* extra_params);
string dialout_auth_b2b(const string& application,
const string& announcement,

2
apps/examples/dtmftester/DtmfTester.cpp
Unescape View File

@ -96,7 +96,7 @@ AmSession* DtmfTesterFactory::onInvite(const AmSipRequest& req, const string& ap
}
AmSession* DtmfTesterFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

2
apps/examples/dtmftester/DtmfTester.h
Unescape View File

@ -52,7 +52,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
};

2
apps/examples/early_record/EarlyRecord.cpp
Unescape View File

@ -30,7 +30,7 @@ AmSession* EarlyRecordFactory::onInvite(const AmSipRequest& req, const string& a
// auth with di_dial
AmSession* EarlyRecordFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

2
apps/examples/early_record/EarlyRecord.h
Unescape View File

@ -19,7 +19,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
};

2
apps/examples/pinauthconference/PinAuthConference.cpp
Unescape View File

@ -92,7 +92,7 @@ AmSession* PinAuthConferenceFactory::onInvite(const AmSipRequest&, const string&
// outgoing calls
AmSession* PinAuthConferenceFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
return new PinAuthConferenceDialog(prompts);
}

2
apps/examples/pinauthconference/PinAuthConference.h
Unescape View File

@ -63,7 +63,7 @@ public:
AmSession* onInvite(const AmSipRequest&, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
int onLoad();
};

2
apps/examples/simple_conference/SimpleConference.cpp
Unescape View File

@ -51,7 +51,7 @@ AmSession* SimpleConferenceFactory::onInvite(const AmSipRequest& req, const stri
// outgoing calls - rep is 200 class response to INVITE
AmSession* SimpleConferenceFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
return new SimpleConferenceDialog();
}

2
apps/examples/simple_conference/SimpleConference.h
Unescape View File

@ -50,7 +50,7 @@ public:
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
int onLoad();
};

2
apps/sw_vsc/SW_Vsc.cpp
Unescape View File

@ -246,7 +246,7 @@ AmSession *SW_VscFactory::onInvite(const AmSipRequest &req,
AmSession *SW_VscFactory::onInvite(const AmSipRequest &req,
const string &app_name,
AmArg &session_params)
const AmArg &session_params)
{
UACAuthCred *cred = AmUACAuth::unpackCredentials(session_params);
AmSession *s = new SW_VscDialog(&m_patterns, cred);

3
apps/sw_vsc/SW_Vsc.h
Unescape View File

@ -87,8 +87,7 @@ public:
AmSession *onInvite(const AmSipRequest &req, const string &app_name,
const map<string, string> &app_params);
AmSession *onInvite(const AmSipRequest &req, const string &app_name,
AmArg &session_params);
const AmArg &session_params);
};
class SW_VscDialog : public AmSession,

2
apps/webconference/WebConference.cpp
Unescape View File

@ -445,7 +445,7 @@ AmSession* WebConferenceFactory::onInvite(const AmSipRequest& req, const string&
// outgoing calls
AmSession* WebConferenceFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);
AmSession* s = new WebConferenceDialog(prompts, getInstance(), cred);

2
apps/webconference/WebConference.h
Unescape View File

@ -154,7 +154,7 @@ public:
AmSession* onInvite(const AmSipRequest&, const string& app_name,
const map<string,string>& app_params);
AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
int onLoad();
bool isValidConference(const string& conf_id, const string& participant_id);

6
core/AmApi.cpp
Unescape View File

@ -50,7 +50,7 @@ AmSessionFactory::AmSessionFactory(const string& name)
}
AmSession* AmSessionFactory::onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params) {
const AmArg& session_params) {
WARN(" discarding session parameters to new session.\n");
map<string,string> app_params;
return onInvite(req,app_name,app_params);
@ -62,7 +62,7 @@ AmSession* AmSessionFactory::onRefer(const AmSipRequest& req, const string& app_
}
AmSession* AmSessionFactory::onRefer(const AmSipRequest& req, const string& app_name,
AmArg& session_params)
const AmArg& session_params)
{
WARN(" discarding session parameters to new session.\n");
map<string,string> app_params;
@ -146,7 +146,7 @@ AmSessionEventHandlerFactory::AmSessionEventHandlerFactory(const string& name)
}
bool AmSessionEventHandlerFactory::onInvite(const AmSipRequest& req,
AmArg& session_params,
const AmArg& session_params,
AmConfigReader& cfg) {
WARN("discarding session parameters for new session.\n");
return onInvite(req, cfg);

6
core/AmApi.h
Unescape View File

@ -115,7 +115,7 @@ class AmSessionEventHandlerFactory: public AmPluginFactory
* @return false if session creation should be stopped
*/
virtual bool onInvite(const AmSipRequest& req, AmConfigReader& cfg)=0;
virtual bool onInvite(const AmSipRequest& req, AmArg& session_params, AmConfigReader& cfg);
virtual bool onInvite(const AmSipRequest& req, const AmArg& session_params, AmConfigReader& cfg);
};
/** \brief Interface for plugins to create sessions */
@ -162,7 +162,7 @@ class AmSessionFactory: public AmPluginFactory
* processing as it would block the server.
*/
virtual AmSession* onInvite(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
/**
* Creates a dialog state on new REFER with local-tag.
@ -185,7 +185,7 @@ class AmSessionFactory: public AmPluginFactory
* processing as it would block the server.
*/
virtual AmSession* onRefer(const AmSipRequest& req, const string& app_name,
AmArg& session_params);
const AmArg& session_params);
/**
* Method to receive any out-of-dialog request

4
core/AmSessionContainer.cpp
Unescape View File

@ -205,7 +205,7 @@ void AmSessionContainer::destroySession(AmSession* s)
}
}
string AmSessionContainer::startSessionUAC(const AmSipRequest& req, string& app_name, AmArg* session_params) {
string AmSessionContainer::startSessionUAC(const AmSipRequest& req, string& app_name, const AmArg* session_params) {
unique_ptr<AmSession> session;
try {
@ -490,7 +490,7 @@ bool AmSessionContainer::check_and_add_cps(bool emergency_flag)
AmSession* AmSessionContainer::createSession(const AmSipRequest& req,
string& app_name,
AmArg* session_params)
const AmArg* session_params)
{
if (AmConfig::ShutdownMode) {
_run_cond.set(true); // so that thread stops

4
core/AmSessionContainer.h
Unescape View File

@ -119,7 +119,7 @@ class AmSessionContainer : public AmThread
*/
AmSession* createSession(const AmSipRequest& req,
string& app_name,
AmArg* session_params = NULL);
const AmArg* session_params = NULL);
/**
* Adds a session to the container (UAS only).
@ -150,7 +150,7 @@ class AmSessionContainer : public AmThread
*/
string startSessionUAC(const AmSipRequest& req,
string& app_name,
AmArg* session_params = NULL);
const AmArg* session_params = NULL);
/**
* Detroys a session.

2
core/AmUAC.cpp
Unescape View File

@ -39,7 +39,7 @@ string AmUAC::dialout(const string& user,
const string& to,
const string& local_tag,
const string& hdrs,
AmArg* session_params) {
const AmArg* session_params) {
AmSipRequest req;
string m_app_name = app_name;

2
core/AmUAC.h
Unescape View File

@ -46,7 +46,7 @@ class AmUAC {
const string& to,
const string& local_tag = "",
const string& hdrs = "",
AmArg* session_params = NULL);
const AmArg* session_params = NULL);
};

Write Preview
Loading…
Cancel
Save