<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17324] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17324">17324</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-04-16 10:01:00 -0500 (Fri, 16 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>expand last patch to do hold as well and rename the command to uuid_phone_event</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (17323 => 17324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/include/switch_types.h 2010-04-16 15:01:00 UTC (rev 17324)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> SWITCH_MESSAGE_INDICATE_PROXY_MEDIA,
</span><span class="cx"> SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC,
</span><span class="cx"> SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE,
</span><del>- SWITCH_MESSAGE_INDICATE_AUTOANSWER,
</del><ins>+ SWITCH_MESSAGE_INDICATE_PHONE_EVENT,
</ins><span class="cx"> SWITCH_MESSAGE_INVALID
</span><span class="cx"> } switch_core_session_message_types_t;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (17323 => 17324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-16 15:01:00 UTC (rev 17324)
</span><span class="lines">@@ -2319,7 +2319,7 @@
</span><span class="cx"> #define SIMPLIFY_SYNTAX "<uuid>"
</span><span class="cx"> SWITCH_STANDARD_API(uuid_simplify_function)
</span><span class="cx"> {
</span><del>- switch_status_t status = SWITCH_STATUS_SUCCESS;
</del><ins>+ switch_status_t status = SWITCH_STATUS_FALSE;
</ins><span class="cx">
</span><span class="cx"> if (zstr(cmd)) {
</span><span class="cx"> stream->write_function(stream, "-USAGE: %s\n", SIMPLIFY_SYNTAX);
</span><span class="lines">@@ -2347,22 +2347,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-#define AUTOANSWER_SYNTAX "<uuid>"
-SWITCH_STANDARD_API(uuid_autoanswer_function)
</del><ins>+#define PHONE_EVENT_SYNTAX "<uuid>"
+SWITCH_STANDARD_API(uuid_phone_event_function)
</ins><span class="cx"> {
</span><del>- switch_status_t status = SWITCH_STATUS_SUCCESS;
</del><ins>+ switch_status_t status = SWITCH_STATUS_FALSE;
+ char *mycmd = NULL, *argv[2] = { 0 };
+ int argc = 0;
</ins><span class="cx">
</span><del>- if (zstr(cmd)) {
- stream->write_function(stream, "-USAGE: %s\n", AUTOANSWER_SYNTAX);
</del><ins>+ if (!zstr(cmd) && (mycmd = strdup(cmd))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ }
+
+ if (argc < 1) {
+ stream->write_function(stream, "-USAGE: %s\n", PHONE_EVENT_SYNTAX);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_core_session_message_t msg = { 0 };
</span><span class="cx"> switch_core_session_t *lsession = NULL;
</span><span class="cx">
</span><del>- msg.message_id = SWITCH_MESSAGE_INDICATE_AUTOANSWER;
- msg.string_arg = cmd;
</del><ins>+ msg.message_id = SWITCH_MESSAGE_INDICATE_PHONE_EVENT;
+ msg.string_arg = argv[1];
</ins><span class="cx"> msg.from = __FILE__;
</span><span class="cx">
</span><del>- if ((lsession = switch_core_session_locate(cmd))) {
</del><ins>+ if ((lsession = switch_core_session_locate(argv[0]))) {
</ins><span class="cx"> status = switch_core_session_receive_message(lsession, &msg);
</span><span class="cx"> switch_core_session_rwunlock(lsession);
</span><span class="cx"> }
</span><span class="lines">@@ -2374,6 +2380,8 @@
</span><span class="cx"> stream->write_function(stream, "-ERR Operation Failed\n");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_safe_free(mycmd);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4233,7 +4241,6 @@
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "user_data", "find user data", user_data_function, "<user>@<domain> [var|param|attr] <name>");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "user_exists", "find a user", user_exists_function, "<key> <user> <domain>");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_audio", "uuid_audio", session_audio_function, AUDIO_SYNTAX);
</span><del>- SWITCH_ADD_API(commands_api_interface, "uuid_autoanswer", "Force a ringing channel offhook", uuid_autoanswer_function, AUTOANSWER_SYNTAX);
</del><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_break", "Break", break_function, BREAK_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, "");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX);
</span><span class="lines">@@ -4251,6 +4258,7 @@
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_loglevel", "set loglevel on session", uuid_loglevel, UUID_LOGLEVEL_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX);
</span><ins>+ SWITCH_ADD_API(commands_api_interface, "uuid_phone_event", "Send and event to the phone", uuid_phone_event_function, PHONE_EVENT_SYNTAX);
</ins><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_preprocess", "Pre-process Channel", preprocess_function, PREPROCESS_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_record", "session record", session_record_function, SESS_REC_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "uuid_recv_dtmf", "receive dtmf digits", uuid_recv_dtmf_function, UUID_RECV_DTMF_SYNTAX);
</span><span class="lines">@@ -4332,7 +4340,6 @@
</span><span class="cx"> switch_console_set_complete("add uuid_audio ::console::list_uuid start write mute");
</span><span class="cx"> switch_console_set_complete("add uuid_audio ::console::list_uuid start write level");
</span><span class="cx"> switch_console_set_complete("add uuid_audio ::console::list_uuid stop");
</span><del>- switch_console_set_complete("add uuid_autoanswer ::console::list_uuid");
</del><span class="cx"> switch_console_set_complete("add uuid_break ::console::list_uuid all");
</span><span class="cx"> switch_console_set_complete("add uuid_break ::console::list_uuid both");
</span><span class="cx"> switch_console_set_complete("add uuid_bridge ::console::list_uuid ::console::list_uuid");
</span><span class="lines">@@ -4358,6 +4365,8 @@
</span><span class="cx"> switch_console_set_complete("add uuid_loglevel ::console::list_uuid debug");
</span><span class="cx"> switch_console_set_complete("add uuid_media ::console::list_uuid");
</span><span class="cx"> switch_console_set_complete("add uuid_park ::console::list_uuid");
</span><ins>+ switch_console_set_complete("add uuid_phone_event ::console::list_uuid talk");
+ switch_console_set_complete("add uuid_phone_event ::console::list_uuid hold");
</ins><span class="cx"> switch_console_set_complete("add uuid_preprocess ::console::list_uuid");
</span><span class="cx"> switch_console_set_complete("add uuid_record ::console::list_uuid");
</span><span class="cx"> switch_console_set_complete("add uuid_recv_dtmf ::console::list_uuid");
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (17323 => 17324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-16 15:01:00 UTC (rev 17324)
</span><span class="lines">@@ -1496,9 +1496,17 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case SWITCH_MESSAGE_INDICATE_AUTOANSWER:
</del><ins>+ case SWITCH_MESSAGE_INDICATE_PHONE_EVENT:
</ins><span class="cx"> {
</span><del>- nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), NUTAG_SUBSTATE(nua_substate_active), SIPTAG_EVENT_STR("talk"), TAG_END());
</del><ins>+ const char *event = "talk";
+ if (!zstr(msg->string_arg) && strcasecmp(msg->string_arg, event)) {
+ if (!strcasecmp(msg->string_arg, "hold")) {
+ event = "hold";
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Invalid event.\n");
+ }
+ }
+ nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), NUTAG_SUBSTATE(nua_substate_active), SIPTAG_EVENT_STR(event), TAG_END());
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_SIMPLIFY:
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17323 => 17324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-16 15:01:00 UTC (rev 17324)
</span><span class="lines">@@ -1371,6 +1371,7 @@
</span><span class="cx"> NUTAG_ALLOW("INFO"),
</span><span class="cx"> NUTAG_ALLOW("NOTIFY"),
</span><span class="cx"> NUTAG_ALLOW_EVENTS("talk"),
</span><ins>+ NUTAG_ALLOW_EVENTS("hold"),
</ins><span class="cx"> NUTAG_SESSION_TIMER(profile->session_timeout),
</span><span class="cx"> NTATAG_MAX_PROCEEDING(profile->max_proceeding),
</span><span class="cx"> TAG_IF(profile->pres_type, NUTAG_ALLOW("PUBLISH")),
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (17323 => 17324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/switch_core_session.c 2010-04-16 15:01:00 UTC (rev 17324)
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> "PROXY_MEDIA",
</span><span class="cx"> "APPLICATION_EXEC",
</span><span class="cx"> "APPLICATION_EXEC_COMPLETE",
</span><del>- "AUTOANSWER",
</del><ins>+ "PHONE_EVENT",
</ins><span class="cx"> "INVALID"
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>