<!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][16791] </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=16791">16791</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:06:06 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: redial
- Allow redial from softKey or stimulus
- Add redial, newcall to on_hook softkeys
- Add endcall to ringing and connected softkeys</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h</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 (16790 => 16791)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:56 UTC (rev 16790)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:06:06 UTC (rev 16791)
</span><span class="lines">@@ -99,21 +99,21 @@
</span><span class="cx"> { "\200\001", SOFTKEY_REDIAL },
</span><span class="cx"> { "\200\002", SOFTKEY_NEWCALL },
</span><span class="cx"> { "\200\003", SOFTKEY_HOLD },
</span><del>- { "\200\004", SOFTKEY_TRNSFER },
</del><ins>+ { "\200\004", SOFTKEY_TRANSFER },
</ins><span class="cx"> { "\200\005", SOFTKEY_CFWDALL },
</span><span class="cx"> { "\200\006", SOFTKEY_CFWDBUSY },
</span><span class="cx"> { "\200\007", SOFTKEY_CFWDNOANSWER },
</span><del>- { "\200\010", SOFTKEY_BKSPC },
</del><ins>+ { "\200\010", SOFTKEY_BACKSPACE },
</ins><span class="cx"> { "\200\011", SOFTKEY_ENDCALL },
</span><span class="cx"> { "\200\012", SOFTKEY_RESUME },
</span><span class="cx"> { "\200\013", SOFTKEY_ANSWER },
</span><span class="cx"> { "\200\014", SOFTKEY_INFO },
</span><del>- { "\200\015", SOFTKEY_CONFRN },
</del><ins>+ { "\200\015", SOFTKEY_CONFRM },
</ins><span class="cx"> { "\200\016", SOFTKEY_PARK },
</span><span class="cx"> { "\200\017", SOFTKEY_JOIN },
</span><del>- { "\200\020", SOFTKEY_MEETME },
- { "\200\021", SOFTKEY_PICKUP },
- { "\200\022", SOFTKEY_GPICKUP },
</del><ins>+ { "\200\020", SOFTKEY_MEETMECONFRM },
+ { "\200\021", SOFTKEY_CALLPICKUP },
+ { "\200\022", SOFTKEY_GRPCALLPICKUP },
</ins><span class="cx"> { "\200\077", SOFTKEY_DND },
</span><span class="cx"> { "\200\120", SOFTKEY_IDIVERT },
</span><span class="cx"> };
</span><span class="lines">@@ -1421,6 +1421,10 @@
</span><span class="cx"> message->data.soft_key_set.total_soft_key_set_count = 11;
</span><span class="cx">
</span><span class="cx"> /* TODO fill the set */
</span><ins>+ message->data.soft_key_set.soft_key_set[SKINNY_KEY_SET_ON_HOOK].soft_key_template_index[0] = SOFTKEY_REDIAL;
+ message->data.soft_key_set.soft_key_set[SKINNY_KEY_SET_ON_HOOK].soft_key_template_index[1] = SOFTKEY_NEWCALL;
+ message->data.soft_key_set.soft_key_set[SKINNY_KEY_SET_CONNECTED].soft_key_template_index[0] = SOFTKEY_ENDCALL;
+ message->data.soft_key_set.soft_key_set[SKINNY_KEY_SET_RING_IN].soft_key_template_index[0] = SOFTKEY_ENDCALL;
</ins><span class="cx">
</span><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="lines">@@ -1521,7 +1525,9 @@
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> uint32_t line;
</span><ins>+ private_t *tech_pvt = NULL;
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> switch_assert(listener->profile);
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="cx">
</span><span class="lines">@@ -1537,11 +1543,20 @@
</span><span class="cx">
</span><span class="cx"> if(!listener->session[line]) { /*the line is not busy */
</span><span class="cx"> switch(request->data.soft_key_event.event) {
</span><ins>+ case SOFTKEY_REDIAL:
+ skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
+
+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ assert(tech_pvt != NULL);
+
+ strcpy(tech_pvt->dest, "redial");
+ skinny_process_dest(listener, line);
+ break;
</ins><span class="cx"> case SOFTKEY_NEWCALL:
</span><span class="cx"> skinny_create_session(listener, line, SKINNY_KEY_SET_OFF_HOOK);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</ins><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><span class="lines">@@ -1554,7 +1569,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</ins><span class="cx"> "Unknown SoftKeyEvent type while busy: %d.\n", request->data.soft_key_event.event);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1601,6 +1616,15 @@
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.stimulus));
</span><span class="cx">
</span><span class="cx"> switch(request->data.stimulus.instance_type) {
</span><ins>+ case SKINNY_BUTTON_LAST_NUMBER_REDIAL:
+ skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
+
+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ assert(tech_pvt != NULL);
+
+ strcpy(tech_pvt->dest, "redial");
+ skinny_process_dest(listener, line);
+ break;
</ins><span class="cx"> case SKINNY_BUTTON_VOICEMAIL:
</span><span class="cx"> skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h (16790 => 16791)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-24 12:05:56 UTC (rev 16790)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-24 12:06:06 UTC (rev 16791)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> /* SetLampMessage */
</span><span class="cx"> #define SET_LAMP_MESSAGE 0x0086
</span><span class="cx"> struct set_lamp_message {
</span><del>- uint32_t stimulus;
</del><ins>+ uint32_t stimulus; /* See enum skinny_button_definition */
</ins><span class="cx"> uint32_t stimulus_instance;
</span><span class="cx"> uint32_t mode; /* See enum skinny_lamp_mode */
</span><span class="cx"> };
</span><span class="lines">@@ -361,6 +361,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum skinny_button_definition {
</span><ins>+ SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
</ins><span class="cx"> SKINNY_BUTTON_SPEED_DIAL = 0x02,
</span><span class="cx"> SKINNY_BUTTON_LINE = 0x09,
</span><span class="cx"> SKINNY_BUTTON_VOICEMAIL = 0x0F,
</span><span class="lines">@@ -423,32 +424,33 @@
</span><span class="cx"> struct soft_key_template_definition soft_key[32];
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define SOFTKEY_NONE 0x00
-#define SOFTKEY_REDIAL 0x01
-#define SOFTKEY_NEWCALL 0x02
-#define SOFTKEY_HOLD 0x03
-#define SOFTKEY_TRNSFER 0x04
-#define SOFTKEY_CFWDALL 0x05
-#define SOFTKEY_CFWDBUSY 0x06
-#define SOFTKEY_CFWDNOANSWER 0x07
-#define SOFTKEY_BKSPC 0x08
-#define SOFTKEY_ENDCALL 0x09
-#define SOFTKEY_RESUME 0x0A
-#define SOFTKEY_ANSWER 0x0B
-#define SOFTKEY_INFO 0x0C
-#define SOFTKEY_CONFRN 0x0D
-#define SOFTKEY_PARK 0x0E
-#define SOFTKEY_JOIN 0x0F
-#define SOFTKEY_MEETME 0x10
-#define SOFTKEY_PICKUP 0x11
-#define SOFTKEY_GPICKUP 0x12
-#define SOFTKEY_DND 0x13
-#define SOFTKEY_IDIVERT 0x14
</del><ins>+enum skinny_soft_key_event {
+ SOFTKEY_REDIAL = 0x01,
+ SOFTKEY_NEWCALL = 0x02,
+ SOFTKEY_HOLD = 0x03,
+ SOFTKEY_TRANSFER = 0x04,
+ SOFTKEY_CFWDALL = 0x05,
+ SOFTKEY_CFWDBUSY = 0x06,
+ SOFTKEY_CFWDNOANSWER = 0x07,
+ SOFTKEY_BACKSPACE = 0x08,
+ SOFTKEY_ENDCALL = 0x09,
+ SOFTKEY_RESUME = 0x0A,
+ SOFTKEY_ANSWER = 0x0B,
+ SOFTKEY_INFO = 0x0C,
+ SOFTKEY_CONFRM = 0x0D,
+ SOFTKEY_PARK = 0x0E,
+ SOFTKEY_JOIN = 0x0F,
+ SOFTKEY_MEETMECONFRM = 0x10,
+ SOFTKEY_CALLPICKUP = 0x11,
+ SOFTKEY_GRPCALLPICKUP = 0x12,
+ SOFTKEY_DND = 0x13,
+ SOFTKEY_IDIVERT = 0x14,
+};
</ins><span class="cx">
</span><span class="cx"> /* SoftKeySetResMessage */
</span><span class="cx"> #define SOFT_KEY_SET_RES_MESSAGE 0x0109
</span><span class="cx"> struct soft_key_set_definition {
</span><del>- uint8_t soft_key_template_index[16];
</del><ins>+ uint8_t soft_key_template_index[16]; /* See enum skinny_soft_key_event */
</ins><span class="cx"> uint16_t soft_key_info_index[16];
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>