Module: sems Branch: master Commit: 35cc7601a5700462b082c12a86dbdb6689736afa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=35cc7601a5700462b082c12a86dbdb6689736afa
Author: Raphael Coeffic <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Mon Feb 14 15:37:29 2011 +0100 removed reference to LocalIP. --- apps/click2dial/Click2Dial.cpp | 2 +- apps/conference/Conference.cpp | 6 +++--- apps/ivr/Ivr.cpp | 2 +- apps/registrar_client/SIPRegistrarClient.cpp | 2 +- apps/sbc/SBC.cpp | 2 +- core/AmB2ABSession.cpp | 4 ++-- core/AmB2BSession.cpp | 2 +- core/AmUAC.cpp | 2 +- core/SipCtrlInterface.cpp | 3 --- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/apps/click2dial/Click2Dial.cpp b/apps/click2dial/Click2Dial.cpp index 0453951..fb06d47 100644 --- a/apps/click2dial/Click2Dial.cpp +++ b/apps/click2dial/Click2Dial.cpp @@ -240,7 +240,7 @@ void C2DCallerDialog::createCalleeSession() other_id = AmSession::getNewId(); callee_dlg.local_tag = other_id; - callee_dlg.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); + callee_dlg.callid = AmSession::getNewId(); callee_dlg.local_party = dlg.local_party; callee_dlg.remote_party = dlg.remote_party; callee_dlg.remote_uri = dlg.remote_uri; diff --git a/apps/conference/Conference.cpp b/apps/conference/Conference.cpp index 256ed13..d4899a8 100644 --- a/apps/conference/Conference.cpp +++ b/apps/conference/Conference.cpp @@ -783,7 +783,7 @@ void ConferenceDialog::createDialoutParticipant(const string& uri_user) AmSipDialog& dialout_dlg = dialout_session->dlg; dialout_dlg.local_tag = dialout_id; - dialout_dlg.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); + dialout_dlg.callid = AmSession::getNewId(); if (from_header.length() > 0) { dialout_dlg.local_party = from_header; @@ -795,7 +795,7 @@ void ConferenceDialog::createDialoutParticipant(const string& uri_user) string body; int local_port = dialout_session->RTPStream()->getLocalPort(); - dialout_session->sdp.genRequest(AmConfig::LocalIP(),local_port,body); + dialout_session->sdp.genRequest(dialout_session->advertisedIP(),local_port,body); if (extra_headers.length() == 0) { extra_headers = ""; @@ -885,7 +885,7 @@ void ConferenceDialog::onSipRequest(const AmSipRequest& req) string body; int local_port = RTPStream()->getLocalPort(); - sdp.genRequest(AmConfig::LocalIP(),local_port,body); + sdp.genRequest(advertisedIP(),local_port,body); dlg.sendRequest("INVITE","application/sdp",body,""); transfer_req.reset(new AmSipRequest(req)); diff --git a/apps/ivr/Ivr.cpp b/apps/ivr/Ivr.cpp index 662d510..91515b9 100644 --- a/apps/ivr/Ivr.cpp +++ b/apps/ivr/Ivr.cpp @@ -803,7 +803,7 @@ void IvrDialog::createCalleeSession() other_id = AmSession::getNewId(); callee_dlg.local_tag = other_id; - callee_dlg.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); + callee_dlg.callid = AmSession::getNewId(); // this will be overwritten by ConnectLeg event callee_dlg.remote_party = dlg.local_party; diff --git a/apps/registrar_client/SIPRegistrarClient.cpp b/apps/registrar_client/SIPRegistrarClient.cpp index eb64596..e76729e 100644 --- a/apps/registrar_client/SIPRegistrarClient.cpp +++ b/apps/registrar_client/SIPRegistrarClient.cpp @@ -73,7 +73,7 @@ SIPRegistration::SIPRegistration(const string& handle, req.from_tag = handle; req.to = req.from; req.to_tag = ""; - req.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); + req.callid = AmSession::getNewId(); // // clear dlg.callid? ->reregister? diff --git a/apps/sbc/SBC.cpp b/apps/sbc/SBC.cpp index 6e722ea..bc9ed61 100644 --- a/apps/sbc/SBC.cpp +++ b/apps/sbc/SBC.cpp @@ -988,7 +988,7 @@ void SBCDialog::createCalleeSession() callee_dlg.local_tag = other_id; callee_dlg.callid = callid.empty() ? - AmSession::getNewId() + "@" + AmConfig::LocalIP() : callid; + AmSession::getNewId() : callid; // this will be overwritten by ConnectLeg event callee_dlg.remote_party = to; diff --git a/core/AmB2ABSession.cpp b/core/AmB2ABSession.cpp index 8795cda..904b7aa 100644 --- a/core/AmB2ABSession.cpp +++ b/core/AmB2ABSession.cpp @@ -246,8 +246,8 @@ void AmB2ABCallerSession::setupCalleeSession(AmB2ABCalleeSession* callee_session assert(callee_session); AmSipDialog& callee_dlg = callee_session->dlg; - callee_dlg.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); - callee_dlg.local_tag = other_id; + callee_dlg.callid = AmSession::getNewId(); + callee_dlg.local_tag = other_id; MONITORING_LOG(other_id.c_str(), diff --git a/core/AmB2BSession.cpp b/core/AmB2BSession.cpp index 3de4b16..6f51c63 100644 --- a/core/AmB2BSession.cpp +++ b/core/AmB2BSession.cpp @@ -673,7 +673,7 @@ void AmB2BCallerSession::createCalleeSession() { other_id = AmSession::getNewId(); callee_dlg.local_tag = other_id; - callee_dlg.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); + callee_dlg.callid = AmSession::getNewId(); callee_dlg.local_party = dlg.remote_party; callee_dlg.remote_party = dlg.local_party; diff --git a/core/AmUAC.cpp b/core/AmUAC.cpp index 9a966a7..534418d 100644 --- a/core/AmUAC.cpp +++ b/core/AmUAC.cpp @@ -55,7 +55,7 @@ AmSession* AmUAC::dialout(const string& user, req.from_tag = local_tag; req.to = to; req.to_tag = ""; - req.callid = AmSession::getNewId() + "@" + AmConfig::LocalIP(); + req.callid = AmSession::getNewId(); req.hdrs = hdrs; return AmSessionContainer::instance()->startSessionUAC(req, session_params); diff --git a/core/SipCtrlInterface.cpp b/core/SipCtrlInterface.cpp index 607ffe0..b941640 100644 --- a/core/SipCtrlInterface.cpp +++ b/core/SipCtrlInterface.cpp @@ -61,9 +61,6 @@ int SipCtrlInterface::udp_rcvbuf = -1; int SipCtrlInterface::load() { - INFO("SIP bind_addr: `%s'.\n", AmConfig::LocalSIPIP().c_str()); - INFO("SIP bind_port: `%i'.\n", AmConfig::LocalSIPPort()); - if (!AmConfig::OutboundProxy.empty()) { sip_uri parsed_uri; if (parse_uri(&parsed_uri, (char *)AmConfig::OutboundProxy.c_str(), _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
