<!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][16792] </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=16792">16792</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:06:16 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: avoid some wired scenarii
- Close all sessions without B-leg
- Hold sessions with B-leg
- Currently hold is same as hang up
- Try to guess the best line to choose (use an existing one)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (16791 => 16792)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:06:06 UTC (rev 16791)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:06:16 UTC (rev 16792)
</span><span class="lines">@@ -602,6 +602,31 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+switch_status_t skinny_hold_line(listener_t *listener, uint32_t line)
+{
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ channel = switch_core_session_get_channel(listener->session[line]);
+ assert(channel != NULL);
+
+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ assert(tech_pvt != NULL);
+
+ /* TODO */
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Hold is not implemented yet. Hanging up the line.\n");
+
+ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t skinny_unhold_line(listener_t *listener, uint32_t line)
+{
+ /* TODO */
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* SKINNY BUTTONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -1540,7 +1565,28 @@
</span><span class="cx"> } else {
</span><span class="cx"> line = 1;
</span><span class="cx"> }
</span><ins>+ /* Close/Hold busy lines */
+ for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
+ if(listener->session[i]) {
+ channel = switch_core_session_get_channel(listener->session[i]);
+ assert(channel != NULL);
+ if((skinny_line_get_state(listener, i) == SKINNY_KEY_SET_ON_HOOK)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_OFF_HOOK)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_RING_OUT)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES)) {
</ins><span class="cx">
</span><ins>+ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+ channel = NULL;
+ } else if((skinny_line_get_state(listener, i) == SKINNY_KEY_SET_RING_IN)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_CONNECTED)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER)
+ || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE)) {
+ skinny_hold_line(listener, i);
+ } /* remaining: SKINNY_KEY_SET_ON_HOLD */
+ }
+ }
+
</ins><span class="cx"> if(!listener->session[line]) { /*the line is not busy */
</span><span class="cx"> switch(request->data.soft_key_event.event) {
</span><span class="cx"> case SOFTKEY_REDIAL:
</span><span class="lines">@@ -1560,6 +1606,9 @@
</span><span class="cx"> "Unknown SoftKeyEvent type while not busy: %d.\n", request->data.soft_key_event.event);
</span><span class="cx"> }
</span><span class="cx"> } else { /* the line is busy */
</span><ins>+ if(skinny_line_get_state(listener, line) == SKINNY_KEY_SET_ON_HOLD) {
+ skinny_unhold_line(listener, line);
+ }
</ins><span class="cx"> switch(request->data.soft_key_event.event) {
</span><span class="cx"> case SOFTKEY_ENDCALL:
</span><span class="cx"> channel = switch_core_session_get_channel(listener->session[line]);
</span><span class="lines">@@ -1605,7 +1654,7 @@
</span><span class="cx"> {
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> struct speed_dial_stat_res_message *button = NULL;
</span><del>- uint32_t line = 1;
</del><ins>+ uint32_t line = 0;
</ins><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><span class="cx"> switch_assert(listener->profile);
</span><span class="lines">@@ -1615,6 +1664,20 @@
</span><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.stimulus));
</span><span class="cx">
</span><ins>+ if(request->data.stimulus.instance_type == SKINNY_BUTTON_LINE) {/* Choose the specified line */
+ line = request->data.stimulus.instance;
+ }
+ if(line == 0) {/* If none, find the first busy line */
+ for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
+ if(listener->session[i]) {
+ line = i;
+ break;
+ }
+ }
+ }
+ if(line == 0) {/* If none, choose the first line */
+ line = 1;
+ }
</ins><span class="cx"> switch(request->data.stimulus.instance_type) {
</span><span class="cx"> case SKINNY_BUTTON_LAST_NUMBER_REDIAL:
</span><span class="cx"> skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
</span><span class="lines">@@ -1751,10 +1814,9 @@
</span><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.keypad_button));
</span><span class="cx">
</span><del>- if(request->data.keypad_button.line_instance != 0) {
- line = request->data.keypad_button.line_instance;
- } else {
- /* Find first active line */
</del><ins>+ /* Choose the specified line */
+ line = request->data.keypad_button.line_instance;
+ if(line == 0) {/* If none, find the first busy line */
</ins><span class="cx"> for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
</span><span class="cx"> if(listener->session[i]) {
</span><span class="cx"> line = i;
</span><span class="lines">@@ -1762,6 +1824,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if(line == 0) {/* If none, choose the first line */
+ line = 1;
+ }
</ins><span class="cx"> if(listener->session[line]) {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>