<!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][16968] </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=16968">16968</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-03-11 09:52:29 -0600 (Thu, 11 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> <a href="http://jira.freeswitch.org/browse/MODENDP-298">MODENDP-298</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 (16967 => 16968)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-03-11 12:58:25 UTC (rev 16967)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-03-11 15:52:29 UTC (rev 16968)
</span><span class="lines">@@ -840,6 +840,7 @@
</span><span class="cx"> char *host = argv[2];
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> char *event_name = argv[5];
</span><ins>+ char *expires = argv[10];
</ins><span class="cx">
</span><span class="cx"> if (!strcasecmp(event_name, "message-summary")) {
</span><span class="cx"> if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -858,6 +859,7 @@
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_subtype", "probe");
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event_name);
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "expires", expires);
</ins><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1779,6 +1781,17 @@
</span><span class="cx"> from_host = "n/a";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ exp_delta = profile->force_subscription_expires ? profile->force_subscription_expires : (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
+
+ if (exp_delta) {
+ exp_abs = (long) switch_epoch_time_now(NULL) + exp_delta;
+ } else {
+ exp_abs = 0;
+ sub_state = nua_substate_terminated;
+ }
+
+ switch_snprintf(exp_delta_str, sizeof(exp_delta_str), "%ld", exp_delta);
+
</ins><span class="cx"> if (to_user && (strstr(to_user, "ext+") || strstr(to_user, "user+"))) {
</span><span class="cx"> char protocol[80];
</span><span class="cx"> char *p;
</span><span class="lines">@@ -1804,6 +1817,7 @@
</span><span class="cx"> switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host);
</span><span class="cx"> switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "to", "%s@%s", to_user, to_host);
</span><span class="cx"> switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event);
</span><ins>+ switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
</ins><span class="cx"> switch_event_fire(&sevent);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1835,17 +1849,6 @@
</span><span class="cx"> sip->sip_expires->ex_delta = 31536000;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- exp_delta = profile->force_subscription_expires ? profile->force_subscription_expires : (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
-
- if (exp_delta) {
- exp_abs = (long) switch_epoch_time_now(NULL) + exp_delta;
- } else {
- exp_abs = 0;
- sub_state = nua_substate_terminated;
- }
-
- switch_snprintf(exp_delta_str, sizeof(exp_delta_str), "%ld", exp_delta);
-
</del><span class="cx"> if (sofia_test_pflag(profile, PFLAG_MULTIREG)) {
</span><span class="cx"> sql = switch_mprintf("delete from sip_subscriptions where call_id='%q' "
</span><span class="cx"> "or (proto='%q' and sip_user='%q' and sip_host='%q' "
</span><span class="lines">@@ -2007,6 +2010,7 @@
</span><span class="cx"> switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_type", "presence");
</span><span class="cx"> switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_subtype", "probe");
</span><span class="cx"> switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event);
</span><ins>+ switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
</ins><span class="cx"> switch_event_fire(&pevent);
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(event, "line-seize")) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>