<!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][16787] </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=16787">16787</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:05:26 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Line state
Avoid the use of TFLAG_WAITING_DEST an replace by a line_state corresponding to the softkey events</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h</a></li>
<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_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (16786 => 16787)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:05:16 UTC (rev 16786)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:05:26 UTC (rev 16787)
</span><span class="lines">@@ -238,7 +238,29 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><ins>+uint32_t skinny_line_perform_set_state(listener_t *listener, const char *file, const char *func, int line, uint32_t instance, uint32_t state, uint32_t call_id)
+{
+ switch_assert(listener);
+
+ if(listener->session[instance]) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[instance]), SWITCH_LOG_DEBUG, "Device %s, line %d State Change %d -> %d\n",
+ listener->device_name, instance, listener->line_state[instance], state);
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Device %s, line %d State Change %d -> %d (no session)\n",
+ listener->device_name, instance, listener->line_state[instance], state);
+ }
+ send_select_soft_keys(listener, instance, call_id, state, 0xffff);
+ listener->line_state[instance] = state;
+
+ return listener->line_state[instance];
+}
</ins><span class="cx">
</span><ins>+uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance)
+{
+ switch_assert(listener);
+
+ return listener->line_state[instance];
+}
</ins><span class="cx"> switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force)
</span><span class="cx"> {
</span><span class="cx"> int ms;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h (16786 => 16787)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-02-24 12:05:16 UTC (rev 16786)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-02-24 12:05:26 UTC (rev 16787)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> char device_name[16];
</span><span class="cx"> switch_core_session_t *session[SKINNY_MAX_LINES];
</span><ins>+ uint32_t line_state[SKINNY_MAX_LINES]; /* See enum skinny_key_set */
</ins><span class="cx">
</span><span class="cx"> switch_socket_t *sock;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="lines">@@ -145,9 +146,7 @@
</span><span class="cx"> TFLAG_BREAK = (1 << 8),
</span><span class="cx">
</span><span class="cx"> TFLAG_READING = (1 << 9),
</span><del>- TFLAG_WRITING = (1 << 10),
-
- TFLAG_WAITING_DEST = (1 << 11)
</del><ins>+ TFLAG_WRITING = (1 << 10)
</ins><span class="cx"> } TFLAGS;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -204,6 +203,11 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><ins>+uint32_t skinny_line_perform_set_state(listener_t *listener, const char *file, const char *func, int line, uint32_t instance, uint32_t state, uint32_t call_id);
+#define skinny_line_set_state(listener, instance, state, call_id) skinny_line_perform_set_state(listener, __FILE__, __SWITCH_FUNC__, __LINE__, instance, state, call_id)
+
+uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance);
+
</ins><span class="cx"> switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force);
</span><span class="cx"> void tech_init(private_t *tech_pvt, switch_core_session_t *session);
</span><span class="cx"> switch_status_t channel_on_init(switch_core_session_t *session);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (16786 => 16787)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:16 UTC (rev 16786)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:26 UTC (rev 16787)
</span><span class="lines">@@ -308,8 +308,6 @@
</span><span class="cx">
</span><span class="cx"> tech_init(tech_pvt, session);
</span><span class="cx">
</span><del>- switch_set_flag_locked(tech_pvt, TFLAG_WAITING_DEST);
-
</del><span class="cx"> set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
</span><span class="cx"> set_speaker_mode(listener, SKINNY_SPEAKER_ON);
</span><span class="cx"> set_lamp(listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_ON);
</span><span class="lines">@@ -317,8 +315,7 @@
</span><span class="cx"> SKINNY_OFF_HOOK,
</span><span class="cx"> tech_pvt->line,
</span><span class="cx"> tech_pvt->call_id);
</span><del>- send_select_soft_keys(listener, tech_pvt->line, tech_pvt->call_id,
- SKINNY_KEY_SET_OFF_HOOK, 0xffff);
</del><ins>+ skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_OFF_HOOK, tech_pvt->call_id);
</ins><span class="cx"> display_prompt_status(listener,
</span><span class="cx"> 0,
</span><span class="cx"> "\200\000",
</span><span class="lines">@@ -368,11 +365,7 @@
</span><span class="cx"> SKINNY_CONNECTED,
</span><span class="cx"> tech_pvt->line,
</span><span class="cx"> tech_pvt->call_id);
</span><del>- send_select_soft_keys(listener,
- tech_pvt->line,
- tech_pvt->call_id,
- SKINNY_KEY_SET_CONNECTED,
- 0xffff);
</del><ins>+ skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_CONNECTED, tech_pvt->call_id);
</ins><span class="cx"> display_prompt_status(listener,
</span><span class="cx"> 0,
</span><span class="cx"> "\200\030",
</span><span class="lines">@@ -1474,21 +1467,20 @@
</span><span class="cx">
</span><span class="cx"> /* TODO check call_id and line */
</span><span class="cx">
</span><del>- if(switch_test_flag(tech_pvt, TFLAG_WAITING_DEST)) {
</del><ins>+ if((skinny_line_get_state(listener, tech_pvt->line) == SKINNY_KEY_SET_OFF_HOOK)
+ || (skinny_line_get_state(listener, tech_pvt->line) == SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT)) {
</ins><span class="cx"> char name[128];
</span><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> char *cid_name = "TODO-soft_key_event"; /* TODO */
</span><span class="cx"> char *cid_num = "00000"; /* TODO */
</span><span class="cx"> if(strlen(tech_pvt->dest) == 0) {/* first digit */
</span><span class="cx"> stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
</span><del>- send_select_soft_keys(listener, tech_pvt->line, tech_pvt->call_id,
- SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, 0xffff);
</del><ins>+ skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, tech_pvt->call_id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tech_pvt->dest[strlen(tech_pvt->dest)] = digit;
</span><span class="cx">
</span><span class="cx"> if(strlen(tech_pvt->dest) >= 4) { /* TODO Number is complete */
</span><del>- switch_clear_flag_locked(tech_pvt, TFLAG_WAITING_DEST);
</del><span class="cx"> if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(listener->session[line]),
</span><span class="cx"> NULL, listener->profile->dialplan, cid_name, cid_num, listener->remote_ip, NULL, NULL, NULL, "skinny" /* modname */, listener->profile->context, tech_pvt->dest)) != 0) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[line]), SWITCH_LOG_CRIT, "Error Creating Session caller profile\n");
</span><span class="lines">@@ -1510,11 +1502,7 @@
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- send_select_soft_keys(listener,
- tech_pvt->line,
- tech_pvt->call_id,
- SKINNY_KEY_SET_CONNECTED,
- 0xffff);
</del><ins>+ skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_CONNECTED, tech_pvt->call_id);
</ins><span class="cx"> send_dialed_number(listener, tech_pvt->dest, tech_pvt->line, tech_pvt->call_id);
</span><span class="cx"> skinny_answer(listener->session[line]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>