<!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][16688] </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=16688">16688</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-18 09:52:30 -0600 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add extended info parsing feature to send api commands or queue messages to sessions over info packets</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (16687 => 16688)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-02-18 15:48:36 UTC (rev 16687)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-02-18 15:52:30 UTC (rev 16688)
</span><span class="lines">@@ -207,6 +207,7 @@
</span><span class="cx"> PFLAG_LOG_AUTH_FAIL,
</span><span class="cx"> PFLAG_TRACK_CALLS,
</span><span class="cx"> PFLAG_DESTROY,
</span><ins>+ PFLAG_EXTENDED_INFO_PARSING,
</ins><span class="cx"> /* No new flags below this line */
</span><span class="cx"> PFLAG_MAX
</span><span class="cx"> } PFLAGS;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (16687 => 16688)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-02-18 15:48:36 UTC (rev 16687)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-02-18 15:52:30 UTC (rev 16688)
</span><span class="lines">@@ -2418,6 +2418,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> sofia_clear_pflag(profile, PFLAG_AUTH_CALLS);
</span><span class="cx"> }
</span><ins>+ } else if (!strcasecmp(var, "extended-info-parsing")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_EXTENDED_INFO_PARSING);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_EXTENDED_INFO_PARSING);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "context")) {
</span><span class="cx"> profile->context = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "local-network-acl")) {
</span><span class="lines">@@ -3113,6 +3119,12 @@
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_AUTH_CALLS);
</span><span class="cx"> }
</span><ins>+ } else if (!strcasecmp(var, "extended-info-parsing")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_EXTENDED_INFO_PARSING);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_EXTENDED_INFO_PARSING);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "nonce-ttl")) {
</span><span class="cx"> profile->nonce_ttl = atoi(val);
</span><span class="cx"> } else if (!strcasecmp(var, "accept-blind-reg")) {
</span><span class="lines">@@ -5352,6 +5364,71 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+static switch_status_t create_info_event(sip_t const *sip, nua_handle_t *nh, switch_event_t **revent)
+{
+ sip_alert_info_t *alert_info = sip_alert_info(sip);
+ switch_event_t *event;
+
+ if (!(sip && switch_event_create(&event, SWITCH_EVENT_RECV_INFO) == SWITCH_STATUS_SUCCESS)) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ if (sip && sip->sip_content_type) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Content-Type", sip->sip_content_type->c_type);
+ }
+
+ if (sip->sip_from && sip->sip_from->a_url) {
+ if (sip->sip_from->a_url->url_user) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-User", sip->sip_from->a_url->url_user);
+ }
+
+ if (sip->sip_from->a_url->url_host) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-Host", sip->sip_from->a_url->url_host);
+ }
+ }
+
+ if (sip->sip_to && sip->sip_to->a_url) {
+ if (sip->sip_to->a_url->url_user) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-User", sip->sip_to->a_url->url_user);
+ }
+
+ if (sip->sip_to->a_url->url_host) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-Host", sip->sip_to->a_url->url_host);
+ }
+ }
+
+
+ if (sip->sip_contact && sip->sip_contact->m_url) {
+ if (sip->sip_contact->m_url->url_user) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", sip->sip_contact->m_url->url_user);
+ }
+
+ if (sip->sip_contact->m_url->url_host) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-Host", sip->sip_contact->m_url->url_host);
+ }
+ }
+
+
+ if (sip->sip_call_info) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Call-Info",
+ sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_call_info));
+ }
+
+ if (alert_info) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Alert-Info", sip_header_as_string(nua_handle_home(nh), (void *) alert_info));
+ }
+
+
+ if (sip->sip_payload && sip->sip_payload->pl_data) {
+ switch_event_add_body(event, "%s", sip->sip_payload->pl_data);
+ }
+
+ *revent = event;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[])
</span><span class="cx"> {
</span><span class="cx"> /* placeholder for string searching */
</span><span class="lines">@@ -5361,6 +5438,67 @@
</span><span class="cx"> switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) };
</span><span class="cx"> switch_event_t *event;
</span><span class="cx">
</span><ins>+ if (sofia_test_pflag(profile, PFLAG_EXTENDED_INFO_PARSING)) {
+ if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype &&
+ sip->sip_payload && sip->sip_payload->pl_data) {
+
+ if (!strncasecmp(sip->sip_content_type->c_type, "freeswitch", 10)) {
+
+ if (!strcasecmp(sip->sip_content_type->c_subtype, "session-event")) {
+ if (session) {
+ if (create_info_event(sip, nh, &event) == SWITCH_STATUS_SUCCESS) {
+ if (switch_core_session_queue_event(session, &event) == SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "queued freeswitch event for INFO\n");
+ nua_respond(nh, SIP_200_OK, SIPTAG_CONTENT_TYPE_STR("freeswitch/session-event-response"),
+ SIPTAG_PAYLOAD_STR("+OK MESSAGE QUEUED"), NUTAG_WITH_THIS(nua), TAG_END());
+ } else {
+ switch_event_destroy(&event);
+ nua_respond(nh, SIP_200_OK, SIPTAG_CONTENT_TYPE_STR("freeswitch/session-event-response"),
+ SIPTAG_PAYLOAD_STR("-ERR MESSAGE NOT QUEUED"), NUTAG_WITH_THIS(nua), TAG_END());
+ }
+ }
+
+ } else {
+ nua_respond(nh, SIP_200_OK, SIPTAG_CONTENT_TYPE_STR("freeswitch/session-event-response"),
+ SIPTAG_PAYLOAD_STR("-ERR INVALID SESSION"), NUTAG_WITH_THIS(nua), TAG_END());
+
+ }
+
+ return;
+
+ } else if (!strcasecmp(sip->sip_content_type->c_subtype, "api-request")) {
+ char *cmd = strdup(sip->sip_payload->pl_data);
+ char *arg;
+ switch_stream_handle_t stream = { 0 };
+ switch_status_t status;
+
+ SWITCH_STANDARD_STREAM(stream);
+ switch_assert(stream.data);
+
+ if ((arg = strchr(cmd, ':'))) {
+ *arg++ = '\0';
+ }
+
+ if ((status = switch_api_execute(cmd, arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) {
+ nua_respond(nh, SIP_200_OK, SIPTAG_CONTENT_TYPE_STR("freeswitch/api-response"),
+ SIPTAG_PAYLOAD_STR(stream.data), NUTAG_WITH_THIS(nua), TAG_END());
+ } else {
+ nua_respond(nh, SIP_200_OK, SIPTAG_CONTENT_TYPE_STR("freeswitch/api-response"),
+ SIPTAG_PAYLOAD_STR("-ERR INVALID COMMAND"), NUTAG_WITH_THIS(nua), TAG_END());
+ }
+
+ switch_safe_free(stream.data);
+ switch_safe_free(cmd);
+ return;
+ }
+
+ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
+
+ return;
+ }
+ }
+ }
+
</ins><span class="cx"> if (session) {
</span><span class="cx"> /* Get the channel */
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -5493,60 +5631,7 @@
</span><span class="cx">
</span><span class="cx"> end:
</span><span class="cx">
</span><del>-
- if (sip && switch_event_create(&event, SWITCH_EVENT_RECV_INFO) == SWITCH_STATUS_SUCCESS) {
- sip_alert_info_t *alert_info = sip_alert_info(sip);
-
- if (sip && sip->sip_content_type) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Content-Type", sip->sip_content_type->c_type);
- }
-
- if (sip->sip_from && sip->sip_from->a_url) {
- if (sip->sip_from->a_url->url_user) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-User", sip->sip_from->a_url->url_user);
- }
-
- if (sip->sip_from->a_url->url_host) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-Host", sip->sip_from->a_url->url_host);
- }
- }
-
- if (sip->sip_to && sip->sip_to->a_url) {
- if (sip->sip_to->a_url->url_user) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-User", sip->sip_to->a_url->url_user);
- }
-
- if (sip->sip_to->a_url->url_host) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-Host", sip->sip_to->a_url->url_host);
- }
- }
-
-
- if (sip->sip_contact && sip->sip_contact->m_url) {
- if (sip->sip_contact->m_url->url_user) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", sip->sip_contact->m_url->url_user);
- }
-
- if (sip->sip_contact->m_url->url_host) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-Host", sip->sip_contact->m_url->url_host);
- }
- }
-
-
- if (sip->sip_call_info) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Call-Info",
- sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_call_info));
- }
-
- if (alert_info) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Alert-Info", sip_header_as_string(nua_handle_home(nh), (void *) alert_info));
- }
-
-
- if (sip->sip_payload && sip->sip_payload->pl_data) {
- switch_event_add_body(event, "%s", sip->sip_payload->pl_data);
- }
-
</del><ins>+ if (create_info_event(sip, nh, &event) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "dispatched freeswitch event for INFO\n");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>