[svn-commits] seanbright: branch group/pimp_my_sip r388923 - in /team/group/pimp_my_sip: in...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu May 16 05:55:29 CDT 2013
Author: seanbright
Date: Thu May 16 05:55:25 2013
New Revision: 388923
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388923
Log:
Add custom INFO support for one touch recording.
Certain devices support enabling one touch recording using a SIP INFO request.
This will pass a "Record" header on the request.
(closes issue ASTERISK-21501)
Review: https://reviewboard.asterisk.org/r/2541/
Added:
team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c (with props)
Modified:
team/group/pimp_my_sip/include/asterisk/res_sip.h
team/group/pimp_my_sip/res/res_sip/sip_configuration.c
Modified: team/group/pimp_my_sip/include/asterisk/res_sip.h
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/include/asterisk/res_sip.h?view=diff&rev=388923&r1=388922&r2=388923
==============================================================================
--- team/group/pimp_my_sip/include/asterisk/res_sip.h (original)
+++ team/group/pimp_my_sip/include/asterisk/res_sip.h Thu May 16 05:55:25 2013
@@ -353,6 +353,8 @@
enum ast_sip_session_media_encryption media_encryption;
/*! Do we use AVPF exclusively for this endpoint? */
unsigned int use_avpf;
+ /*! Is one-touch recording permitted? */
+ unsigned int one_touch_recording;
};
/*!
Modified: team/group/pimp_my_sip/res/res_sip/sip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip/sip_configuration.c?view=diff&rev=388923&r1=388922&r2=388923
==============================================================================
--- team/group/pimp_my_sip/res/res_sip/sip_configuration.c (original)
+++ team/group/pimp_my_sip/res/res_sip/sip_configuration.c Thu May 16 05:55:25 2013
@@ -371,6 +371,7 @@
ast_sorcery_object_field_register(sip_sorcery, "endpoint", "aggregate_mwi", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, aggregate_mwi));
ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "media_encryption", "no", media_encryption_handler, NULL, 0, 0);
ast_sorcery_object_field_register(sip_sorcery, "endpoint", "use_avpf", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, use_avpf));
+ ast_sorcery_object_field_register(sip_sorcery, "endpoint", "one_touch_recording", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, one_touch_recording));
if (ast_sip_initialize_sorcery_transport(sip_sorcery)) {
ast_log(LOG_ERROR, "Failed to register SIP transport support with sorcery\n");
Added: team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c?view=auto&rev=388923
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c (added)
+++ team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c Thu May 16 05:55:25 2013
@@ -1,0 +1,123 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2013, malleable, llc.
+ *
+ * Sean Bright <sean at malleable.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
+ <depend>res_sip_session</depend>
+ <support_level>core</support_level>
+***/
+
+#include "asterisk.h"
+
+#include <pjsip.h>
+#include <pjsip_ua.h>
+
+#include "asterisk/features.h"
+#include "asterisk/res_sip.h"
+#include "asterisk/res_sip_session.h"
+#include "asterisk/module.h"
+
+static void send_response(struct ast_sip_session *session, int code, struct pjsip_rx_data *rdata)
+{
+ pjsip_tx_data *tdata;
+
+ if (pjsip_dlg_create_response(session->inv_session->dlg, rdata, code, NULL, &tdata) == PJ_SUCCESS) {
+ struct pjsip_transaction *tsx = pjsip_rdata_get_tsx(rdata);
+
+ pjsip_dlg_send_response(session->inv_session->dlg, tsx, tdata);
+ }
+}
+
+static int handle_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
+{
+ static const pj_str_t rec_str = { "Record", 6 };
+ struct ast_call_feature *feature;
+ pjsip_generic_string_hdr *record;
+ char *feature_code;
+
+ record = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &rec_str, NULL);
+
+ /* If we don't have Record header, we have nothing to do */
+ if (!record || (pj_stricmp2(&record->hvalue, "on") && pj_stricmp2(&record->hvalue, "off"))) {
+ return 0;
+ }
+
+ if (!session->channel) {
+ send_response(session, 481, rdata);
+ return 0;
+ }
+
+ /* Is this endpoint configured with One Touch Recording? */
+ if (!session->endpoint->one_touch_recording) {
+ send_response(session, 403, rdata);
+ return 0;
+ }
+
+ ast_rdlock_call_features();
+
+ if (!(feature = ast_find_call_feature("automixmon"))) {
+ ast_unlock_call_features();
+ send_response(session, 403, rdata);
+ return 0;
+ }
+
+ if (!feature->exten || ast_strlen_zero(feature->exten)) {
+ ast_unlock_call_features();
+ send_response(session, 403, rdata);
+ return 0;
+ }
+
+ for (feature_code = feature->exten; *feature_code; ++feature_code) {
+ struct ast_frame f = { AST_FRAME_DTMF, .subclass.integer = *feature_code, .len = 100 };
+ ast_queue_frame(session->channel, &f);
+ }
+
+ ast_unlock_call_features();
+
+ send_response(session, 200, rdata);
+
+ return 0;
+}
+
+static struct ast_sip_session_supplement info_supplement = {
+ .method = "INFO",
+ .incoming_request = handle_incoming_request,
+};
+
+static int load_module(void)
+{
+ if (ast_sip_session_register_supplement(&info_supplement)) {
+ ast_log(LOG_ERROR, "Unable to register One Touch Recording supplement\n");
+ return AST_MODULE_LOAD_FAILURE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
+static int unload_module(void)
+{
+ ast_sip_session_unregister_supplement(&info_supplement);
+ return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SIP INFO One Touch Recording Support",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_APP_DEPEND,
+ );
Propchange: team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/group/pimp_my_sip/res/res_sip_one_touch_record_info.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the svn-commits
mailing list