From b492f77b6a37ab43ff960239d2d4d4e89cc33931 Mon Sep 17 00:00:00 2001
From: Yun Liu <yun@yun.(none)>
Date: Fri, 10 Oct 2008 16:51:16 -0400
Subject: [PATCH] DTMF: sending INFO message continued.
---
src/sipvoiplink.cpp | 6 ++++-
src/useragent.cpp | 54 ++++++++++++++++++++++++++-------------------
2 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 2dac5b1193..3216949fae 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -198,7 +198,8 @@ SIPVoIPLink::newOutgoingCall(const CallID& id, const std::string& toUrl)
{
SIPCall* call = new SIPCall(id, Call::Outgoing);
if (call) {
- call->setPeerNumber(toUrl);
+ //call->setPeerNumber(toUrl);
+ call->setPeerNumber(getSipTo(toUrl));
_debug("Try to make a call to: %s with call ID: %s\n", toUrl.data(), id.data());
// we have to add the codec before using it in SIPOutgoingInvite...
call->setCodecMap(Manager::instance().getCodecDescriptorMap());
@@ -360,6 +361,9 @@ SIPVoIPLink::refuse (const CallID& id)
bool
SIPVoIPLink::carryingDTMFdigits(const CallID& id, char code UNUSED)
{
+ SIPCall* call = getSIPCall(id);
+ if (call==0) { _debug("Call doesn't exist\n"); return false; }
+
int duration = Manager::instance().getConfigInt(SIGNALISATION, PULSE_LENGTH);
const int body_len = 1000;
char *dtmf_body = new char[body_len];
diff --git a/src/useragent.cpp b/src/useragent.cpp
index 6625be8431..733d834e04 100644
--- a/src/useragent.cpp
+++ b/src/useragent.cpp
@@ -1192,38 +1192,46 @@ bool UserAgent::refuse(SIPCall* call)
bool UserAgent::carryingDTMFdigits(SIPCall* call, char *msgBody)
{
pj_status_t status;
- pjsip_method method;
- pj_str_t methodName;
pjsip_tx_data *tdata;
- pj_str_t from, to, contact, body;
-
- AccountID accId = Manager::instance().getAccountFromCall(call->getCallId());
- SIPAccount *account = dynamic_cast<SIPAccount *>(Manager::instance().getAccount(accId));
-
+ pj_str_t methodName, content;
+ pjsip_method method;
+ pjsip_media_type ctype;
+
pj_strdup2(_pool, &methodName, "INFO");
- std::string fromStr = "sip:" + account->getUserName() + "@" + account->getServer();
- pj_strdup2(_pool, &from, fromStr.data());
- std::string toStr = "sip:" + call->getPeerNumber();
- pj_strdup2(_pool, &to, toStr.data());
- pj_strdup2(_pool, &contact, account->getContact().data());
- pj_strdup2(_pool, &body, msgBody);
pjsip_method_init_np(&method, &methodName);
-
- status = pjsip_endpt_create_request(_endpt, &method,
- &to, &from, &to, &contact, NULL, -1, &body, &tdata);
- if(status != PJ_SUCCESS) {
- _debug("UserAgent: Can not create DTMF message!\n");
+ /* Create request message. */
+ status = pjsip_dlg_create_request( call->getInvSession()->dlg, &method,
+ -1, &tdata);
+ if (status != PJ_SUCCESS) {
+ _debug("UserAgent: Unable to create INFO request -- %d\n", status);
return false;
+ }
+ /* Get MIME type */
+ pj_strdup2(_pool, &ctype.type, "application");
+ pj_strdup2(_pool, &ctype.subtype, "dtmf-relay");
+
+ /* Create "application/dtmf-relay" message body. */
+ pj_strdup2(_pool, &content, msgBody);
+ tdata->msg->body = pjsip_msg_body_create( tdata->pool, &ctype.type,
+ &ctype.subtype, &content);
+ if (tdata->msg->body == NULL) {
+ _debug("UserAgent: Unable to create msg body!\n");
+ pjsip_tx_data_dec_ref(tdata);
+ return false;
}
-
- status = pjsip_endpt_send_request(_endpt, tdata, -1, NULL, NULL);
- if(status != PJ_SUCCESS) {
- _debug("UserAgent: Can not send DTMF message!\n");
+
+ /* Send the request. */
+ status = pjsip_dlg_send_request( call->getInvSession()->dlg, tdata,
+ _mod.id, NULL);
+ if (status != PJ_SUCCESS) {
+ _debug("UserAgent: Unable to send MESSAGE request -- %d\n", status);
return false;
- }
+ }
+
return true;
+
}
bool UserAgent::transfer(SIPCall *call, const std::string& to)
--
GitLab