<!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][16388] </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=16388">16388</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-18 11:38:20 -0600 (Mon, 18 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-262">FSCORE-262</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (16387 => 16388)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-01-18 17:09:05 UTC (rev 16387)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-01-18 17:38:20 UTC (rev 16388)
</span><span class="lines">@@ -1926,17 +1926,6 @@
</span><span class="cx"> ap = ap->ac_next;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* negative in exptime means keep bumping up sub time to avoid a snafu where every device has it's own rules about subscriptions
- that somehow barely resemble the RFC not that I blame them because the RFC MAY be amibiguous and SHOULD be deleted.
- So to avoid the problem we keep resetting the expiration date of the subscription so it never expires.
-
- Eybeam completely ignores this option and most other subscription-state: directives from rfc3265 and still expires.
- Polycom is happy to keep upping the subscription expiry back to the original time on each new notify.
- The rest ... who knows...?
-
- */
-
-
</del><span class="cx"> sql = switch_mprintf("insert into sip_subscriptions "
</span><span class="cx"> "(proto,sip_user,sip_host,sub_to_user,sub_to_host,presence_hosts,event,contact,call_id,full_from,"
</span><span class="cx"> "full_via,expires,user_agent,accept,profile_name,hostname,network_port,network_ip) "
</span><span class="lines">@@ -2017,10 +2006,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
-
-
</del><span class="cx"> if (sub_state == nua_substate_terminated) {
</span><span class="cx"> char *full_call_info = NULL;
</span><span class="cx"> char *p = NULL;
</span><span class="lines">@@ -2062,7 +2047,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- if (!strcasecmp(event, "line-seize")) {
</del><ins>+ if (!strcasecmp(event, "dialog")) {
+ switch_event_t *pevent;
+ if (switch_event_create(&pevent, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
+ switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "login", profile->url);
+ switch_event_add_header(pevent, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, to_host);
+ switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_type", "presence");
+ switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_subtype", "probe");
+ switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event);
+ switch_event_fire(&pevent);
+ }
+ } else if (!strcasecmp(event, "line-seize")) {
</ins><span class="cx"> char *full_call_info = NULL;
</span><span class="cx"> char *p;
</span><span class="cx">
</span><span class="lines">@@ -2247,6 +2243,8 @@
</span><span class="cx"> sip_payload_t *payload = sip->sip_payload;
</span><span class="cx"> char *event_type;
</span><span class="cx"> char etag[9] = "";
</span><ins>+ char expstr[30] = "";
+ long exp = 0, exp_delta = 3600;
</ins><span class="cx">
</span><span class="cx"> /* the following could instead be refactored back to the calling event handler in sofia.c XXX MTK */
</span><span class="cx"> if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) {
</span><span class="lines">@@ -2268,7 +2266,6 @@
</span><span class="cx"> uint8_t in = 0;
</span><span class="cx"> char *sql;
</span><span class="cx"> char *full_agent = NULL;
</span><del>- long exp, exp_delta;
</del><span class="cx">
</span><span class="cx"> if ((xml = switch_xml_parse_str(payload->pl_data, strlen(payload->pl_data)))) {
</span><span class="cx"> char *status_txt = "", *note_txt = "";
</span><span class="lines">@@ -2360,8 +2357,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_snprintf(expstr, sizeof(expstr), "%d", exp_delta);
</ins><span class="cx"> switch_stun_random_string(etag, 8, NULL);
</span><del>- nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), SIPTAG_ETAG_STR(etag), TAG_END());
</del><ins>+ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), SIPTAG_ETAG_STR(etag), SIPTAG_EXPIRES_STR(expstr), TAG_END());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>