Module: sems Branch: rco/offer_answer Commit: ceaa17d4c06628e601ca49f3ee0eb85743b80d9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=ceaa17d4c06628e601ca49f3ee0eb85743b80d9e
Author: Raphael Coeffic <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Fri May 27 10:27:38 2011 +0200 adapted to offer_answer API. --- core/AmSipRegistration.cpp | 18 ++++++------------ core/AmSipRegistration.h | 13 +++++-------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/core/AmSipRegistration.cpp b/core/AmSipRegistration.cpp index e3d3a3f..f9aa35c 100644 --- a/core/AmSipRegistration.cpp +++ b/core/AmSipRegistration.cpp @@ -46,7 +46,6 @@ AmSIPRegistration::AmSIPRegistration(const string& handle, seh(NULL), expires_interval(3600) { - req.cmd = "sems"; req.user = info.user; req.method = "REGISTER"; req.r_uri = "sip:"+info.domain; @@ -59,7 +58,7 @@ AmSIPRegistration::AmSIPRegistration(const string& handle, // // clear dlg.callid? ->reregister? - dlg.updateStatusFromLocalRequest(req); + dlg.initFromLocalRequest(req); dlg.cseq = 50; if(!info.contact.empty()) { dlg.contact_uri = SIP_HDR_COLSP(SIP_HDR_CONTACT) "<sip:"; @@ -171,16 +170,10 @@ void AmSIPRegistration::onSendRequest(const string& method, hdrs,flags,cseq); } -void AmSIPRegistration::onSendReply(const AmSipRequest& req, - unsigned int code, - const string& reason, - const string& content_type, - const string& body, - string& hdrs, +void AmSIPRegistration::onSendReply(AmSipReply& reply, int flags) { if (seh) - seh->onSendReply(req,code,reason, - content_type,body,hdrs,flags); + seh->onSendReply(reply,flags); } AmSIPRegistration::RegistrationState AmSIPRegistration::getState() { @@ -246,9 +239,10 @@ bool AmSIPRegistration::registerExpired(time_t now_sec) { return ((reg_begin+reg_expires) < (unsigned int)now_sec); } -void AmSIPRegistration::onSipReply(const AmSipReply& reply, int old_dlg_status, const string& trans_method) +void AmSIPRegistration::onSipReply(const AmSipReply& reply, + AmSipDialog::Status old_dlg_status) { - if ((seh!=NULL) && seh->onSipReply(reply, old_dlg_status, trans_method)) + if ((seh!=NULL) && seh->onSipReply(reply, old_dlg_status)) return; if (reply.code>=200) diff --git a/core/AmSipRegistration.h b/core/AmSipRegistration.h index 3fde0f0..8dc4389 100644 --- a/core/AmSipRegistration.h +++ b/core/AmSipRegistration.h @@ -116,20 +116,14 @@ class AmSIPRegistration int flags, unsigned int cseq); - void onSendReply(const AmSipRequest& req, - unsigned int code, - const string& reason, - const string& content_type, - const string& body, - string& hdrs, - int flags); + void onSendReply(AmSipReply& req, int flags); // DialogControl if AmSipDialog* getDlg() { return &dlg; } // CredentialHolder UACAuthCred* getCredentials() { return &cred; } - void onSipReply(const AmSipReply& reply, int old_dlg_status, const string& trans_method); + void onSipReply(const AmSipReply& reply, AmSipDialog::Status old_dlg_status); void onSipRequest(const AmSipRequest& req) {} void onInvite2xx(const AmSipReply&) {} void onNoAck(unsigned int) {} @@ -138,6 +132,9 @@ class AmSIPRegistration void onPrack2xx(const AmSipReply &){} void onFailure(AmSipDialogEventHandler::FailureCause cause, const AmSipRequest*, const AmSipReply*){} + bool getSdpOffer(AmSdp&) {return false;} + bool getSdpAnswer(const AmSdp&, AmSdp&) {return false;} + int onSdpCompleted(const AmSdp&, const AmSdp&) {return -1;} /** is this registration registered? */ bool active; _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
