<!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][16775] </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=16775">16775</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:01:47 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Milestone 3: Calls management
- House cleaning</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.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 (16774 => 16775)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:01:39 UTC (rev 16774)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:01:47 UTC (rev 16775)
</span><span class="lines">@@ -72,6 +72,9 @@
</span><span class="cx"> switch_mutex_t *sock_mutex;
</span><span class="cx"> struct listener *listeners;
</span><span class="cx"> uint8_t listener_ready;
</span><ins>+ /* sessions */
+ switch_hash_t *session_hash;
+ switch_mutex_t *sessions_mutex;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct skinny_profile skinny_profile_t;
</span><span class="cx">
</span><span class="lines">@@ -154,9 +157,10 @@
</span><span class="cx"> switch_caller_profile_t *caller_profile;
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> switch_mutex_t *flag_mutex;
</span><del>- //switch_thread_cond_t *cond;
- char *dest_profile;
</del><span class="cx"> char *dest;
</span><ins>+ /* identification */
+ skinny_profile_t *profile;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span><span class="lines">@@ -193,11 +197,18 @@
</span><span class="cx"> /* StimulusMessage */
</span><span class="cx"> #define STIMULUS_MESSAGE 0x0005
</span><span class="cx"> struct stimulus_message {
</span><del>- uint32_t type;
</del><ins>+ uint32_t instance_type; /* See enum skinny_button_definition */
</ins><span class="cx"> uint32_t instance;
</span><span class="cx"> uint32_t call_reference;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* OffHookMessage */
+#define OFF_HOOK_MESSAGE 0x0006
+struct off_hook_message {
+ uint32_t line_instance;
+ uint32_t call_id;
+};
+
</ins><span class="cx"> /* OnHookMessage */
</span><span class="cx"> #define ON_HOOK_MESSAGE 0x0007
</span><span class="cx"> struct on_hook_message {
</span><span class="lines">@@ -250,7 +261,7 @@
</span><span class="cx"> #define OPEN_RECEIVE_CHANNEL_ACK_MESSAGE 0x0022
</span><span class="cx"> struct open_receive_channel_ack_message {
</span><span class="cx"> uint32_t status;
</span><del>- uint32_t ip;
</del><ins>+ struct in_addr ip;
</ins><span class="cx"> uint32_t port;
</span><span class="cx"> uint32_t pass_thru_party_id;
</span><span class="cx"> };
</span><span class="lines">@@ -278,7 +289,6 @@
</span><span class="cx"> uint32_t mode;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-
</del><span class="cx"> /* RegisterAvailableLinesMessage */
</span><span class="cx"> #define REGISTER_AVAILABLE_LINES_MESSAGE 0x002D
</span><span class="cx"> struct register_available_lines_message {
</span><span class="lines">@@ -325,20 +335,22 @@
</span><span class="cx"> #define SET_RINGER_MESSAGE 0x0085
</span><span class="cx"> struct set_ringer_message {
</span><span class="cx"> uint32_t ring_type; /* See enum skinny_ring_type */
</span><del>- uint32_t ring_status; /* See enum skinny_ring_status */
- uint32_t unknown2;
</del><ins>+ uint32_t ring_mode; /* See enum skinny_ring_mode */
+ uint32_t unknown; /* ?? */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum skinny_ring_type {
</span><ins>+ SKINNY_RING_OFF = 1,
+ SKINNY_RING_INSIDE = 2,
+ SKINNY_RING_OUTSIDE = 3,
+ SKINNY_RING_FEATURE = 4
+};
+
+enum skinny_ring_mode {
</ins><span class="cx"> SKINNY_RING_FOREVER = 1,
</span><span class="cx"> SKINNY_RING_ONCE = 2,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum skinny_ring_status {
- SKINNY_RING_OFF = 0,
- SKINNY_RING_ON = 1,
-};
-
</del><span class="cx"> /* SetLampMessage */
</span><span class="cx"> #define SET_LAMP_MESSAGE 0x0086
</span><span class="cx"> struct set_lamp_message {
</span><span class="lines">@@ -387,6 +399,7 @@
</span><span class="cx"> struct stop_media_transmission_message {
</span><span class="cx"> uint32_t conference_id;
</span><span class="cx"> uint32_t pass_thru_party_id;
</span><ins>+ uint32_t conference_id2;
</ins><span class="cx"> /* ... */
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -415,6 +428,12 @@
</span><span class="cx"> uint32_t party_pi_restriction_bits;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum skinny_call_type {
+ SKINNY_INBOUND_CALL = 1,
+ SKINNY_OUTBOUND_CALL = 2,
+ SKINNY_FORWARD_CALL = 3,
+};
+
</ins><span class="cx"> /* SpeedDialStatMessage */
</span><span class="cx"> #define SPEED_DIAL_STAT_RES_MESSAGE 0x0091
</span><span class="cx"> struct speed_dial_stat_res_message {
</span><span class="lines">@@ -450,9 +469,16 @@
</span><span class="cx"> #define BUTTON_TEMPLATE_RES_MESSAGE 0x0097
</span><span class="cx"> struct button_definition {
</span><span class="cx"> uint8_t instance_number;
</span><del>- uint8_t button_definition;
</del><ins>+ uint8_t button_definition; /* See enum skinny_button_definition */
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+enum skinny_button_definition {
+ SKINNY_BUTTON_SPEED_DIAL = 0x02,
+ SKINNY_BUTTON_LINE = 0x09,
+ SKINNY_BUTTON_VOICEMAIL = 0x0F,
+ SKINNY_BUTTON_UNDEFINED = 0xFF,
+};
+
</ins><span class="cx"> struct button_template_message {
</span><span class="cx"> uint32_t button_offset;
</span><span class="cx"> uint32_t button_count;
</span><span class="lines">@@ -481,8 +507,18 @@
</span><span class="cx"> uint32_t payload_capacity;
</span><span class="cx"> uint32_t echo_cancel_type;
</span><span class="cx"> uint32_t g723_bitrate;
</span><ins>+ uint32_t conference_id2;
+ uint32_t reserved[10];
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+/* CloseReceiveChannelMessage */
+#define CLOSE_RECEIVE_CHANNEL_MESSAGE 0x0106
+struct close_receive_channel_message {
+ uint32_t conference_id;
+ uint32_t pass_thru_party_id;
+ uint32_t conference_id2;
+};
+
</ins><span class="cx"> /* SoftKeyTemplateResMessage */
</span><span class="cx"> #define SOFT_KEY_TEMPLATE_RES_MESSAGE 0x0108
</span><span class="cx">
</span><span class="lines">@@ -519,7 +555,7 @@
</span><span class="cx"> uint32_t line_instance;
</span><span class="cx"> uint32_t call_id;
</span><span class="cx"> uint32_t soft_key_set; /* See enum skinny_key_set */
</span><del>- uint32_t validKeyMask;
</del><ins>+ uint32_t valid_key_mask;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum skinny_key_set {
</span><span class="lines">@@ -538,11 +574,28 @@
</span><span class="cx"> /* CallStateMessage */
</span><span class="cx"> #define CALL_STATE_MESSAGE 0x0111
</span><span class="cx"> struct call_state_message {
</span><del>- uint32_t call_state;
</del><ins>+ uint32_t call_state; /* See enum skinny_call_state */
</ins><span class="cx"> uint32_t line_instance;
</span><span class="cx"> uint32_t call_id;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum skinny_call_state {
+ SKINNY_OFF_HOOK = 1,
+ SKINNY_ON_HOOK = 2,
+ SKINNY_RING_OUT = 3,
+ SKINNY_RING_IN = 4,
+ SKINNY_CONNECTED = 5,
+ SKINNY_BUSY = 6,
+ SKINNY_CONGESTION = 7,
+ SKINNY_HOLD = 8,
+ SKINNY_CALL_WAITING = 9,
+ SKINNY_CALL_TRANSFER = 10,
+ SKINNY_CALL_PARK = 11,
+ SKINNY_PROCEED = 12,
+ SKINNY_CALL_REMOTE_MULTILINE = 13,
+ SKINNY_INVALID_NUMBER = 14
+};
+
</ins><span class="cx"> /* DisplayPromptStatusMessage */
</span><span class="cx"> #define DISPLAY_PROMPT_STATUS_MESSAGE 0x0112
</span><span class="cx"> struct display_prompt_status_message {
</span><span class="lines">@@ -552,9 +605,9 @@
</span><span class="cx"> uint32_t call_id;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-/* ClearPromptMessage */
-#define CLEAR_PROMPT_MESSAGE 0x0113
-struct clear_prompt_message {
</del><ins>+/* ClearPromptStatusMessage */
+#define CLEAR_PROMPT_STATUS_MESSAGE 0x0113
+struct clear_prompt_status_message {
</ins><span class="cx"> uint32_t line_instance;
</span><span class="cx"> uint32_t call_id;
</span><span class="cx"> };
</span><span class="lines">@@ -582,6 +635,7 @@
</span><span class="cx"> struct register_message reg;
</span><span class="cx"> struct keypad_button_message keypad_button;
</span><span class="cx"> struct stimulus_message stimulus;
</span><ins>+ struct off_hook_message off_hook;
</ins><span class="cx"> struct on_hook_message on_hook;
</span><span class="cx"> struct speed_dial_stat_req_message speed_dial_req;
</span><span class="cx"> struct line_stat_req_message line_req;
</span><span class="lines">@@ -606,12 +660,13 @@
</span><span class="cx"> struct button_template_message button_template;
</span><span class="cx"> struct register_rej_message reg_rej;
</span><span class="cx"> struct open_receive_channel_message open_receive_channel;
</span><ins>+ struct close_receive_channel_message close_receive_channel;
</ins><span class="cx"> struct soft_key_template_res_message soft_key_template;
</span><span class="cx"> struct soft_key_set_res_message soft_key_set;
</span><span class="cx"> struct select_soft_keys_message select_soft_keys;
</span><span class="cx"> struct call_state_message call_state;
</span><span class="cx"> struct display_prompt_status_message display_prompt_status;
</span><del>- struct clear_prompt_message clear_prompt;
</del><ins>+ struct clear_prompt_status_message clear_prompt_status;
</ins><span class="cx"> struct activate_call_plane_message activate_call_plane;
</span><span class="cx"> struct dialed_number_message dialed_number;
</span><span class="cx">
</span><span class="lines">@@ -1208,7 +1263,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tech_pvt->dest = switch_core_session_strdup(nsession, dest);
</span><del>- tech_pvt->dest_profile = switch_core_session_strdup(nsession, profile_name);
</del><span class="cx"> snprintf(name, sizeof(name), "SKINNY/%s/%s", profile->name, dest);
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(nsession);
</span><span class="lines">@@ -2566,6 +2620,8 @@
</span><span class="cx"> skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_devices", NULL, NULL);
</span><span class="cx"> skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_buttons", NULL, NULL);
</span><span class="cx">
</span><ins>+ switch_core_hash_init(&profile->session_hash, module_pool);
+
</ins><span class="cx"> switch_core_hash_insert(globals.profile_hash, profile->name, profile);
</span><span class="cx"> profile = NULL;
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>