<!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][17313] </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=17313">17313</a></dd>
<dt>Author</dt> <dd>ncorbic</dd>
<dt>Date</dt> <dd>2010-04-15 18:59:21 -0500 (Thu, 15 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>conflict</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkFreeswitch2008sln">freeswitch/trunk/Freeswitch.2008.sln</a></li>
<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="#freeswitchtrunklibssilksrcSilk_FIX2008vcproj">freeswitch/trunk/libs/silk/src/Silk_FIX.2008.vcproj</a></li>
<li><a href="#freeswitchtrunkscriptssetupgitsh">freeswitch/trunk/scripts/setup-git.sh</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_silkmod_silk2008vcproj">freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.2008.vcproj</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#freeswitchtrunkscriptssetupgitsh">freeswitch/trunk/scripts/setup-git.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkFreeswitch2008sln"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Freeswitch.2008.sln ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-15 22:25:22 UTC (rev 17312)
</del><ins>+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-15 23:59:21 UTC (rev 17313)
</ins><span class="lines">@@ -73,15 +73,14 @@
</span><span class="cx"> #define BOOST_EVENT_CHAN(sigmod, event) ((sigmod)? event->chan:event->chan+1)
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * \brief Strange flag
</del><ins>+ * \brief SANGOMA boost notification flag
</ins><span class="cx"> */
</span><span class="cx"> typedef enum {
</span><del>- SFLAG_FREE_REQ_ID = (1 << 0),
- SFLAG_SENT_FINAL_MSG = (1 << 1),
- SFLAG_SENT_ACK = (1 << 2),
- SFLAG_RECVD_ACK = (1 << 3),
- SFLAG_HANGUP = (1 << 4),
- SFLAG_TERMINATING = (1 << 5)
</del><ins>+ SFLAG_SENT_FINAL_MSG = (1 << 0),
+ SFLAG_SENT_ACK = (1 << 1),
+ SFLAG_RECVD_ACK = (1 << 2),
+ SFLAG_HANGUP = (1 << 3),
+ SFLAG_TERMINATING = (1 << 4)
</ins><span class="cx"> } sflag_t;
</span><span class="cx">
</span><span class="cx"> typedef uint16_t sangoma_boost_request_id_t;
</span><span class="lines">@@ -214,17 +213,20 @@
</span><span class="cx"> static void print_request_ids(void)
</span><span class="cx"> {
</span><span class="cx"> sangoma_boost_request_id_t i = 0;
</span><del>-
</del><ins>+ int cnt=0;
+
</ins><span class="cx"> ftdm_mutex_lock(request_mutex);
</span><span class="cx">
</span><span class="cx"> for (i=1; i<= MAX_REQ_ID; i++){
</span><span class="cx"> if (req_map[i]) {
</span><span class="cx"> ftdm_log(FTDM_LOG_CRIT, "Used Request ID=%i\n",i);
</span><ins>+ cnt++;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ftdm_mutex_unlock(request_mutex);
</span><del>-
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "Total Request IDs=%i\n",cnt);
+
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -615,9 +617,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
- SETUP_GRID[event->span][event->chan] = event->call_setup_id;
-
</del><span class="cx"> if (mcon->sigmod) {
</span><span class="cx"> ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
</span><span class="cx"> } else {
</span><span class="lines">@@ -630,6 +629,12 @@
</span><span class="cx"> if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Failed to open FTDM channel [%s]\n", ftdmchan->last_error);
</span><span class="cx"> } else {
</span><ins>+
+ /* Only bind the setup id to GRID when we are sure that channel is ready
+ otherwise we could overwite the original call */
+ OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
+ SETUP_GRID[event->span][event->chan] = event->call_setup_id;
+
</ins><span class="cx"> ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND);
</span><span class="cx"> ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_INUSE);
</span><span class="cx"> ftdmchan->sflags = SFLAG_RECVD_ACK;
</span><span class="lines">@@ -668,6 +673,7 @@
</span><span class="cx"> OUTBOUND_REQUESTS[event->call_setup_id].status = BST_READY;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> ftdm_assert(!mcon->sigmod, "CALL STOP ACK: Invalid Sigmod Path");
</span><span class="lines">@@ -682,16 +688,16 @@
</span><span class="cx"> if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
</span><span class="cx"> ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
</span><span class="cx"> ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "FTDM_CHAN STATE UP/PROG/PROG_MEDIA -> Changed to HANGUP %d:%d\n", event->span+1,event->chan+1);
- ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP, 0, r);
-
- } else if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
- /* Do nothing because outgoing STOP will generaate a stop ack */
-
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN CALL ACK STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
+ ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
+ } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN CALL ACK STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
+ ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</ins><span class="cx"> } else {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "FTDM_CHAN STATE INVALID %s on IN CALL ACK %d:%d\n", ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
-
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID State %s on IN CALL ACK %d:%d\n",
+ ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
</ins><span class="cx"> }
</span><ins>+ ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
</ins><span class="cx"> ftdmchan=NULL;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -747,7 +753,6 @@
</span><span class="cx">
</span><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</span><span class="cx"> if (r) {
</span><del>- ftdm_set_sflag(ftdmchan, SFLAG_FREE_REQ_ID);
</del><span class="cx"> ftdm_mutex_unlock(ftdmchan->mutex);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -920,10 +925,6 @@
</span><span class="cx"> ftdmchan->caller_data.hangup_cause = event->release_cause;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (r) {
- ftdm_set_sflag(ftdmchan, SFLAG_FREE_REQ_ID);
- }
-
</del><span class="cx"> ftdm_mutex_unlock(ftdmchan->mutex);
</span><span class="cx">
</span><span class="cx"> if (r) {
</span><span class="lines">@@ -994,15 +995,19 @@
</span><span class="cx"> /* NC: If we get CALL START and channel is in active state
</span><span class="cx"> then we are completely out of sync with the other end.
</span><span class="cx"> Treat CALL START as CALL STOP and hangup the current call.
</span><ins>+ The incoming call will also be NACKed.
</ins><span class="cx"> */
</span><span class="cx">
</span><del>- if (ftdmchan->state == FTDM_CHANNEL_STATE_UP) {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE UP -> Changed to TERMINATING %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
+ ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
+ ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
</span><del>- } else if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event)); ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</del><ins>+ } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
+ ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</ins><span class="cx"> } else {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID %s on IN CALL %d:%d\n", ftdm_channel_state2str(ftdmchan->state),BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID %s on IN CALL %d:%d\n", ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
</ins><span class="cx"> }
</span><span class="cx"> ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
</span><span class="cx"> ftdmchan = NULL;
</span><span class="lines">@@ -1358,9 +1363,7 @@
</span><span class="cx"> int call_stopped_ack_sent = 0;
</span><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
</span><span class="cx">
</span><del>- if (ftdm_test_sflag(ftdmchan, SFLAG_FREE_REQ_ID)) {
- release_request_id_span_chan(ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1);
- }
</del><ins>+ release_request_id_span_chan(ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1);
</ins><span class="cx">
</span><span class="cx"> if (!ftdm_test_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG)) {
</span><span class="cx"> ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
</span><span class="lines">@@ -1912,6 +1915,21 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static void ftdm_cli_span_state_cmd(ftdm_span_t *span, char *state)
+{
+ int j;
+ int cnt=0;
+ for(j = 1; j <= span->chan_count; j++) {
+ if (span->channels[j]->state != FTDM_CHANNEL_STATE_DOWN) {
+ ftdm_channel_t *ftdmchan = span->channels[j];
+ ftdm_log(FTDM_LOG_CRIT, "Channel %i s%dc%d State=%s\n",
+ j,ftdmchan->physical_span_id-1,ftdmchan->physical_chan_id-1,ftdm_channel_state2str(ftdmchan->state));
+ cnt++;
+ }
+ }
+ ftdm_log(FTDM_LOG_CRIT, "Total Channel Cnt %i\n",cnt);
+}
+
</ins><span class="cx"> #define FTDM_BOOST_SYNTAX "list sigmods | <sigmod_name> <command>"
</span><span class="cx"> /**
</span><span class="cx"> * \brief API function to kill or debug a sangoma_boost span
</span><span class="lines">@@ -1966,27 +1984,42 @@
</span><span class="cx"> goto done;
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>- } else if (!strcasecmp(argv[0], "restart")) {
</del><ins>+
+ } else if (!strcasecmp(argv[0], "span")) {
</ins><span class="cx"> sangomabc_connection_t *pcon;
</span><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data;
</span><span class="cx"> ftdm_span_t *span;
</span><ins>+
+ if (argc <= 2) {
+ stream->write_function(stream, "-ERR invalid span usage: span <name> <cmd>\n");
+ goto done;
+ }
+
</ins><span class="cx"> int err = ftdm_span_find_by_name(argv[1], &span);
</span><span class="cx"> if (FTDM_SUCCESS != err) {
</span><span class="cx"> stream->write_function(stream, "-ERR failed to find span by name %s\n",argv[1]);
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>-
- sangoma_boost_data = span->signal_data;
- pcon = &sangoma_boost_data->pcon;
</del><span class="cx">
</span><del>- /* No need to set any span flags because
</del><ins>+ if (!strcasecmp(argv[2], "restart")) {
+ sangoma_boost_data = span->signal_data;
+ pcon = &sangoma_boost_data->pcon;
+
+ /* No need to set any span flags because
</ins><span class="cx"> our RESTART will generate a RESTART from the sig daemon */
</span><del>- sangomabc_exec_commandp(pcon,
</del><ins>+ sangomabc_exec_commandp(pcon,
</ins><span class="cx"> 0,
</span><span class="cx"> 0,
</span><span class="cx"> -1,
</span><span class="cx"> SIGBOOST_EVENT_SYSTEM_RESTART,
</span><del>- 0);
</del><ins>+ 0);
+ } else if (!strcasecmp(argv[2], "state")) {
+ if (argc <= 3) {
+ stream->write_function(stream, "-ERR invalid span state: span <name> state <state name>\n");
+ goto done;
+ }
+ ftdm_cli_span_state_cmd(span,argv[3]);
+ }
</ins><span class="cx">
</span><span class="cx"> goto done;
</span><span class="cx">
</span><span class="lines">@@ -1996,7 +2029,7 @@
</span><span class="cx"> if (sigmod_iface) {
</span><span class="cx"> char *p = strchr(data, ' ');
</span><span class="cx"> if (++p) {
</span><del>- char* mydup = ftdm_strdup(p);
</del><ins>+ char* mydup = strdup(p);
</ins><span class="cx"> if(sigmod_iface->exec_api == NULL) {
</span><span class="cx"> stream->write_function(stream, "%s does not support api functions\n", sigmod_iface->name);
</span><span class="cx"> goto done;
</span><span class="lines">@@ -2005,7 +2038,7 @@
</span><span class="cx"> if (sigmod_iface->exec_api(stream, mydup) != FTDM_SUCCESS) {
</span><span class="cx"> stream->write_function(stream, "-ERR:failed to execute command:%s\n", mydup);
</span><span class="cx"> }
</span><del>- ftdm_safe_free(mydup);
</del><ins>+ free(mydup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> goto done;
</span></span></pre></div>
<a id="freeswitchtrunklibssilksrcSilk_FIX2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/silk/src/Silk_FIX.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/scripts/setup-git.sh
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_silkmod_silk2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>