<!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][17154] </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=17154">17154</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-04-01 12:22:02 -0500 (Thu, 01 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of /home/git/repositories/freeswitch into HEAD</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>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h</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 (17153 => 17154)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-01 08:30:12 UTC (rev 17153)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-01 17:22:02 UTC (rev 17154)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> " device_name VARCHAR(16),\n"
</span><span class="cx"> " device_instance INTEGER,\n"
</span><span class="cx"> " position INTEGER,\n"
</span><ins>+ " line_instance INTEGER,\n"
</ins><span class="cx"> " label VARCHAR(40),\n"
</span><span class="cx"> " value VARCHAR(24),\n"
</span><span class="cx"> " caller_name VARCHAR(44),\n"
</span><span class="lines">@@ -88,6 +89,16 @@
</span><span class="cx"> " settings VARCHAR(44)\n"
</span><span class="cx"> ");\n";
</span><span class="cx">
</span><ins>+static char active_lines_sql[] =
+ "CREATE TABLE skinny_active_lines (\n"
+ " device_name VARCHAR(16),\n"
+ " device_instance INTEGER,\n"
+ " line_instance INTEGER,\n"
+ " channel_uuid VARCHAR(256),\n"
+ " call_id INTEGER,\n"
+ " call_state INTEGER\n"
+ ");\n";
+
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* PROFILES FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -138,48 +149,106 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct skinny_profile_find_listener_helper {
- skinny_profile_t *profile;
- listener_t *listener;
- uint32_t line;
</del><ins>+switch_status_t skinny_profile_find_listener_by_device_name_and_instance(skinny_profile_t *profile, const char *device_name, uint32_t device_instance, listener_t **listener)
+{
+ switch_mutex_lock(profile->listener_mutex);
+ for (listener_t *l = profile->listeners; l; l = l->next) {
+ if (!strcmp(l->device_name, device_name) && (l->device_instance == device_instance)) {
+ *listener = l;
+ }
+ }
+ switch_mutex_unlock(profile->listener_mutex);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+struct skinny_profile_find_session_uuid_helper {
+ skinny_profile_t *profile;
+ char *channel_uuid;
+ uint32_t line_instance;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-static int skinny_profile_find_listener_callback(void *pArg, int argc, char **argv, char **columnNames)
</del><ins>+int skinny_profile_find_session_uuid_callback(void *pArg, int argc, char **argv, char **columnNames)
</ins><span class="cx"> {
</span><del>- struct skinny_profile_find_listener_helper *helper = pArg;
- skinny_profile_t *profile = helper->profile;
- char *device_name = argv[0];
- /* uint32_t position = atoi(argv[1]); */
- uint32_t relative_position = atoi(argv[2]);
</del><ins>+ struct skinny_profile_find_session_uuid_helper *helper = pArg;
</ins><span class="cx">
</span><del>- skinny_profile_find_listener_by_device_name(profile, device_name, &helper->listener);
</del><ins>+ char *channel_uuid = argv[0];
+ uint32_t line_instance = atoi(argv[1]);
</ins><span class="cx">
</span><del>- if(helper->listener) {
- helper->line = relative_position;
- }
- return 0;
</del><ins>+ if(helper->channel_uuid == NULL) {
+ helper->channel_uuid = switch_mprintf("%s", channel_uuid);
+ helper->line_instance = line_instance;
+ }
+
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t skinny_profile_find_listener_by_dest(skinny_profile_t *profile, const char *dest, listener_t **l, uint32_t *line)
</del><ins>+char * skinny_profile_find_session_uuid(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id)
</ins><span class="cx"> {
</span><ins>+ struct skinny_profile_find_session_uuid_helper helper = {0};
</ins><span class="cx"> char *sql;
</span><del>- struct skinny_profile_find_listener_helper helper = {0};
</del><ins>+ char *device_condition = NULL;
+ char *line_instance_condition = NULL;
+ char *call_id_condition = NULL;
+
+ switch_assert(profile);
</ins><span class="cx"> helper.profile = profile;
</span><ins>+ helper.channel_uuid = NULL;
</ins><span class="cx">
</span><del>- if ((sql = switch_mprintf("SELECT device_name, position, "
- "(SELECT count(*) from skinny_lines sl2 "
- "WHERE sl2.device_name= sl1.device_name AND sl2.device_instance= sl1.device_instance AND sl2.position <= sl1.position) AS relative_position "
- "FROM skinny_lines sl1 WHERE value='%s'",
- dest))) {
- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_profile_find_listener_callback, &helper);
</del><ins>+ if(listener) {
+ device_condition = switch_mprintf("device_name='%s' AND device_instance=%d",
+ listener->device_name, listener->device_instance);
+ } else {
+ device_condition = switch_mprintf("1=1");
+ }
+ switch_assert(device_condition);
+ if(*line_instance_p > 0) {
+ line_instance_condition = switch_mprintf("line_instance=%d", *line_instance_p);
+ } else {
+ line_instance_condition = switch_mprintf("1=1");
+ }
+ switch_assert(line_instance_condition);
+ if(call_id > 0) {
+ call_id_condition = switch_mprintf("call_id=%d", call_id);
+ } else {
+ call_id_condition = switch_mprintf("1=1");
+ }
+ switch_assert(call_id_condition);
+ if((sql = switch_mprintf(
+ "SELECT channel_uuid, line_instance "
+ "FROM skinny_active_lines "
+ "WHERE %s AND %s AND %s "
+ "ORDER BY channel_uuid DESC",
+ device_condition, line_instance_condition, call_id_condition
+ ))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql,
+ skinny_profile_find_session_uuid_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><ins>+ switch_safe_free(device_condition);
+ switch_safe_free(line_instance_condition);
+ switch_safe_free(call_id_condition);
+ *line_instance_p = helper.line_instance;
+ return helper.channel_uuid;
+}
</ins><span class="cx">
</span><ins>+switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id)
+{
+ char *uuid;
+ switch_core_session_t *result = NULL;
+ uuid = skinny_profile_find_session_uuid(profile, listener, line_instance_p, call_id);
</ins><span class="cx">
</span><del>- *line = helper.line;
- *l = helper.listener;
-
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ if(!zstr(uuid)) {
+ /* TODO Why should we force? */
+ result = switch_core_session_force_locate(uuid);
+ if(!result) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Unable to find session %s on %s:%d, line %d\n",
+ uuid, listener->device_name, listener->device_instance, *line_instance_p);
+ }
+ switch_safe_free(uuid);
+ }
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -262,28 +331,73 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><del>-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)
</del><ins>+void skinny_line_perform_set_state(const char *file, const char *func, int line, listener_t *listener, uint32_t line_instance, uint32_t call_id, uint32_t call_state)
</ins><span class="cx"> {
</span><del>- switch_assert(listener);
-
</del><ins>+ switch_event_t *event = NULL;
+ switch_assert(listener);
+
+ skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_CALL_STATE);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Line-Instance", "%d", line_instance);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Call-Id", "%d", call_id);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Call-State", "%d", call_state);
+ switch_event_fire(&event);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG,
</span><del>- "Device %s, line %d State Change %s (%d) -> %s (%d) (no session)\n",
- listener->device_name, instance,
- skinny_soft_key_set2str(listener->line_state[instance]), listener->line_state[instance],
- skinny_soft_key_set2str(state), state);
</del><ins>+ "Device %s:%d, Line %d, Call %d Change State to %s (%d)\n",
+ listener->device_name, listener->device_instance, line_instance, call_id,
+ skinny_call_state2str(call_state), call_state);
+}
</ins><span class="cx">
</span><del>- send_select_soft_keys(listener, instance, call_id, state, 0xffff);
- listener->line_state[instance] = state;
-
- return listener->line_state[instance];
</del><ins>+
+struct skinny_line_get_state_helper {
+ uint32_t call_state;
+};
+
+int skinny_line_get_state_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct skinny_line_get_state_helper *helper = pArg;
+ helper->call_state = atoi(argv[0]);
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance)
</del><ins>+uint32_t skinny_line_get_state(listener_t *listener, uint32_t line_instance, uint32_t call_id)
</ins><span class="cx"> {
</span><del>- switch_assert(listener);
</del><ins>+ char *line_instance_condition;
+ char *call_id_condition;
+ char *sql;
+ struct skinny_line_get_state_helper helper = {0};
</ins><span class="cx">
</span><del>- return listener->line_state[instance];
</del><ins>+ switch_assert(listener);
+
+ if(line_instance > 0) {
+ line_instance_condition = switch_mprintf("line_instance=%d", line_instance);
+ } else {
+ line_instance_condition = switch_mprintf("1=1");
+ }
+ switch_assert(line_instance_condition);
+ if(call_id > 0) {
+ call_id_condition = switch_mprintf("call_id=%d", call_id);
+ } else {
+ call_id_condition = switch_mprintf("1=1");
+ }
+ switch_assert(call_id_condition);
+
+ if ((sql = switch_mprintf(
+ "SELECT call_state FROM skinny_active_lines "
+ "WHERE device_name='%s' AND device_instance=%d "
+ "AND %s AND %s",
+ listener->device_name, listener->device_instance,
+ line_instance_condition, call_id_condition
+ ))) {
+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_get_state_callback, &helper);
+ switch_safe_free(sql);
+ }
+ switch_safe_free(line_instance_condition);
+ switch_safe_free(call_id_condition);
+
+ return helper.call_state;
</ins><span class="cx"> }
</span><ins>+
+
</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 class="lines">@@ -358,9 +472,7 @@
</span><span class="cx"> tech_pvt->read_impl.microseconds_per_packet,
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet
</span><span class="cx"> ) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_channel_t *channel = NULL;
- channel = switch_core_session_get_channel(tech_pvt->session);
- assert(channel != NULL);
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session);
</ins><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="lines">@@ -407,28 +519,19 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line)
</del><ins>+void tech_init(private_t *tech_pvt, skinny_profile_t *profile, switch_core_session_t *session)
</ins><span class="cx"> {
</span><del>- struct line_stat_res_message *button = NULL;
-
</del><span class="cx"> switch_assert(tech_pvt);
</span><span class="cx"> switch_assert(session);
</span><del>- switch_assert(listener);
</del><span class="cx">
</span><span class="cx"> tech_pvt->read_frame.data = tech_pvt->databuf;
</span><span class="cx"> tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
</span><span class="cx"> switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
</span><span class="cx"> switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
</span><del>- tech_pvt->call_id = listener->profile->next_call_id++;
- tech_pvt->listener = listener;
- tech_pvt->line = line;
</del><ins>+ tech_pvt->call_id = ++profile->next_call_id;
+ tech_pvt->profile = profile;
</ins><span class="cx"> switch_core_session_set_private(session, tech_pvt);
</span><span class="cx"> tech_pvt->session = session;
</span><del>-
- skinny_line_get(listener, line, &button);
- tech_pvt->line_name = switch_core_strdup(listener->pool, button->name);
- tech_pvt->line_shortname = switch_core_strdup(listener->pool, button->shortname);
- tech_pvt->line_displayname = switch_core_strdup(listener->pool, button->displayname);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -438,14 +541,9 @@
</span><span class="cx"> */
</span><span class="cx"> switch_status_t channel_on_init(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
</del><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx">
</span><span class="cx"> /* Move channel's state machine to ROUTING. This means the call is trying
</span><span class="lines">@@ -464,15 +562,8 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_on_routing(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -480,16 +571,8 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_on_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -498,14 +581,9 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_on_destroy(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
-
</del><span class="cx"> if (tech_pvt) {
</span><span class="cx"> if (switch_core_codec_ready(&tech_pvt->read_codec)) {
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->read_codec);
</span><span class="lines">@@ -521,74 +599,100 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct channel_on_hangup_helper {
+ private_t *tech_pvt;
+};
</ins><span class="cx">
</span><del>-switch_status_t channel_on_hangup(switch_core_session_t *session)
</del><ins>+int channel_on_hangup_callback(void *pArg, int argc, char **argv, char **columnNames)
</ins><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ struct channel_on_hangup_helper *helper = pArg;
</ins><span class="cx"> listener_t *listener = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
</del><ins>+ char *device_name = argv[0];
+ uint32_t device_instance = atoi(argv[1]);
+ /* uint32_t position = atoi(argv[2]); */
+ uint32_t line_instance = atoi(argv[3]);
+ /* char *label = argv[4]; */
+ /* char *value = argv[5]; */
+ /* char *caller_name = argv[6]; */
+ /* uint32_t ring_on_idle = atoi(argv[7]); */
+ /* uint32_t ring_on_active = atoi(argv[8]); */
+ /* uint32_t busy_trigger = atoi(argv[9]); */
+ /* char *forward_all = argv[10]; */
+ /* char *forward_busy = argv[11]; */
+ /* char *forward_noanswer = argv[12]; */
+ /* uint32_t noanswer_duration = atoi(argv[13]); */
+ /* char *channel_uuid = argv[14]; */
+ uint32_t call_id = atoi(argv[15]);
+ uint32_t call_state = atoi(argv[16]);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
</del><ins>+ skinny_profile_find_listener_by_device_name_and_instance(helper->tech_pvt->profile, device_name, device_instance, &listener);
+ if(listener) {
+ if(call_state == SKINNY_CONNECTED) {
+ stop_tone(listener, line_instance, call_id);
+ }
+ set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_OFF);
+ clear_prompt_status(listener, line_instance, call_id);
+ if(call_state == SKINNY_CONNECTED) { /* calling parties */
+ close_receive_channel(listener,
+ call_id, /* uint32_t conference_id, */
+ helper->tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
+ call_id /* uint32_t conference_id2, */
+ );
+ stop_media_transmission(listener,
+ call_id, /* uint32_t conference_id, */
+ helper->tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
+ call_id /* uint32_t conference_id2, */
+ );
+ switch_mutex_lock(globals.calls_mutex);
+ globals.calls--;
+ if (globals.calls < 0) {
+ globals.calls = 0;
+ }
+ switch_mutex_unlock(globals.calls_mutex);
+
+ }
</ins><span class="cx">
</span><del>- listener = tech_pvt->listener;
- assert(listener != NULL);
-
</del><ins>+ skinny_line_set_state(listener, line_instance, call_id, SKINNY_ON_HOOK);
+ send_select_soft_keys(listener, line_instance, call_id, SKINNY_KEY_SET_ON_HOOK, 0xffff);
+ /* TODO: DefineTimeDate */
+ set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
+ set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, call_id);
+
+ }
+ return 0;
+}
+
+switch_status_t channel_on_hangup(switch_core_session_t *session)
+{
+ struct channel_on_hangup_helper helper = {0};
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
+ char *sql;
+
</ins><span class="cx"> switch_clear_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx"> switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><del>- listener->session[tech_pvt->line] = NULL;
</del><ins>+ helper.tech_pvt= tech_pvt;
</ins><span class="cx">
</span><del>- stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
- set_lamp(listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_OFF);
- clear_prompt_status(listener, tech_pvt->line, tech_pvt->call_id);
-
- if( skinny_line_get_state(tech_pvt->listener, tech_pvt->line) == SKINNY_KEY_SET_CONNECTED ) {
- close_receive_channel(listener,
- tech_pvt->call_id, /* uint32_t conference_id, */
- tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
- tech_pvt->call_id /* uint32_t conference_id2, */
- );
- stop_media_transmission(listener,
- tech_pvt->call_id, /* uint32_t conference_id, */
- tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
- tech_pvt->call_id /* uint32_t conference_id2, */
- );
- switch_mutex_lock(globals.calls_mutex);
- globals.calls--;
- if (globals.calls < 0) {
- globals.calls = 0;
- }
- switch_mutex_unlock(globals.calls_mutex);
</del><ins>+ skinny_session_walk_lines(tech_pvt->profile, switch_core_session_get_uuid(session), channel_on_hangup_callback, &helper);
+ if ((sql = switch_mprintf(
+ "DELETE FROM skinny_active_lines WHERE channel_uuid='%s'",
+ switch_core_session_get_uuid(session)
+ ))) {
+ skinny_execute_sql(tech_pvt->profile, sql, tech_pvt->profile->sql_mutex);
+ switch_safe_free(sql);
</ins><span class="cx"> }
</span><del>- send_call_state(listener,
- SKINNY_ON_HOOK,
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_ON_HOOK, tech_pvt->call_id);
- /* TODO: DefineTimeDate */
- set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch (sig) {
</span><span class="cx"> case SWITCH_SIG_KILL:
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><span class="lines">@@ -631,16 +735,10 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx"> int payload = 0;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) {
</span><span class="cx"> if (switch_channel_ready(channel)) {
</span><span class="cx"> switch_yield(10000);
</span><span class="lines">@@ -705,17 +803,10 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx"> //switch_frame_t *pframe;
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -737,31 +828,12 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_answer_channel(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- private_t *tech_pvt;
- switch_channel_t *channel = NULL;
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel;
- private_t *tech_pvt;
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = (private_t *) switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch (msg->message_id) {
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_ANSWER:
</span><span class="cx"> {
</span><span class="lines">@@ -788,8 +860,7 @@
</span><span class="cx">
</span><span class="cx"> char *profile_name, *dest;
</span><span class="cx"> skinny_profile_t *profile = NULL;
</span><del>- listener_t *listener = NULL;
- uint32_t line = 0;
</del><ins>+ char *sql;
</ins><span class="cx"> char name[128];
</span><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> switch_caller_profile_t *caller_profile;
</span><span class="lines">@@ -833,27 +904,8 @@
</span><span class="cx"> channel = switch_core_session_get_channel(nsession);
</span><span class="cx"> switch_channel_set_name(channel, name);
</span><span class="cx">
</span><ins>+ tech_init(tech_pvt, profile, nsession);
</ins><span class="cx">
</span><del>- if ((skinny_profile_find_listener_by_dest(profile, dest, &listener, &line) != SWITCH_STATUS_SUCCESS)) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Problem while retrieving listener and line for destination %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
- goto error;
- }
-
- if (!listener) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid destination or phone not registred %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
- goto error;
- }
-
- if (line == 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid destination or phone not registred %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
- goto error;
- }
-
- tech_init(tech_pvt, nsession, listener, line);
-
</del><span class="cx"> caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="lines">@@ -861,19 +913,23 @@
</span><span class="cx"> switch_channel_set_flag(channel, CF_OUTBOUND);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
</span><span class="cx">
</span><del>- if(tech_pvt->listener->session[tech_pvt->line]) { /* Line is busy */
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Device line is busy %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_USER_BUSY;
</del><ins>+ if ((sql = switch_mprintf(
+ "INSERT INTO skinny_active_lines "
+ "(device_name, device_instance, line_instance, channel_uuid, call_id, call_state) "
+ "SELECT device_name, device_instance, line_instance, '%s', %d, %d "
+ "FROM skinny_lines "
+ "WHERE value='%s'",
+ switch_core_session_get_uuid(nsession), tech_pvt->call_id, SKINNY_ON_HOOK, dest
+ ))) {
+ skinny_execute_sql(profile, sql, profile->sql_mutex);
+ switch_safe_free(sql);
+ }
+
+ cause = skinny_ring_lines(tech_pvt);
+
+ if(cause != SWITCH_CAUSE_SUCCESS) {
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><del>- tech_pvt->listener->session[tech_pvt->line] = nsession;
- send_call_state(tech_pvt->listener, SKINNY_RING_IN, tech_pvt->line, tech_pvt->call_id);
- skinny_line_set_state(tech_pvt->listener, tech_pvt->line, SKINNY_KEY_SET_RING_IN, tech_pvt->call_id);
- display_prompt_status(tech_pvt->listener, 0, "\200\027tel", tech_pvt->line, tech_pvt->call_id);
- /* displayprinotifiymessage */
- skinny_send_call_info(nsession);
- set_lamp(tech_pvt->listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_BLINK);
- set_ringer(tech_pvt->listener, SKINNY_RING_OUTSIDE, SKINNY_RING_FOREVER, 0);
</del><span class="cx">
</span><span class="cx"> *new_session = nsession;
</span><span class="cx">
</span><span class="lines">@@ -1017,7 +1073,7 @@
</span><span class="cx"> "DELETE FROM skinny_devices "
</span><span class="cx"> "WHERE name='%s' and instance=%d",
</span><span class="cx"> listener->device_name, listener->device_instance))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1025,7 +1081,7 @@
</span><span class="cx"> "DELETE FROM skinny_lines "
</span><span class="cx"> "WHERE device_name='%s' and device_instance=%d",
</span><span class="cx"> listener->device_name, listener->device_instance))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1033,7 +1089,7 @@
</span><span class="cx"> "DELETE FROM skinny_buttons "
</span><span class="cx"> "WHERE device_name='%s' and device_instance=%d",
</span><span class="cx"> listener->device_name, listener->device_instance))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1072,9 +1128,10 @@
</span><span class="cx"> static switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream)
</span><span class="cx"> {
</span><span class="cx"> char *sql;
</span><del>- if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE name LIKE '%s'",
</del><ins>+ if ((sql = switch_mprintf("SELECT name, user_id, instance, ip, type, max_streams, port, codec_string "
+ "FROM skinny_devices WHERE name='%s'",
</ins><span class="cx"> device_name))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, dump_device_callback, stream);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, dump_device_callback, stream);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1200,6 +1257,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* TODO
</ins><span class="cx"> for(int line = 0 ; line < SKINNY_MAX_BUTTON_COUNT ; line++) {
</span><span class="cx"> if(listener->session[line]) {
</span><span class="cx"> switch_channel_clear_flag(switch_core_session_get_channel(listener->session[line]), CF_CONTROLLED);
</span><span class="lines">@@ -1208,6 +1266,7 @@
</span><span class="cx"> destroy_pool = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ */
</ins><span class="cx"> if(destroy_pool == 0) {
</span><span class="cx"> goto no_destroy_pool;
</span><span class="cx"> }
</span><span class="lines">@@ -1467,11 +1526,13 @@
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, devices_sql, NULL, NULL);
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, lines_sql, NULL, NULL);
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, buttons_sql, NULL, NULL);
</span><ins>+ switch_odbc_handle_exec(profile->master_odbc, active_lines_sql, NULL, NULL);
</ins><span class="cx"> } else {
</span><span class="cx"> if ((db = switch_core_db_open_file(profile->dbname))) {
</span><span class="cx"> switch_core_db_test_reactive(db, "SELECT * FROM skinny_devices", NULL, devices_sql);
</span><span class="cx"> switch_core_db_test_reactive(db, "SELECT * FROM skinny_lines", NULL, lines_sql);
</span><span class="cx"> switch_core_db_test_reactive(db, "SELECT * FROM skinny_buttons", NULL, buttons_sql);
</span><ins>+ switch_core_db_test_reactive(db, "SELECT * FROM skinny_active_lines", NULL, active_lines_sql);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n");
</span><span class="cx"> continue;
</span><span class="lines">@@ -1479,9 +1540,10 @@
</span><span class="cx"> switch_core_db_close(db);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_devices", NULL, NULL);
- skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_lines", NULL, NULL);
- skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_buttons", NULL, NULL);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_devices", NULL, NULL);
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_lines", NULL, NULL);
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_buttons", NULL, NULL);
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_active_lines", NULL, NULL);
</ins><span class="cx">
</span><span class="cx"> switch_core_hash_insert(globals.profile_hash, profile->name, profile);
</span><span class="cx"> profile = NULL;
</span><span class="lines">@@ -1528,7 +1590,7 @@
</span><span class="cx"> listener_t *listener = NULL;
</span><span class="cx"> skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
</span><span class="cx"> if(listener) {
</span><del>- set_ringer(listener, skinny_str2ring_type(ring_type), skinny_str2ring_mode(ring_mode), 0);
</del><ins>+ set_ringer(listener, skinny_str2ring_type(ring_type), skinny_str2ring_mode(ring_mode), 0, 0);
</ins><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "Listener not found!\n");
</span><span class="cx"> }
</span><span class="lines">@@ -1707,8 +1769,55 @@
</span><span class="cx">
</span><span class="cx"> static void event_handler(switch_event_t *event)
</span><span class="cx"> {
</span><ins>+ char *subclass;
+
</ins><span class="cx"> if (event->event_id == SWITCH_EVENT_HEARTBEAT) {
</span><span class="cx"> walk_listeners(kill_expired_listener, NULL);
</span><ins>+ } else if ((subclass = switch_event_get_header_nil(event, "Event-Subclass")) && !strcasecmp(subclass, SKINNY_EVENT_CALL_STATE)) {
+ char *profile_name = switch_event_get_header_nil(event, "Skinny-Profile-Name");
+ char *device_name = switch_event_get_header_nil(event, "Skinny-Device-Name");
+ uint32_t device_instance = atoi(switch_event_get_header_nil(event, "Skinny-Device-Instance"));
+ uint32_t line_instance = atoi(switch_event_get_header_nil(event, "Skinny-Line-Instance"));
+ uint32_t call_id = atoi(switch_event_get_header_nil(event, "Skinny-Call-Id"));
+ uint32_t call_state = atoi(switch_event_get_header_nil(event, "Skinny-Call-State"));
+ skinny_profile_t *profile;
+ listener_t *listener = NULL;
+ char *line_instance_condition, *call_id_condition;
+ char *sql;
+
+ if ((profile = skinny_find_profile(profile_name))) {
+ skinny_profile_find_listener_by_device_name_and_instance(profile, device_name, device_instance, &listener);
+ if(listener) {
+ if(line_instance > 0) {
+ line_instance_condition = switch_mprintf("line_instance=%d", line_instance);
+ } else {
+ line_instance_condition = switch_mprintf("1=1");
+ }
+ switch_assert(line_instance_condition);
+ if(call_id > 0) {
+ call_id_condition = switch_mprintf("call_id=%d", call_id);
+ } else {
+ call_id_condition = switch_mprintf("1=1");
+ }
+ switch_assert(call_id_condition);
+
+ if ((sql = switch_mprintf(
+ "UPDATE skinny_active_lines "
+ "SET call_state=%d "
+ "WHERE device_name='%s' AND device_instance=%d "
+ "AND %s AND %s",
+ call_state,
+ listener->device_name, listener->device_instance,
+ line_instance_condition, call_id_condition
+ ))) {
+ skinny_execute_sql(listener->profile, sql, listener->profile->sql_mutex);
+ switch_safe_free(sql);
+ send_call_state(listener, call_state, line_instance, call_id);
+ }
+ switch_safe_free(line_instance_condition);
+ switch_safe_free(call_id_condition);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1776,7 +1885,7 @@
</span><span class="cx">
</span><span class="cx"> if(profile) {
</span><span class="cx"> if ((sql = switch_mprintf("SELECT name FROM skinny_devices"))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_list_devices_callback, &h);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_list_devices_callback, &h);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1904,6 +2013,7 @@
</span><span class="cx"> profile = (skinny_profile_t *) val;
</span><span class="cx">
</span><span class="cx"> switch_mutex_init(&profile->listener_mutex, SWITCH_MUTEX_NESTED, module_pool);
</span><ins>+ switch_mutex_init(&profile->sql_mutex, SWITCH_MUTEX_NESTED, module_pool);
</ins><span class="cx"> switch_mutex_init(&profile->sock_mutex, SWITCH_MUTEX_NESTED, module_pool);
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1913,6 +2023,11 @@
</span><span class="cx"> /* Not such severe to prevent loading */
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((switch_event_bind_removable(modname, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_CALL_STATE, event_handler, NULL, &globals.call_state_node) != SWITCH_STATUS_SUCCESS)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind our call_state handler!\n");
+ return SWITCH_STATUS_TERM;
+ }
+
</ins><span class="cx"> if (switch_event_reserve_subclass(SKINNY_EVENT_REGISTER) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_REGISTER);
</span><span class="cx"> return SWITCH_STATUS_TERM;
</span><span class="lines">@@ -1984,6 +2099,7 @@
</span><span class="cx">
</span><span class="cx"> switch_event_free_subclass(SKINNY_EVENT_REGISTER);
</span><span class="cx"> switch_event_unbind(&globals.heartbeat_node);
</span><ins>+ switch_event_unbind(&globals.call_state_node);
</ins><span class="cx">
</span><span class="cx"> globals.running = 0;
</span><span class="cx">
</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 (17153 => 17154)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-04-01 08:30:12 UTC (rev 17153)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-04-01 17:22:02 UTC (rev 17154)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #define SKINNY_EVENT_UNREGISTER "skinny::unregister"
</span><span class="cx"> #define SKINNY_EVENT_EXPIRE "skinny::expire"
</span><span class="cx"> #define SKINNY_EVENT_ALARM "skinny::alarm"
</span><ins>+#define SKINNY_EVENT_CALL_STATE "skinny::call_state"
</ins><span class="cx">
</span><span class="cx"> struct skinny_globals {
</span><span class="cx"> /* data */
</span><span class="lines">@@ -49,6 +50,7 @@
</span><span class="cx"> switch_mutex_t *calls_mutex;
</span><span class="cx"> switch_hash_t *profile_hash;
</span><span class="cx"> switch_event_node_t *heartbeat_node;
</span><ins>+ switch_event_node_t *call_state_node;
</ins><span class="cx"> int running;
</span><span class="cx"> };
</span><span class="cx"> typedef struct skinny_globals skinny_globals_t;
</span><span class="lines">@@ -72,6 +74,7 @@
</span><span class="cx"> char *odbc_user;
</span><span class="cx"> char *odbc_pass;
</span><span class="cx"> switch_odbc_handle_t *master_odbc;
</span><ins>+ switch_mutex_t *sql_mutex;
</ins><span class="cx"> /* stats */
</span><span class="cx"> uint32_t ib_calls;
</span><span class="cx"> uint32_t ob_calls;
</span><span class="lines">@@ -103,8 +106,6 @@
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> char device_name[16];
</span><span class="cx"> uint32_t device_instance;
</span><del>- switch_core_session_t *session[SKINNY_MAX_LINES];
- uint32_t line_state[SKINNY_MAX_LINES]; /* See enum skinny_key_set */
</del><span class="cx">
</span><span class="cx"> switch_socket_t *sock;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="lines">@@ -153,14 +154,11 @@
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> switch_mutex_t *flag_mutex;
</span><span class="cx"> /* identification */
</span><del>- struct listener *listener;
- uint32_t line;
</del><span class="cx"> uint32_t call_id;
</span><span class="cx"> uint32_t party_id;
</span><del>- char *line_name;
- char *line_shortname;
- char *line_displayname;
- char dest[10];
</del><ins>+
+ skinny_profile_t *profile;
+
</ins><span class="cx"> /* codec */
</span><span class="cx"> char *iananame;
</span><span class="cx"> switch_codec_t read_codec;
</span><span class="lines">@@ -183,6 +181,13 @@
</span><span class="cx"> typedef struct private_object private_t;
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><ins>+/* PROFILES FUNCTIONS */
+/*****************************************************************************/
+switch_status_t skinny_profile_find_listener_by_device_name_and_instance(skinny_profile_t *profile, const char *device_name, uint32_t device_instance, listener_t **listener);
+char * skinny_profile_find_session_uuid(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
+switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
+
+/*****************************************************************************/
</ins><span class="cx"> /* SQL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> void skinny_execute_sql(skinny_profile_t *profile, char *sql, switch_mutex_t *mutex);
</span><span class="lines">@@ -197,13 +202,13 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><del>-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)
</del><ins>+void skinny_line_perform_set_state(const char *file, const char *func, int line, listener_t *listener, uint32_t line_instance, uint32_t call_id, uint32_t call_state);
+#define skinny_line_set_state(listener, line_instance, call_id, call_state) skinny_line_perform_set_state(__FILE__, __SWITCH_FUNC__, __LINE__, listener, line_instance, call_id, call_state)
</ins><span class="cx">
</span><del>-uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance);
</del><ins>+uint32_t skinny_line_get_state(listener_t *listener, uint32_t line_instance, uint32_t call_id);
</ins><span class="cx">
</span><span class="cx"> switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force);
</span><del>-void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line);
</del><ins>+void tech_init(private_t *tech_pvt, skinny_profile_t *profile, switch_core_session_t *session);
</ins><span class="cx"> switch_status_t channel_on_init(switch_core_session_t *session);
</span><span class="cx"> switch_status_t channel_on_hangup(switch_core_session_t *session);
</span><span class="cx"> switch_status_t channel_on_destroy(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 (17153 => 17154)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-01 08:30:12 UTC (rev 17153)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-01 17:22:02 UTC (rev 17154)
</span><span class="lines">@@ -218,23 +218,25 @@
</span><span class="cx"> {
</span><span class="cx"> switch_event_t *event = (switch_event_t *) pArg;
</span><span class="cx">
</span><del>- char *device_name = argv[0];
- char *user_id = argv[1];
- char *instance = argv[2];
- char *ip = argv[3];
- char *device_type = argv[4];
- char *max_streams = argv[5];
- char *port = argv[6];
- char *codec_string = argv[7];
</del><ins>+ char *profile_name = argv[0];
+ char *device_name = argv[1];
+ char *user_id = argv[2];
+ char *device_instance = argv[3];
+ char *ip = argv[4];
+ char *device_type = argv[5];
+ char *max_streams = argv[6];
+ char *port = argv[7];
+ char *codec_string = argv[8];
</ins><span class="cx">
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Skinny-Device-Name", device_name);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-User-Id", "%s", user_id);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Instance", "%s", instance);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Skinny-IP", ip);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Device-Type", "%s", device_type);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Max-Streams", "%s", max_streams);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Port", "%s", port);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Skinny-Codecs", codec_string);
</del><ins>+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Profile-Name", "%s", profile_name);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Device-Name", "%s", device_name);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Station-User-Id", "%s", user_id);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Station-Instance", "%s", device_instance);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-IP-Address", "%s", ip);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Device-Type", "%s", device_type);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Max-Streams", "%s", max_streams);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Port", "%s", port);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Codecs", "%s", codec_string);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -249,8 +251,12 @@
</span><span class="cx">
</span><span class="cx"> switch_event_create_subclass(&event, event_id, subclass_name);
</span><span class="cx"> switch_assert(event);
</span><del>- if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE name='%s' AND instance=%d", listener->device_name, listener->device_instance))) {
- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_device_event_callback, event);
</del><ins>+ if ((sql = switch_mprintf("SELECT '%s', name, user_id, instance, ip, type, max_streams, port, codec_string "
+ "FROM skinny_devices "
+ "WHERE name='%s' AND instance=%d",
+ listener->profile->name,
+ listener->device_name, listener->device_instance))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_device_event_callback, event);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -259,30 +265,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t skinny_send_call_info(switch_core_session_t *session)
</del><ins>+switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> switch_channel_t *channel;
</span><del>- listener_t *listener;
</del><span class="cx">
</span><span class="cx"> char calling_party_name[40] = "UNKNOWN";
</span><span class="cx"> char calling_party[24] = "0000000000";
</span><span class="cx"> char called_party_name[40] = "UNKNOWN";
</span><span class="cx"> char called_party[24] = "0000000000";
</span><span class="cx">
</span><ins>+ channel = switch_core_session_get_channel(session);
</ins><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><del>- switch_assert(tech_pvt != NULL);
- channel = switch_core_session_get_channel(session);
- switch_assert(channel != NULL);
</del><span class="cx">
</span><del>- listener = tech_pvt->listener;
- switch_assert(listener != NULL);
-
</del><span class="cx"> switch_assert(tech_pvt->caller_profile != NULL);
</span><span class="cx">
</span><span class="cx"> if( switch_channel_test_flag(channel, CF_OUTBOUND) ) {
</span><del>- strncpy(calling_party_name, tech_pvt->line_displayname, 40);
- strncpy(calling_party, tech_pvt->line_name, 24);
</del><ins>+ struct line_stat_res_message *button = NULL;
+
+ skinny_line_get(listener, line_instance, &button);
+
+ if (button) {
+ strncpy(calling_party_name, button->displayname, 40);
+ strncpy(calling_party, button->name, 24);
+ }
</ins><span class="cx"> strncpy(called_party_name, tech_pvt->caller_profile->caller_id_name, 40);
</span><span class="cx"> strncpy(called_party, tech_pvt->caller_profile->caller_id_number, 24);
</span><span class="cx"> } else {
</span><span class="lines">@@ -290,12 +296,12 @@
</span><span class="cx"> strncpy(calling_party, tech_pvt->caller_profile->caller_id_number, 24);
</span><span class="cx"> /* TODO called party */
</span><span class="cx"> }
</span><del>- send_call_info(tech_pvt->listener,
</del><ins>+ send_call_info(listener,
</ins><span class="cx"> calling_party_name, /* char calling_party_name[40], */
</span><span class="cx"> calling_party, /* char calling_party[24], */
</span><span class="cx"> called_party_name, /* char called_party_name[40], */
</span><span class="cx"> called_party, /* char called_party[24], */
</span><del>- tech_pvt->line, /* uint32_t line_instance, */
</del><ins>+ line_instance, /* uint32_t line_instance, */
</ins><span class="cx"> tech_pvt->call_id, /* uint32_t call_id, */
</span><span class="cx"> SKINNY_OUTBOUND_CALL, /* uint32_t call_type, */
</span><span class="cx"> "", /* TODO char original_called_party_name[40], */
</span><span class="lines">@@ -316,169 +322,427 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t skinny_create_session(listener_t *listener, uint32_t line, uint32_t to_state)
</del><ins>+switch_status_t skinny_session_walk_lines(skinny_profile_t *profile, char *channel_uuid, switch_core_db_callback_func_t callback, void *data)
</ins><span class="cx"> {
</span><del>- switch_core_session_t *session;
</del><ins>+ char *sql;
+ if ((sql = switch_mprintf(
+ "SELECT skinny_lines.*, channel_uuid, call_id, call_state "
+ "FROM skinny_active_lines "
+ "INNER JOIN skinny_lines "
+ "ON skinny_active_lines.device_name = skinny_lines.device_name "
+ "AND skinny_active_lines.device_instance = skinny_lines.device_instance "
+ "AND skinny_active_lines.line_instance = skinny_lines.line_instance "
+ "WHERE channel_uuid='%s'",
+ channel_uuid))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, callback, data);
+ switch_safe_free(sql);
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t skinny_session_walk_lines_by_call_id(skinny_profile_t *profile, uint32_t call_id, switch_core_db_callback_func_t callback, void *data)
+{
+ char *sql;
+ if ((sql = switch_mprintf(
+ "SELECT skinny_lines.*, channel_uuid, call_id, call_state "
+ "FROM skinny_active_lines "
+ "INNER JOIN skinny_lines "
+ "ON skinny_active_lines.device_name = skinny_lines.device_name "
+ "AND skinny_active_lines.device_instance = skinny_lines.device_instance "
+ "AND skinny_active_lines.line_instance = skinny_lines.line_instance "
+ "WHERE call_id='%d'",
+ call_id))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, callback, data);
+ switch_safe_free(sql);
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+struct skinny_ring_lines_helper {
+ private_t *tech_pvt;
+ uint32_t lines_count;
+};
+
+int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct skinny_ring_lines_helper *helper = pArg;
+ char *tmp;
+
+ char *device_name = argv[0];
+ uint32_t device_instance = atoi(argv[1]);
+ /* uint32_t position = atoi(argv[2]); */
+ uint32_t line_instance = atoi(argv[3]);
+ /* char *label = argv[4]; */
+ /* char *value = argv[5]; */
+ /* char *caller_name = argv[6]; */
+ /* uint32_t ring_on_idle = atoi(argv[7]); */
+ /* uint32_t ring_on_active = atoi(argv[8]); */
+ /* uint32_t busy_trigger = atoi(argv[9]); */
+ /* char *forward_all = argv[10]; */
+ /* char *forward_busy = argv[11]; */
+ /* char *forward_noanswer = argv[12]; */
+ /* uint32_t noanswer_duration = atoi(argv[13]); */
+ /* char *channel_uuid = argv[14]; */
+ /* uint32_t call_id = atoi(argv[15]); */
+ /* uint32_t call_state = atoi(argv[16]); */
+
+ listener_t *listener = NULL;
+
+ skinny_profile_find_listener_by_device_name_and_instance(helper->tech_pvt->profile,
+ device_name, device_instance, &listener);
+ if(listener) {
+ helper->lines_count++;
+ skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_RING_IN);
+ send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, SKINNY_KEY_SET_RING_IN, 0xffff);
+ if ((tmp = switch_mprintf("\200\027%s", helper->tech_pvt->caller_profile->destination_number))) {
+ display_prompt_status(listener, 0, tmp, line_instance, helper->tech_pvt->call_id);
+ switch_safe_free(tmp);
+ }
+ if ((tmp = switch_mprintf("\005\000\000\000%s", helper->tech_pvt->caller_profile->destination_number))) {
+ send_display_pri_notify(listener, 10 /* message_timeout */, 5 /* priority */, tmp);
+ switch_safe_free(tmp);
+ }
+ skinny_send_call_info(helper->tech_pvt->session, listener, line_instance);
+ set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_BLINK);
+ set_ringer(listener, SKINNY_RING_INSIDE, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+ }
+ return 0;
+}
+
+switch_call_cause_t skinny_ring_lines(private_t *tech_pvt)
+{
+ switch_status_t status;
+ struct skinny_ring_lines_helper helper = {0};
+
+ switch_assert(tech_pvt);
+ switch_assert(tech_pvt->profile);
+ switch_assert(tech_pvt->session);
+
+ helper.tech_pvt = tech_pvt;
+ helper.lines_count = 0;
+
+ status = skinny_session_walk_lines(tech_pvt->profile,
+ switch_core_session_get_uuid(tech_pvt->session), skinny_ring_lines_callback, &helper);
+ if(status != SWITCH_STATUS_SUCCESS) {
+ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+ } else if(helper.lines_count == 0) {
+ return SWITCH_CAUSE_UNALLOCATED_NUMBER;
+ } else {
+ return SWITCH_CAUSE_SUCCESS;
+ }
+}
+
+/*****************************************************************************/
+switch_status_t skinny_create_ingoing_session(listener_t *listener, uint32_t *line_instance_p, switch_core_session_t **session)
+{
+ switch_core_session_t *nsession;
</ins><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> char name[128];
</span><ins>+ char *sql;
+ struct line_stat_res_message *button = NULL;
</ins><span class="cx">
</span><del>- if(listener->session[line]) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "There is already a session on line %d of device %s\n",
- line, listener->device_name);
</del><ins>+ if((nsession = skinny_profile_find_session(listener->profile, listener, line_instance_p, 0))) {
+ switch_core_session_rwunlock(nsession);
+ if(skinny_line_get_state(listener, *line_instance_p, 0) == SKINNY_OFF_HOOK) {
+ /* Reuse existing session */
+ *session = nsession;
+ return SWITCH_STATUS_SUCCESS;
+ }
+ skinny_session_hold_line(nsession, listener, *line_instance_p);
+ }
+ if(*line_instance_p == 0) {
+ *line_instance_p = 1;
+ }
</ins><span class="cx">
</span><del>- session = listener->session[line];
</del><ins>+ skinny_line_get(listener, *line_instance_p, &button);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
- } else {
</del><ins>+ if (!button || !button->shortname) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Line %d not found on device %s %d\n",
+ *line_instance_p, listener->device_name, listener->device_instance);
+ goto error;
+ }
</ins><span class="cx">
</span><del>- if (!(session = switch_core_session_request(skinny_get_endpoint_interface(), SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
- goto error;
- }
</del><ins>+ if (!(nsession = switch_core_session_request(skinny_get_endpoint_interface(),
+ SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(*tech_pvt)))) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session private object\n");
- goto error;
- }
</del><ins>+ if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(nsession, sizeof(*tech_pvt)))) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Creating Session private object\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- switch_core_session_add_stream(session, NULL);
</del><ins>+ switch_core_session_add_stream(nsession, NULL);
</ins><span class="cx">
</span><del>- tech_init(tech_pvt, session, listener, line);
</del><ins>+ tech_init(tech_pvt, listener->profile, nsession);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
</del><ins>+ channel = switch_core_session_get_channel(nsession);
</ins><span class="cx">
</span><del>- snprintf(name, sizeof(name), "SKINNY/%s/%s:%d/%d", listener->profile->name, listener->device_name, listener->device_instance, tech_pvt->line);
- switch_channel_set_name(channel, name);
</del><ins>+ snprintf(name, sizeof(name), "SKINNY/%s/%s:%d/%d", listener->profile->name,
+ listener->device_name, listener->device_instance, *line_instance_p);
+ switch_channel_set_name(channel, name);
</ins><span class="cx">
</span><del>- if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session thread\n");
- goto error;
- }
</del><ins>+ if (switch_core_session_thread_launch(nsession) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Creating Session thread\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
- NULL, listener->profile->dialplan, tech_pvt->line_displayname, tech_pvt->line_name, listener->remote_ip, NULL, NULL, NULL, "skinny" /* modname */, listener->profile->context, tech_pvt->dest)) != 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session caller profile\n");
- goto error;
- }
</del><ins>+ if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(nsession),
+ NULL, listener->profile->dialplan,
+ button->shortname, button->name,
+ listener->remote_ip, NULL, NULL, NULL,
+ "skinny" /* modname */,
+ listener->profile->context,
+ "")) != 0) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Creating Session caller profile\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
</del><ins>+ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
</ins><span class="cx">
</span><ins>+ if ((sql = switch_mprintf(
+ "INSERT INTO skinny_active_lines "
+ "(device_name, device_instance, line_instance, channel_uuid, call_id, call_state) "
+ "SELECT device_name, device_instance, line_instance, '%s', %d, %d "
+ "FROM skinny_lines "
+ "WHERE value='%s'",
+ switch_core_session_get_uuid(nsession), tech_pvt->call_id, SKINNY_ON_HOOK, button->shortname
+ ))) {
+ skinny_execute_sql(listener->profile, sql, listener->profile->sql_mutex);
+ switch_safe_free(sql);
</ins><span class="cx"> }
</span><del>-
- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
</del><ins>+
+ set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
</ins><span class="cx"> set_speaker_mode(listener, SKINNY_SPEAKER_ON);
</span><del>- set_lamp(listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_ON);
- send_call_state(listener,
- SKINNY_OFF_HOOK,
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, to_state, tech_pvt->call_id);
- display_prompt_status(listener,
- 0,
- "\200\000",
- tech_pvt->line,
- tech_pvt->call_id);
- activate_call_plane(listener, tech_pvt->line);
- start_tone(listener, SKINNY_TONE_DIALTONE, 0, tech_pvt->line, tech_pvt->call_id);
</del><ins>+ set_lamp(listener, SKINNY_BUTTON_LINE, *line_instance_p, SKINNY_LAMP_ON);
+ skinny_line_set_state(listener, *line_instance_p, tech_pvt->call_id, SKINNY_OFF_HOOK);
+ send_select_soft_keys(listener, *line_instance_p, tech_pvt->call_id, SKINNY_KEY_SET_OFF_HOOK, 0xffff);
+ display_prompt_status(listener, 0, "\200\000",
+ *line_instance_p, tech_pvt->call_id);
+ activate_call_plane(listener, *line_instance_p);
</ins><span class="cx">
</span><span class="cx"> goto done;
</span><span class="cx"> error:
</span><del>- if (session) {
- switch_core_session_destroy(&session);
</del><ins>+ if (nsession) {
+ switch_core_session_destroy(&nsession);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="cx"> done:
</span><del>- listener->session[line] = session;
</del><ins>+ switch_core_session_rwunlock(nsession);
+ *session = nsession;
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_process_dest(listener_t *listener, uint32_t line)
</del><ins>+switch_status_t skinny_session_process_dest(switch_core_session_t *session, listener_t *listener, uint32_t line_instance, char *dest, char append_dest, uint32_t backspace)
</ins><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
</del><ins>+ if(!dest) {
+ if(append_dest == '\0') {/* no digit yet */
+ start_tone(listener, SKINNY_TONE_DIALTONE, 0, line_instance, tech_pvt->call_id);
+ } else {
+ if(strlen(tech_pvt->caller_profile->destination_number) == 0) {/* first digit */
+ stop_tone(listener, line_instance, tech_pvt->call_id);
+ send_select_soft_keys(listener, line_instance, tech_pvt->call_id,
+ SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, 0xffff);
+ }
+ tech_pvt->caller_profile->destination_number = switch_core_sprintf(tech_pvt->caller_profile->pool,
+ "%s%c", tech_pvt->caller_profile->destination_number, append_dest);
+ }
+ } else {
+ tech_pvt->caller_profile->destination_number = switch_core_strdup(tech_pvt->caller_profile->pool,
+ dest);
+ }
+ /* TODO Number is complete -> check against dialplan */
+ if((strlen(tech_pvt->caller_profile->destination_number) >= 4) || dest) {
+ send_dialed_number(listener, tech_pvt->caller_profile->destination_number, line_instance, tech_pvt->call_id);
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_PROCEED);
+ skinny_send_call_info(session, listener, line_instance);
+ skinny_session_start_media(session, listener, line_instance);
+ }
</ins><span class="cx">
</span><del>- tech_pvt->caller_profile->destination_number = switch_core_strdup(tech_pvt->caller_profile->pool, tech_pvt->dest);
- if(strlen(tech_pvt->dest) >= 4) { /* TODO Number is complete -> check against dialplan */
- if (switch_channel_get_state(channel) == CS_NEW) {
- switch_channel_set_state(channel, CS_INIT);
- }
</del><ins>+ switch_core_session_rwunlock(session);
+
+ return SWITCH_STATUS_SUCCESS;
+}
</ins><span class="cx">
</span><del>- send_dialed_number(listener, tech_pvt->dest, tech_pvt->line, tech_pvt->call_id);
- skinny_answer(listener->session[line]);
- }
</del><ins>+switch_status_t skinny_session_ring_out(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+{
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
+
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_RING_OUT);
+ send_select_soft_keys(listener, line_instance, tech_pvt->call_id,
+ SKINNY_KEY_SET_RING_OUT, 0xffff);
+ display_prompt_status(listener, 0, "\200\026",
+ line_instance, tech_pvt->call_id);
+ skinny_send_call_info(session, listener, line_instance);
+
+ switch_core_session_rwunlock(session);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_answer(switch_core_session_t *session)
-{
</del><ins>+
+struct skinny_session_answer_helper {
</ins><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> listener_t *listener;
</span><del>-
</del><ins>+ uint32_t line_instance;
+};
+
+int skinny_session_answer_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct skinny_session_answer_helper *helper = pArg;
+ listener_t *listener = NULL;
+
+ char *device_name = argv[0];
+ uint32_t device_instance = atoi(argv[1]);
+ /* uint32_t position = atoi(argv[2]); */
+ uint32_t line_instance = atoi(argv[3]);
+ /* char *label = argv[4]; */
+ /* char *value = argv[5]; */
+ /* char *caller_name = argv[6]; */
+ /* uint32_t ring_on_idle = atoi(argv[7]); */
+ /* uint32_t ring_on_active = atoi(argv[8]); */
+ /* uint32_t busy_trigger = atoi(argv[9]); */
+ /* char *forward_all = argv[10]; */
+ /* char *forward_busy = argv[11]; */
+ /* char *forward_noanswer = argv[12]; */
+ /* uint32_t noanswer_duration = atoi(argv[13]); */
+ /* char *channel_uuid = argv[14]; */
+ /* uint32_t call_id = atoi(argv[15]); */
+ /* uint32_t call_state = atoi(argv[16]); */
+
+ skinny_profile_find_listener_by_device_name_and_instance(helper->tech_pvt->profile, device_name, device_instance, &listener);
+ if(listener) {
+ if(!strcmp(device_name, helper->listener->device_name)
+ && (device_instance == helper->listener->device_instance)
+ && (line_instance == helper->line_instance)) {/* the answering line */
+
+
+ set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+ set_speaker_mode(listener, SKINNY_SPEAKER_ON);
+ set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_ON);
+ skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_OFF_HOOK);
+ /* send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, SKINNY_KEY_SET_OFF_HOOK, 0xffff); */
+ /* display_prompt_status(listener, 0, "\200\000",
+ line_instance, tech_pvt->call_id); */
+ activate_call_plane(listener, line_instance);
+ }
+ }
+ return 0;
+}
+
+switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+{
+ struct skinny_session_answer_helper helper = {0};
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
</ins><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><del>- switch_assert(tech_pvt != NULL);
</del><span class="cx">
</span><del>- listener = tech_pvt->listener;
- switch_assert(listener != NULL);
</del><ins>+ helper.tech_pvt = tech_pvt;
+ helper.listener = listener;
+ helper.line_instance = line_instance;
</ins><span class="cx">
</span><del>- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0); /* TODO : here ? */
- stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
- open_receive_channel(listener,
- tech_pvt->call_id, /* uint32_t conference_id, */
- 0, /* uint32_t pass_thru_party_id, */
- 20, /* uint32_t packets, */
- SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
- 0, /* uint32_t echo_cancel_type, */
- 0, /* uint32_t g723_bitrate, */
- 0, /* uint32_t conference_id2, */
- 0 /* uint32_t reserved[10] */
- );
- send_call_state(listener,
- SKINNY_CONNECTED,
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_CONNECTED, tech_pvt->call_id);
- display_prompt_status(listener,
- 0,
- "\200\030",
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_send_call_info(session);
</del><ins>+ skinny_session_walk_lines(tech_pvt->profile, switch_core_session_get_uuid(session), skinny_session_answer_callback, &helper);
+
+ skinny_session_start_media(session, listener, line_instance);
+
+ switch_core_session_rwunlock(session);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_hold_line(listener_t *listener, uint32_t line)
</del><ins>+switch_status_t skinny_session_start_media(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
+
+ stop_tone(listener, line_instance, tech_pvt->call_id);
+ open_receive_channel(listener,
+ tech_pvt->call_id, /* uint32_t conference_id, */
+ tech_pvt->call_id, /* uint32_t pass_thru_party_id, */
+ 20, /* uint32_t packets, */
+ SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
+ 0, /* uint32_t echo_cancel_type, */
+ 0, /* uint32_t g723_bitrate, */
+ 0, /* uint32_t conference_id2, */
+ 0 /* uint32_t reserved[10] */
+ );
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_CONNECTED);
+ send_select_soft_keys(listener, line_instance, tech_pvt->call_id,
+ SKINNY_KEY_SET_CONNECTED, 0xffff);
+ display_prompt_status(listener,
+ 0,
+ "\200\030",
+ line_instance,
+ tech_pvt->call_id);
+ skinny_send_call_info(session, listener, line_instance);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
</del><ins>+ switch_core_session_rwunlock(session);
+
+ return SWITCH_STATUS_SUCCESS;
+}
</ins><span class="cx">
</span><ins>+switch_status_t skinny_session_hold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+{
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
+
</ins><span class="cx"> /* TODO */
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Hold is not implemented yet. Hanging up the line.\n");
</span><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><span class="cx">
</span><ins>+ switch_core_session_rwunlock(session);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_unhold_line(listener_t *listener, uint32_t line)
</del><ins>+switch_status_t skinny_session_unhold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> /* TODO */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -525,7 +789,7 @@
</span><span class="cx"> instance,
</span><span class="cx"> listener->device_name, listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_line_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -569,7 +833,7 @@
</span><span class="cx"> listener->device_name, listener->device_instance,
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_speed_dial_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_speed_dial_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -614,7 +878,7 @@
</span><span class="cx"> listener->device_instance,
</span><span class="cx"> SKINNY_BUTTON_SERVICE_URL
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_service_url_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_service_url_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -660,7 +924,7 @@
</span><span class="cx"> listener->device_instance,
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_feature_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -704,7 +968,8 @@
</span><span class="cx"> switch_status_t set_ringer(listener_t *listener,
</span><span class="cx"> uint32_t ring_type,
</span><span class="cx"> uint32_t ring_mode,
</span><del>- uint32_t unknown)
</del><ins>+ uint32_t line_instance,
+ uint32_t call_id)
</ins><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.ringer));
</span><span class="lines">@@ -712,7 +977,8 @@
</span><span class="cx"> message->length = 4 + sizeof(message->data.ringer);
</span><span class="cx"> message->data.ringer.ring_type = ring_type;
</span><span class="cx"> message->data.ringer.ring_mode = ring_mode;
</span><del>- message->data.ringer.unknown = unknown;
</del><ins>+ message->data.ringer.line_instance = line_instance;
+ message->data.ringer.call_id = call_id;
</ins><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -990,10 +1256,26 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t send_reset(listener_t *listener,
- uint32_t reset_type)
</del><ins>+switch_status_t send_display_pri_notify(listener_t *listener,
+ uint32_t message_timeout,
+ uint32_t priority,
+ char *notify)
</ins><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><ins>+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.display_pri_notify));
+ message->type = DISPLAY_PRI_NOTIFY_MESSAGE;
+ message->length = 4 + sizeof(message->data.display_pri_notify);
+ message->data.display_pri_notify.message_timeout = message_timeout;
+ message->data.display_pri_notify.priority = priority;
+ strncpy(message->data.display_pri_notify.notify, notify, 32);
+ skinny_send_reply(listener, message);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t send_reset(listener_t *listener, uint32_t reset_type)
+{
+ skinny_message_t *message;
</ins><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reset));
</span><span class="cx"> message->type = RESET_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.reset);
</span><span class="lines">@@ -1078,7 +1360,7 @@
</span><span class="cx"> request->data.reg.max_streams,
</span><span class="cx"> "" /* codec_string */
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1090,6 +1372,7 @@
</span><span class="cx"> if (xskinny) {
</span><span class="cx"> xbuttons = switch_xml_child(xskinny, "buttons");
</span><span class="cx"> if (xbuttons) {
</span><ins>+ uint32_t line_instance = 1;
</ins><span class="cx"> for (xbutton = switch_xml_child(xbuttons, "button"); xbutton; xbutton = xbutton->next) {
</span><span class="cx"> uint32_t position = atoi(switch_xml_attr_soft(xbutton, "position"));
</span><span class="cx"> uint32_t type = skinny_str2button(switch_xml_attr_soft(xbutton, "type"));
</span><span class="lines">@@ -1106,16 +1389,16 @@
</span><span class="cx"> uint32_t noanswer_duration = atoi(switch_xml_attr_soft(xbutton, "noanswer-duration"));
</span><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "INSERT INTO skinny_lines "
</span><del>- "(device_name, device_instance, position, "
</del><ins>+ "(device_name, device_instance, position, line_instance, "
</ins><span class="cx"> "label, value, caller_name, "
</span><span class="cx"> "ring_on_idle, ring_on_active, busy_trigger, "
</span><span class="cx"> "forward_all, forward_busy, forward_noanswer, noanswer_duration) "
</span><del>- "VALUES('%s', %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d)",
- request->data.reg.device_name, request->data.reg.instance, position,
</del><ins>+ "VALUES('%s', %d, %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d)",
+ request->data.reg.device_name, request->data.reg.instance, position, line_instance++,
</ins><span class="cx"> label, value, caller_name,
</span><span class="cx"> ring_on_idle, ring_on_active, busy_trigger,
</span><span class="cx"> forward_all, forward_busy, forward_noanswer, noanswer_duration))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -1131,7 +1414,7 @@
</span><span class="cx"> label,
</span><span class="cx"> value,
</span><span class="cx"> settings))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1145,9 +1428,9 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_ack));
</span><span class="cx"> message->type = REGISTER_ACK_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.reg_ack);
</span><del>- message->data.reg_ack.keepAlive = profile->keep_alive;
- memcpy(message->data.reg_ack.dateFormat, profile->date_format, 6);
- message->data.reg_ack.secondaryKeepAlive = profile->keep_alive;
</del><ins>+ message->data.reg_ack.keep_alive = profile->keep_alive;
+ memcpy(message->data.reg_ack.date_format, profile->date_format, 6);
+ message->data.reg_ack.secondary_keep_alive = profile->keep_alive;
</ins><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="cx"> /* Send CapabilitiesReqMessage */
</span><span class="lines">@@ -1227,7 +1510,7 @@
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL,
</span><span class="cx"> listener->device_name
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_config_stat_res_callback, message);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_config_stat_res_callback, message);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> skinny_send_reply(listener, message);
</span><span class="lines">@@ -1287,10 +1570,10 @@
</span><span class="cx"> codec_string,
</span><span class="cx"> listener->device_name
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Codecs %s supported.\n", codec_string);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1309,11 +1592,11 @@
</span><span class="cx">
</span><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "UPDATE skinny_devices SET port=%d WHERE name='%s' and instance=%d",
</span><del>- request->data.as_uint16,
</del><ins>+ request->data.port.port,
</ins><span class="cx"> listener->device_name,
</span><span class="cx"> listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1378,7 +1661,7 @@
</span><span class="cx"> SKINNY_BUTTON_UNDEFINED,
</span><span class="cx"> listener->device_name, listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1391,7 +1674,7 @@
</span><span class="cx"> SKINNY_BUTTON_LINE,
</span><span class="cx"> listener->device_name, listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1464,7 +1747,7 @@
</span><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="cx"> /* Init the states */
</span><del>- skinny_line_set_state(listener, 0, SKINNY_KEY_SET_ON_HOOK, 0);
</del><ins>+ send_select_soft_keys(listener, 0, 0, SKINNY_KEY_SET_ON_HOOK, 0xffff);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1596,173 +1879,128 @@
</span><span class="cx"> switch_status_t skinny_handle_soft_key_event_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>-
- skinny_profile_t *profile;
</del><ins>+ uint32_t line_instance = 0;
+ switch_core_session_t *session = NULL;
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><del>- uint32_t line;
</del><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><ins>+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ skinny_check_data_length(request, sizeof(request->data.soft_key_event));
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
</del><ins>+ line_instance = request->data.soft_key_event.line_instance;
</ins><span class="cx">
</span><del>- profile = listener->profile;
</del><ins>+ switch(request->data.soft_key_event.event) {
+ case SOFTKEY_REDIAL:
+ status = skinny_create_ingoing_session(listener, &line_instance, &session);
</ins><span class="cx">
</span><del>- skinny_check_data_length(request, sizeof(request->data.soft_key_event));
</del><ins>+ skinny_session_process_dest(session, listener, line_instance, "redial", '\0', 0);
+ break;
+ case SOFTKEY_NEWCALL:
+ status = skinny_create_ingoing_session(listener, &line_instance, &session);
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
</ins><span class="cx">
</span><del>- if(request->data.soft_key_event.line_instance) {
- line = request->data.soft_key_event.line_instance;
- } else {
- line = 1;
- }
- /* Close/Hold busy lines */
- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(i == line) {
- continue;
- }
- 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)) {
</del><ins>+ skinny_session_process_dest(session, listener, line_instance, NULL, '\0', 0);
+ break;
+ case SOFTKEY_HOLD:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
</ins><span class="cx">
</span><del>- 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 */
- }
- }
-
- if(!listener->session[line]) { /*the line is not busy */
- switch(request->data.soft_key_event.event) {
- 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;
- case SOFTKEY_NEWCALL:
- skinny_create_session(listener, line, SKINNY_KEY_SET_OFF_HOOK);
- break;
- default:
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
- "Unknown SoftKeyEvent type while not busy: %d.\n", request->data.soft_key_event.event);
- }
- } else { /* the line is busy */
- if(skinny_line_get_state(listener, line) == SKINNY_KEY_SET_ON_HOLD) {
- skinny_unhold_line(listener, line);
- }
- switch(request->data.soft_key_event.event) {
- case SOFTKEY_ANSWER:
- skinny_answer(listener->session[line]);
- break;
- case SOFTKEY_ENDCALL:
- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ if(session) {
+ status = skinny_session_hold_line(session, listener, line_instance);
+ }
+ break;
+ case SOFTKEY_ENDCALL:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
</ins><span class="cx">
</span><del>- switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</del><ins>+ if(session) {
+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- break;
- default:
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
- "Unknown SoftKeyEvent type while busy: %d.\n", request->data.soft_key_event.event);
- }
</del><ins>+ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+ }
+ break;
+ case SOFTKEY_RESUME:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
+
+ if(session) {
+ status = skinny_session_unhold_line(session, listener, line_instance);
+ }
+ break;
+ case SOFTKEY_ANSWER:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
+
+ if(session) {
+ status = skinny_session_answer(session, listener, line_instance);
+ }
+ break;
+ default:
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Unknown SoftKeyEvent type while busy: %d.\n", request->data.soft_key_event.event);
</ins><span class="cx"> }
</span><ins>+
+ if(session) {
+ switch_core_session_rwunlock(session);
+ }
+
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_off_hook_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- skinny_profile_t *profile;
- uint32_t line;
</del><ins>+ uint32_t line_instance;
+ switch_core_session_t *session = NULL;
+ private_t *tech_pvt = NULL;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.off_hook));
</span><span class="cx">
</span><del>- if(request->data.off_hook.line_instance) {
- line = request->data.off_hook.line_instance;
</del><ins>+ if(request->data.off_hook.line_instance > 0) {
+ line_instance = request->data.off_hook.line_instance;
</ins><span class="cx"> } else {
</span><del>- line = 1;
</del><ins>+ line_instance = 1;
</ins><span class="cx"> }
</span><del>- if(listener->session[line]) { /*answering a call */
- skinny_answer(listener->session[line]);
</del><ins>+
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.off_hook.call_id);
+
+ if(session) { /*answering a call */
+ skinny_session_answer(session, listener, line_instance);
</ins><span class="cx"> } else { /* start a new call */
</span><del>- skinny_create_session(listener, line, SKINNY_KEY_SET_OFF_HOOK);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+
+ skinny_session_process_dest(session, listener, line_instance, NULL, '\0', 0);
</ins><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- skinny_profile_t *profile;
</del><span class="cx"> struct speed_dial_stat_res_message *button = NULL;
</span><del>- uint32_t line = 0;
- private_t *tech_pvt = NULL;
</del><ins>+ uint32_t line_instance = 0;
+ uint32_t call_id = 0;
+ switch_core_session_t *session = NULL;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
</del><ins>+ skinny_check_data_length(request, sizeof(request->data.stimulus)-sizeof(request->data.stimulus.call_id));
</ins><span class="cx">
</span><del>- profile = listener->profile;
</del><ins>+ if(skinny_check_data_length_soft(request, sizeof(request->data.stimulus))) {
+ call_id = request->data.stimulus.call_id;
+ }
</ins><span class="cx">
</span><del>- skinny_check_data_length(request, sizeof(request->data.stimulus));
-
- 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;
- }
</del><span class="cx"> switch(request->data.stimulus.instance_type) {
</span><span class="cx"> case SKINNY_BUTTON_LAST_NUMBER_REDIAL:
</span><del>- 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);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ skinny_session_process_dest(session, listener, line_instance, "redial", '\0', 0);
</ins><span class="cx"> break;
</span><span class="cx"> case SKINNY_BUTTON_VOICEMAIL:
</span><del>- 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, "vmain");
- skinny_process_dest(listener, line);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ skinny_session_process_dest(session, listener, line_instance, "vmain", '\0', 0);
</ins><span class="cx"> break;
</span><span class="cx"> case SKINNY_BUTTON_SPEED_DIAL:
</span><span class="cx"> skinny_speed_dial_get(listener, request->data.stimulus.instance, &button);
</span><span class="cx"> if(strlen(button->line) > 0) {
</span><del>- 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, button->line);
- skinny_process_dest(listener, line);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ skinny_session_process_dest(session, listener, line_instance, button->line, '\0', 0);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -1774,35 +2012,21 @@
</span><span class="cx"> switch_status_t skinny_handle_open_receive_channel_ack_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>- skinny_profile_t *profile;
- uint32_t line = 0;
</del><ins>+ uint32_t line_instance = 0;
+ switch_core_session_t *session;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.open_receive_channel_ack));
</span><span class="cx">
</span><del>- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(listener->session[i]) {
- private_t *tech_pvt = NULL;
- tech_pvt = switch_core_session_get_private(listener->session[i]);
-
- if(tech_pvt->party_id == request->data.open_receive_channel_ack.pass_thru_party_id) {
- line = i;
- }
- }
- }
</del><ins>+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.open_receive_channel_ack.pass_thru_party_id);
</ins><span class="cx">
</span><del>- if(listener->session[line]) {
</del><ins>+ if(session) {
</ins><span class="cx"> const char *err = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> struct in_addr addr;
</span><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- channel = switch_core_session_get_channel(listener->session[line]);
</del><ins>+ tech_pvt = switch_core_session_get_private(session);
+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><span class="cx"> /* Codec */
</span><span class="cx"> tech_pvt->iananame = "PCMU"; /* TODO */
</span><span class="lines">@@ -1810,7 +2034,7 @@
</span><span class="cx"> tech_pvt->rm_rate = 8000; /* TODO */
</span><span class="cx"> tech_pvt->rm_fmtp = NULL; /* TODO */
</span><span class="cx"> tech_pvt->agreed_pt = (switch_payload_t) 0; /* TODO */
</span><del>- tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), "");
</del><ins>+ tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(session), "");
</ins><span class="cx"> skinny_tech_set_codec(tech_pvt, 0);
</span><span class="cx"> if ((status = skinny_tech_set_codec(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> goto end;
</span><span class="lines">@@ -1821,7 +2045,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>- tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), listener->profile->ip);
</del><ins>+ tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(session), listener->profile->ip);
</ins><span class="cx">
</span><span class="cx"> tech_pvt->remote_sdp_audio_ip = inet_ntoa(request->data.open_receive_channel_ack.ip);
</span><span class="cx"> tech_pvt->remote_sdp_audio_port = request->data.open_receive_channel_ack.port;
</span><span class="lines">@@ -1834,7 +2058,7 @@
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet,
</span><span class="cx"> tech_pvt->codec_ms * 1000,
</span><span class="cx"> (switch_rtp_flag_t) 0, "soft", &err,
</span><del>- switch_core_session_get_pool(listener->session[line]));
</del><ins>+ switch_core_session_get_pool(session));
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG,
</span><span class="cx"> "AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
</span><span class="cx"> switch_channel_get_name(channel),
</span><span class="lines">@@ -1858,7 +2082,12 @@
</span><span class="cx"> 0, /* uint16_t max_frames_per_packet, */
</span><span class="cx"> 0 /* uint32_t g723_bitrate */
</span><span class="cx"> );
</span><ins>+ if (switch_channel_get_state(channel) == CS_NEW) {
+ switch_channel_set_state(channel, CS_INIT);
+ }
</ins><span class="cx"> switch_channel_mark_answered(channel);
</span><ins>+
+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><span class="cx"> end:
</span><span class="cx"> return status;
</span><span class="lines">@@ -1866,35 +2095,28 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_keypad_button_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- uint32_t line = 0;
</del><ins>+ uint32_t line_instance = 0;
+ switch_core_session_t *session;
</ins><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.keypad_button));
</span><ins>+
+ if(request->data.keypad_button.line_instance) {
+ line_instance = request->data.keypad_button.line_instance;
+ } else {
+ line_instance = 1;
+ }
</ins><span class="cx">
</span><del>- /* Choose the specified line */
- line = request->data.keypad_button.line_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;
- }
- if(listener->session[line]) {
</del><ins>+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.keypad_button.call_id);
+
+ if(session) {
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> char digit = '\0';
</span><span class="cx">
</span><del>- 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);
</del><ins>+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[line]), SWITCH_LOG_DEBUG, "SEND DTMF ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SEND DTMF ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</ins><span class="cx">
</span><span class="cx"> if (request->data.keypad_button.button == 14) {
</span><span class="cx"> digit = '*';
</span><span class="lines">@@ -1903,21 +2125,14 @@
</span><span class="cx"> } else if (request->data.keypad_button.button >= 0 && request->data.keypad_button.button <= 9) {
</span><span class="cx"> digit = '0' + request->data.keypad_button.button;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[line]), SWITCH_LOG_WARNING, "UNKNOW DTMF RECEIVED ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "UNKNOW DTMF RECEIVED ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* TODO check call_id and line */
</span><span class="cx">
</span><del>- 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)) {
- if(strlen(tech_pvt->dest) == 0) {/* first digit */
- stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, tech_pvt->call_id);
- }
</del><ins>+ if((skinny_line_get_state(listener, line_instance, tech_pvt->call_id) == SKINNY_OFF_HOOK)) {
</ins><span class="cx">
</span><del>- tech_pvt->dest[strlen(tech_pvt->dest)] = digit;
-
- skinny_process_dest(listener, tech_pvt->line);
</del><ins>+ skinny_session_process_dest(session, listener, line_instance, NULL, digit, 0);
</ins><span class="cx"> } else {
</span><span class="cx"> if(digit != '\0') {
</span><span class="cx"> switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0)};
</span><span class="lines">@@ -1925,6 +2140,7 @@
</span><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1933,35 +2149,23 @@
</span><span class="cx"> switch_status_t skinny_handle_on_hook_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>- skinny_profile_t *profile;
- uint32_t line = 0;
</del><ins>+ switch_core_session_t *session = NULL;
+ uint32_t line_instance = 0;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.on_hook));
</span><span class="cx">
</span><del>- if(request->data.on_hook.line_instance != 0) {
- line = request->data.on_hook.line_instance;
- } else {
- /* Find first active line */
- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(listener->session[i]) {
- line = i;
- break;
- }
- }
- }
</del><ins>+ line_instance = request->data.on_hook.line_instance;
+
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.on_hook.call_id);
</ins><span class="cx">
</span><del>- if(listener->session[line]) {
</del><ins>+ if(session) {
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><ins>+
+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><span class="cx"> return status;
</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 (17153 => 17154)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-04-01 08:30:12 UTC (rev 17153)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-04-01 17:22:02 UTC (rev 17154)
</span><span class="lines">@@ -59,6 +59,9 @@
</span><span class="cx">
</span><span class="cx"> /* PortMessage */
</span><span class="cx"> #define PORT_MESSAGE 0x0002
</span><ins>+struct port_message {
+ uint16_t port;
+};
</ins><span class="cx">
</span><span class="cx"> /* KeypadButtonMessage */
</span><span class="cx"> #define KEYPAD_BUTTON_MESSAGE 0x0003
</span><span class="lines">@@ -73,14 +76,14 @@
</span><span class="cx"> struct stimulus_message {
</span><span class="cx"> uint32_t instance_type; /* See enum skinny_button_definition */
</span><span class="cx"> uint32_t instance;
</span><del>- /* uint32_t call_reference; */
</del><ins>+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* OffHookMessage */
</span><span class="cx"> #define OFF_HOOK_MESSAGE 0x0006
</span><span class="cx"> struct off_hook_message {
</span><span class="cx"> uint32_t line_instance;
</span><del>- /* uint32_t call_id; */
</del><ins>+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* OnHookMessage */
</span><span class="lines">@@ -150,7 +153,7 @@
</span><span class="cx"> struct soft_key_event_message {
</span><span class="cx"> uint32_t event;
</span><span class="cx"> uint32_t line_instance;
</span><del>- uint32_t callreference;
</del><ins>+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* UnregisterMessage */
</span><span class="lines">@@ -186,10 +189,10 @@
</span><span class="cx"> /* RegisterAckMessage */
</span><span class="cx"> #define REGISTER_ACK_MESSAGE 0x0081
</span><span class="cx"> struct register_ack_message {
</span><del>- uint32_t keepAlive;
- char dateFormat[6];
</del><ins>+ uint32_t keep_alive;
+ char date_format[6];
</ins><span class="cx"> char reserved[2];
</span><del>- uint32_t secondaryKeepAlive;
</del><ins>+ uint32_t secondary_keep_alive;
</ins><span class="cx"> char reserved2[4];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -214,7 +217,8 @@
</span><span class="cx"> struct set_ringer_message {
</span><span class="cx"> uint32_t ring_type; /* See enum skinny_ring_type */
</span><span class="cx"> uint32_t ring_mode; /* See enum skinny_ring_mode */
</span><del>- uint32_t unknown; /* ?? */
</del><ins>+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SetLampMessage */
</span><span class="lines">@@ -470,6 +474,14 @@
</span><span class="cx"> uint32_t status;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* DisplayPriNotifyMessage */
+#define DISPLAY_PRI_NOTIFY_MESSAGE 0x0120
+struct display_pri_notify_message {
+ uint32_t message_timeout;
+ uint32_t priority;
+ char notify[32];
+};
+
</ins><span class="cx"> /* ServiceUrlStatMessage */
</span><span class="cx"> #define SERVICE_URL_STAT_RES_MESSAGE 0x012F
</span><span class="cx"> struct service_url_stat_res_message {
</span><span class="lines">@@ -487,6 +499,7 @@
</span><span class="cx">
</span><span class="cx"> union skinny_data {
</span><span class="cx"> struct register_message reg;
</span><ins>+ struct port_message port;
</ins><span class="cx"> struct keypad_button_message keypad_button;
</span><span class="cx"> struct stimulus_message stimulus;
</span><span class="cx"> struct off_hook_message off_hook;
</span><span class="lines">@@ -529,6 +542,7 @@
</span><span class="cx"> struct unregister_ack_message unregister_ack;
</span><span class="cx"> struct dialed_number_message dialed_number;
</span><span class="cx"> struct feature_stat_res_message feature_res;
</span><ins>+ struct display_pri_notify_message display_pri_notify;
</ins><span class="cx"> struct service_url_stat_res_message service_url_res;
</span><span class="cx">
</span><span class="cx"> uint16_t as_uint16;
</span><span class="lines">@@ -598,16 +612,24 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received Too Short Skinny Message (Expected %" SWITCH_SIZE_T_FMT ", got %d).\n", len+4, message->length);\
</span><span class="cx"> return SWITCH_STATUS_FALSE;\
</span><span class="cx"> }
</span><ins>+#define skinny_check_data_length_soft(message, len) \
+ (message->length >= len+4)
</ins><span class="cx">
</span><span class="cx"> switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req);
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_device_event(listener_t *listener, switch_event_t **ev, switch_event_types_t event_id, const char *subclass_name);
</span><span class="cx">
</span><del>-switch_status_t skinny_send_call_info(switch_core_session_t *session);
</del><ins>+switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_walk_lines(skinny_profile_t *profile, char *channel_uuid, switch_core_db_callback_func_t callback, void *data);
+switch_call_cause_t skinny_ring_lines(private_t *tech_pvt);
</ins><span class="cx">
</span><del>-switch_status_t skinny_create_session(listener_t *listener, uint32_t line, uint32_t to_state);
-switch_status_t skinny_process_dest(listener_t *listener, uint32_t line);
-switch_status_t skinny_answer(switch_core_session_t *session);
</del><ins>+switch_status_t skinny_create_ingoing_session(listener_t *listener, uint32_t *line_instance, switch_core_session_t **session);
+switch_status_t skinny_session_process_dest(switch_core_session_t *session, listener_t *listener, uint32_t line_instance, char *dest, char append_dest, uint32_t backspace);
+switch_status_t skinny_session_ring_out(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_start_media(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_hold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_unhold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
</ins><span class="cx">
</span><span class="cx"> void skinny_line_get(listener_t *listener, uint32_t instance, struct line_stat_res_message **button);
</span><span class="cx"> void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed_dial_stat_res_message **button);
</span><span class="lines">@@ -631,7 +653,8 @@
</span><span class="cx"> switch_status_t set_ringer(listener_t *listener,
</span><span class="cx"> uint32_t ring_type,
</span><span class="cx"> uint32_t ring_mode,
</span><del>- uint32_t unknown);
</del><ins>+ uint32_t line_instance,
+ uint32_t call_id);
</ins><span class="cx"> switch_status_t set_lamp(listener_t *listener,
</span><span class="cx"> uint32_t stimulus,
</span><span class="cx"> uint32_t stimulus_instance,
</span><span class="lines">@@ -710,6 +733,10 @@
</span><span class="cx"> char called_party[24],
</span><span class="cx"> uint32_t line_instance,
</span><span class="cx"> uint32_t call_id);
</span><ins>+switch_status_t send_display_pri_notify(listener_t *listener,
+ uint32_t message_timeout,
+ uint32_t priority,
+ char *notify);
</ins><span class="cx"> switch_status_t send_reset(listener_t *listener,
</span><span class="cx"> uint32_t reset_type);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c (17153 => 17154)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c 2010-04-01 08:30:12 UTC (rev 17153)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c 2010-04-01 17:22:02 UTC (rev 17154)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> {"ResetMessage", RESET_MESSAGE},
</span><span class="cx"> {"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
</span><span class="cx"> {"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
</span><del>- {"OCloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
</del><ins>+ {"CloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
</ins><span class="cx"> {"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
</span><span class="cx"> {"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
</span><span class="cx"> {"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
</span><span class="cx"> {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
</span><span class="cx"> {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
</span><ins>+ {"DisplayPriNotifyMessage", DISPLAY_PRI_NOTIFY_MESSAGE},
</ins><span class="cx"> {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
</span><span class="cx"> {NULL, 0}
</span><span class="cx"> };
</span><span class="lines">@@ -168,13 +169,13 @@
</span><span class="cx"> {"RingIn", SKINNY_RING_IN},
</span><span class="cx"> {"Connected", SKINNY_CONNECTED},
</span><span class="cx"> {"Busy", SKINNY_BUSY},
</span><del>- {"Congestion", SKINNY_CONGESTION},
</del><ins>+ {"LineInUse", SKINNY_LINE_IN_USE},
</ins><span class="cx"> {"Hold", SKINNY_HOLD},
</span><span class="cx"> {"CallWaiting", SKINNY_CALL_WAITING},
</span><span class="cx"> {"CallTransfer", SKINNY_CALL_TRANSFER},
</span><span class="cx"> {"CallPark", SKINNY_CALL_PARK},
</span><span class="cx"> {"Proceed", SKINNY_PROCEED},
</span><del>- {"CallRemoteMultiline", SKINNY_CALL_REMOTE_MULTILINE},
</del><ins>+ {"InUseRemotely", SKINNY_IN_USE_REMOTELY},
</ins><span class="cx"> {"InvalidNumber", SKINNY_INVALID_NUMBER},
</span><span class="cx"> {NULL, 0}
</span><span class="cx"> };
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h (17153 => 17154)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h 2010-04-01 08:30:12 UTC (rev 17153)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h 2010-04-01 17:22:02 UTC (rev 17154)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-struct skinny_table SKINNY_MESSAGE_TYPES[55];
</del><ins>+struct skinny_table SKINNY_MESSAGE_TYPES[56];
</ins><span class="cx"> const char *skinny_message_type2str(uint32_t id);
</span><span class="cx"> uint32_t skinny_str2message_type(const char *str);
</span><span class="cx"> #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
</span><span class="lines">@@ -210,13 +210,13 @@
</span><span class="cx"> SKINNY_RING_IN = 4,
</span><span class="cx"> SKINNY_CONNECTED = 5,
</span><span class="cx"> SKINNY_BUSY = 6,
</span><del>- SKINNY_CONGESTION = 7,
</del><ins>+ SKINNY_LINE_IN_USE = 7,
</ins><span class="cx"> SKINNY_HOLD = 8,
</span><span class="cx"> SKINNY_CALL_WAITING = 9,
</span><span class="cx"> SKINNY_CALL_TRANSFER = 10,
</span><span class="cx"> SKINNY_CALL_PARK = 11,
</span><span class="cx"> SKINNY_PROCEED = 12,
</span><del>- SKINNY_CALL_REMOTE_MULTILINE = 13,
</del><ins>+ SKINNY_IN_USE_REMOTELY = 13,
</ins><span class="cx"> SKINNY_INVALID_NUMBER = 14
</span><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_CALL_STATES[15];
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>