<!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][17508] </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=17508">17508</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-05-10 11:09:46 -0500 (Mon, 10 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: use SIGBOOST_EVENT_CALL_PROGRESS</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostsangoma_boost_clientc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17507 => 17508)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-05-10 15:40:15 UTC (rev 17507)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-05-10 16:09:46 UTC (rev 17508)
</span><span class="lines">@@ -1400,8 +1400,14 @@
</span><span class="cx"> BOOST_CHAN(ftdmchan),
</span><span class="cx"> 0,
</span><span class="cx"> SIGBOOST_EVENT_CALL_START_ACK,
</span><del>- 0, SIGBOOST_PROGRESS_MEDIA);
</del><ins>+ 0, 0);
</ins><span class="cx"> }
</span><ins>+ sangomabc_exec_command(mcon,
+ BOOST_SPAN(ftdmchan),
+ BOOST_CHAN(ftdmchan),
+ 0,
+ SIGBOOST_EVENT_CALL_PROGRESS,
+ 0, SIGBOOST_PROGRESS_MEDIA);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -1420,7 +1426,7 @@
</span><span class="cx"> BOOST_CHAN(ftdmchan),
</span><span class="cx"> 0,
</span><span class="cx"> SIGBOOST_EVENT_CALL_START_ACK,
</span><del>- 0, SIGBOOST_PROGRESS_RING);
</del><ins>+ 0, 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostsangoma_boost_clientc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c (17507 => 17508)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c 2010-05-10 15:40:15 UTC (rev 17507)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c 2010-05-10 16:09:46 UTC (rev 17508)
</span><span class="lines">@@ -223,12 +223,20 @@
</span><span class="cx">
</span><span class="cx"> int sangomabc_exec_command(sangomabc_connection_t *mcon, int span, int chan, int id, int cmd, int cause, int flags)
</span><span class="cx"> {
</span><del>- sangomabc_short_event_t oevent;
- int retry = 5;
</del><ins>+ sangomabc_event_t *oevent;
+ sangomabc_short_event_t sevent;
+ sangomabc_event_t fevent;
+ int retry = 5;
</ins><span class="cx">
</span><del>- sangomabc_event_init(&oevent, cmd, chan, span);
- oevent.release_cause = (uint8_t)cause;
- oevent.flags = flags;
</del><ins>+ if (boost_full_event(cmd)) {
+ sangomabc_event_init((void *)&fevent, cmd, chan, span);
+ oevent = &fevent;
+ } else {
+ sangomabc_event_init(&sevent, cmd, chan, span);
+ sevent.release_cause = (uint8_t)cause;
+ oevent = (sangomabc_event_t *)&sevent;
+ }
+ oevent->flags = flags;
</ins><span class="cx">
</span><span class="cx"> if (cmd == SIGBOOST_EVENT_SYSTEM_RESTART || cmd == SIGBOOST_EVENT_SYSTEM_RESTART_ACK) {
</span><span class="cx"> mcon->rxseq_reset = 1;
</span><span class="lines">@@ -237,21 +245,21 @@
</span><span class="cx"> mcon->txwindow = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (id >= 0) {
- oevent.call_setup_id = (uint16_t)id;
- }
</del><ins>+ if (id >= 0) {
+ oevent->call_setup_id = (uint16_t)id;
+ }
</ins><span class="cx">
</span><del>- while (sangomabc_connection_write(mcon, (sangomabc_event_t*)&oevent) <= 0) {
- if (--retry <= 0) {
- ftdm_log(FTDM_LOG_CRIT, "Failed to tx on boost socket: %s\n", strerror(errno));
- return -1;
- } else {
- ftdm_log(FTDM_LOG_WARNING, "Failed to tx on boost socket: %s :retry %i\n", strerror(errno), retry);
- ftdm_sleep(1);
- }
- }
</del><ins>+ while (sangomabc_connection_write(mcon, (sangomabc_event_t*)oevent) <= 0) {
+ if (--retry <= 0) {
+ ftdm_log(FTDM_LOG_CRIT, "Failed to tx on boost socket: %s\n", strerror(errno));
+ return -1;
+ } else {
+ ftdm_log(FTDM_LOG_WARNING, "Failed to tx on boost socket: %s :retry %i\n", strerror(errno), retry);
+ ftdm_sleep(1);
+ }
+ }
</ins><span class="cx">
</span><del>- return 0;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -540,7 +548,11 @@
</span><span class="cx">
</span><span class="cx"> void sangomabc_event_init(sangomabc_short_event_t *event, sangomabc_event_id_t event_id, int chan, int span)
</span><span class="cx"> {
</span><del>- memset(event, 0, sizeof(sangomabc_short_event_t));
</del><ins>+ if (boost_full_event(event_id)) {
+ memset(event, 0, sizeof(sangomabc_event_t));
+ } else {
+ memset(event, 0, sizeof(sangomabc_short_event_t));
+ }
</ins><span class="cx"> event->event_id = event_id;
</span><span class="cx"> event->chan = (uint8_t)chan;
</span><span class="cx"> event->span = (uint8_t)span;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>