[asterisk-commits] qwell: branch qwell/fun_with_transports r385882 - /team/qwell/fun_with_transp...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Apr 16 12:43:06 CDT 2013
Author: qwell
Date: Tue Apr 16 12:43:02 2013
New Revision: 385882
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385882
Log:
Add support for receiving DTMF via INFO.
Added:
team/qwell/fun_with_transports/res/res_sip_dtmf_info.c
- copied, changed from r385880, team/qwell/fun_with_transports/res/res_sip_rfc3326.c
Copied: team/qwell/fun_with_transports/res/res_sip_dtmf_info.c (from r385880, team/qwell/fun_with_transports/res/res_sip_rfc3326.c)
URL: http://svnview.digium.com/svn/asterisk/team/qwell/fun_with_transports/res/res_sip_dtmf_info.c?view=diff&rev=385882&p1=team/qwell/fun_with_transports/res/res_sip_rfc3326.c&r1=385880&p2=team/qwell/fun_with_transports/res/res_sip_dtmf_info.c&r2=385882
==============================================================================
--- team/qwell/fun_with_transports/res/res_sip_rfc3326.c (original)
+++ team/qwell/fun_with_transports/res/res_sip_dtmf_info.c Tue Apr 16 12:43:02 2013
@@ -3,7 +3,7 @@
*
* Copyright (C) 2013, Digium, Inc.
*
- * Joshua Colp <jcolp at digium.com>
+ * Jason Parker <jparker at digium.com>
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
@@ -24,121 +24,96 @@
#include "asterisk.h"
#include <pjsip.h>
-#include <pjsip_ua.h>
#include "asterisk/res_sip.h"
#include "asterisk/res_sip_session.h"
#include "asterisk/module.h"
-#include "asterisk/causes.h"
-static void rfc3326_use_reason_header(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
+static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
{
- const pj_str_t str_reason = { "Reason", 6 };
- pjsip_generic_string_hdr *header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_reason, NULL);
- char buf[20], *cause, *text;
- int code;
+ pjsip_msg_body *body = rdata->msg_info.msg->body;
- if (!header) {
- return;
+ if (!pj_strcmp2(&body->content_type.type, "application") &&
+ !pj_strcmp2(&body->content_type.subtype, "dtmf-relay")) {
+ pjsip_tx_data *tdata;
+
+ char event = '\0';
+ unsigned int duration;
+
+ char buf[body->len];
+ char *cur = buf;
+ char *line;
+
+ body->print_body(body, buf, body->len);
+
+ while ((line = strsep(&cur, "\r\n"))) {
+ char *c;
+
+ if ((c = strchr(line, '='))) {
+ *c++ = '\0';
+
+ c = ast_skip_blanks(c);
+
+ if (!strcasecmp(line, "signal")) {
+ if (c[0] == '!' || c[0] == '*' || c[0] == '#' ||
+ ('0' <= c[0] && c[0] <= '9') ||
+ ('A' <= c[0] && c[0] <= 'D') ||
+ ('a' <= c[0] && c[0] <= 'd')) {
+ event = c[0];
+ } else {
+ ast_log(LOG_ERROR, "Invalid DTMF event signal in INFO message.\n");
+ return -1;
+ }
+ } else if (!strcasecmp(line, "duration")) {
+ sscanf(c, "%30u", &duration);
+ }
+ }
+ }
+
+ if (!duration) {
+ duration = 100;
+ }
+
+ if (event == '!') {
+ struct ast_frame f = { AST_FRAME_CONTROL, { AST_CONTROL_FLASH, } };
+
+ ast_queue_frame(session->channel, &f);
+ } else {
+ struct ast_frame f = { AST_FRAME_DTMF, };
+ f.len = duration;
+ f.subclass.integer = event;
+
+ ast_queue_frame(session->channel, &f);
+ }
+
+ if (pjsip_dlg_create_response(session->inv_session->dlg, rdata, 200, NULL, &tdata) == PJ_SUCCESS) {
+ struct pjsip_transaction *tsx = pjsip_rdata_get_tsx(rdata);
+
+ pjsip_dlg_send_response(session->inv_session->dlg, tsx, tdata);
+ }
}
-
- ast_copy_pj_str(buf, &header->hvalue, sizeof(buf));
- cause = ast_skip_blanks(buf);
-
- if (strncasecmp(cause, "Q.850", 5) || !(cause = strstr(cause, "cause="))) {
- return;
- }
-
- /* If text is present get rid of it */
- if ((text = strstr(cause, ";"))) {
- *text = '\0';
- }
-
- if (sscanf(cause, "cause=%30d", &code) != 1) {
- return;
- }
-
- ast_channel_hangupcause_set(session->channel, code & 0x7f);
-}
-
-static int rfc3326_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
-{
- if ((pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_bye_method) &&
- pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_cancel_method)) ||
- !session->channel) {
- return 0;
- }
-
- rfc3326_use_reason_header(session, rdata);
return 0;
}
-static void rfc3326_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
-{
- struct pjsip_status_line status = rdata->msg_info.msg->line.status;
-
- if ((status.code < 300) || !session->channel) {
- return;
- }
-
- rfc3326_use_reason_header(session, rdata);
-}
-
-static void rfc3326_add_reason_header(struct ast_sip_session *session, struct pjsip_tx_data *tdata)
-{
- char buf[20];
-
- snprintf(buf, sizeof(buf), "Q.850;cause=%i", ast_channel_hangupcause(session->channel) & 0x7f);
- ast_sip_add_header(tdata, "Reason", buf);
-
- if (ast_channel_hangupcause(session->channel) == AST_CAUSE_ANSWERED_ELSEWHERE) {
- ast_sip_add_header(tdata, "Reason", "SIP;cause=200;text=\"Call completed elsewhere\"");
- }
-}
-
-static void rfc3326_outgoing_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata)
-{
- if ((pjsip_method_cmp(&tdata->msg->line.req.method, &pjsip_bye_method) &&
- pjsip_method_cmp(&tdata->msg->line.req.method, &pjsip_cancel_method)) ||
- !session->channel) {
- return;
- }
-
- rfc3326_add_reason_header(session, tdata);
-}
-
-static void rfc3326_outgoing_response(struct ast_sip_session *session, struct pjsip_tx_data *tdata)
-{
- struct pjsip_status_line status = tdata->msg->line.status;
-
- if ((status.code < 300) || !session->channel) {
- return;
- }
-
- rfc3326_add_reason_header(session, tdata);
-}
-
-static struct ast_sip_session_supplement rfc3326_supplement = {
- .incoming_request = rfc3326_incoming_request,
- .incoming_response = rfc3326_incoming_response,
- .outgoing_request = rfc3326_outgoing_request,
- .outgoing_response = rfc3326_outgoing_response,
+static struct ast_sip_session_supplement dtmf_info_supplement = {
+ .method = "INFO",
+ .incoming_request = dtmf_info_incoming_request,
};
static int load_module(void)
{
- ast_sip_session_register_supplement(&rfc3326_supplement);
+ ast_sip_session_register_supplement(&dtmf_info_supplement);
return AST_MODULE_LOAD_SUCCESS;
}
static int unload_module(void)
{
- ast_sip_session_unregister_supplement(&rfc3326_supplement);
+ ast_sip_session_unregister_supplement(&dtmf_info_supplement);
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SIP RFC3326 Support",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SIP DTMF INFO Support",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_APP_DEPEND,
More information about the asterisk-commits
mailing list