<!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][15233] </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=15233">15233</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-26 14:57:28 -0500 (Mon, 26 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>pull out some unused code</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 (15232 => 15233)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-26 19:05:22 UTC (rev 15232)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-26 19:57:28 UTC (rev 15233)
</span><span class="lines">@@ -149,8 +149,7 @@
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> MFLAG_REFER = (1 << 0),
</span><del>- MFLAG_REGISTER = (1 << 1),
- MFLAG_UPDATE = (1 << 2)
</del><ins>+ MFLAG_REGISTER = (1 << 1)
</ins><span class="cx"> } MFLAGS;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15232 => 15233)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-26 19:05:22 UTC (rev 15232)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-26 19:57:28 UTC (rev 15233)
</span><span class="lines">@@ -503,19 +503,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static void sofia_handle_sip_i_update(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[])
-{
- if (!(profile->mflags & MFLAG_UPDATE)) {
- nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END());
- return;
- }
-
- sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
- nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
-}
-
-
-
</del><span class="cx"> void sofia_event_callback(nua_event_t event,
</span><span class="cx"> int status,
</span><span class="cx"> char const *phrase,
</span><span class="lines">@@ -684,7 +671,6 @@
</span><span class="cx"> sofia_handle_sip_i_info(nua, profile, nh, session, sip, tags);
</span><span class="cx"> break;
</span><span class="cx"> case nua_i_update:
</span><del>- if (session) sofia_handle_sip_i_update(nua, profile, nh, session, sip, tags);
</del><span class="cx"> break;
</span><span class="cx"> case nua_r_update:
</span><span class="cx"> if (session && tech_pvt && locked) {
</span><span class="lines">@@ -1096,7 +1082,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created agent for %s\n", profile->name);
</span><span class="cx">
</span><span class="cx"> nua_set_params(profile->nua,
</span><del>- SIPTAG_ALLOW_STR("INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO"),
</del><ins>+ SIPTAG_ALLOW_STR("INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, UPDATE, INFO"),
</ins><span class="cx"> NUTAG_APPL_METHOD("OPTIONS"),
</span><span class="cx"> NUTAG_APPL_METHOD("REFER"),
</span><span class="cx"> NUTAG_APPL_METHOD("REGISTER"),
</span><span class="lines">@@ -1111,7 +1097,6 @@
</span><span class="cx"> NUTAG_ENABLEMESSENGER(1),
</span><span class="cx"> TAG_IF((profile->mflags & MFLAG_REGISTER), NUTAG_ALLOW("REGISTER")),
</span><span class="cx"> TAG_IF((profile->mflags & MFLAG_REFER), NUTAG_ALLOW("REFER")),
</span><del>- //TAG_IF((profile->mflags & MFLAG_UPDATE), NUTAG_ALLOW("UPDATE")),
</del><span class="cx"> TAG_IF(!sofia_test_pflag(profile, PFLAG_DISABLE_100REL), NUTAG_ALLOW("PRACK")),
</span><span class="cx"> NUTAG_ALLOW("INFO"),
</span><span class="cx"> NUTAG_ALLOW("NOTIFY"),
</span><span class="lines">@@ -1147,7 +1132,6 @@
</span><span class="cx"> NUTAG_AUTOALERT(0),
</span><span class="cx"> TAG_IF((profile->mflags & MFLAG_REGISTER), NUTAG_ALLOW("REGISTER")),
</span><span class="cx"> TAG_IF((profile->mflags & MFLAG_REFER), NUTAG_ALLOW("REFER")),
</span><del>- //TAG_IF((profile->mflags & MFLAG_UPDATE), NUTAG_ALLOW("UPDATE")),
</del><span class="cx"> NUTAG_ALLOW("INFO"),
</span><span class="cx"> TAG_IF(profile->pres_type, NUTAG_ALLOW("PUBLISH")),
</span><span class="cx"> TAG_IF(profile->pres_type, NUTAG_ENABLEMESSAGE(1)),
</span><span class="lines">@@ -2384,7 +2368,7 @@
</span><span class="cx"> switch_mutex_init(&profile->flag_mutex, SWITCH_MUTEX_NESTED, profile->pool);
</span><span class="cx"> profile->dtmf_duration = 100;
</span><span class="cx"> profile->tls_version = 0;
</span><del>- profile->mflags = MFLAG_REFER | MFLAG_REGISTER | MFLAG_UPDATE;
</del><ins>+ profile->mflags = MFLAG_REFER | MFLAG_REGISTER;
</ins><span class="cx"> profile->rport_level = 1;
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_STUN_ENABLED);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_DISABLE_100REL);
</span><span class="lines">@@ -2628,8 +2612,6 @@
</span><span class="cx"> profile->mflags &= ~MFLAG_REFER;
</span><span class="cx"> } else if (!strcasecmp(var, "disable-register") && switch_true(val)) {
</span><span class="cx"> profile->mflags &= ~MFLAG_REGISTER;
</span><del>- } else if (!strcasecmp(var, "disable-update") && switch_true(val)) {
- profile->mflags &= ~MFLAG_UPDATE;
</del><span class="cx"> } else if (!strcasecmp(var, "media-option")) {
</span><span class="cx"> if (!strcasecmp(val, "resume-media-on-hold")) {
</span><span class="cx"> profile->media_options |= MEDIA_OPT_MEDIA_ON_HOLD;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>