<!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][16781] </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=16781">16781</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:04:25 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: M3: Calls management: Each line has a session
- Each line as its session
- USER_BUSY if line is busy
- properly guess device and line to ring</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (16780 => 16781)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:04:16 UTC (rev 16780)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:04:25 UTC (rev 16781)
</span><span class="lines">@@ -512,11 +512,12 @@
</span><span class="cx"> SKINNY_BUTTON_UNDEFINED = 0xFF,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#define SKINNY_MAX_BUTTON_COUNT 42
</ins><span class="cx"> struct button_template_message {
</span><span class="cx"> uint32_t button_offset;
</span><span class="cx"> uint32_t button_count;
</span><span class="cx"> uint32_t total_button_count;
</span><del>- struct button_definition btn[42];
</del><ins>+ struct button_definition btn[SKINNY_MAX_BUTTON_COUNT];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* CapabilitiesReqMessage */
</span><span class="lines">@@ -820,11 +821,10 @@
</span><span class="cx"> struct listener {
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> char device_name[16];
</span><del>- switch_core_session_t *outgoing_session;
</del><ins>+ switch_core_session_t *session[SKINNY_MAX_BUTTON_COUNT];
</ins><span class="cx">
</span><span class="cx"> switch_socket_t *sock;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><del>- switch_core_session_t *session;
</del><span class="cx"> switch_thread_rwlock_t *rwlock;
</span><span class="cx"> switch_sockaddr_t *sa;
</span><span class="cx"> char remote_ip[50];
</span><span class="lines">@@ -844,6 +844,11 @@
</span><span class="cx"> /* FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><ins>+/* SQL FUNCTIONS */
+static void skinny_execute_sql(skinny_profile_t *profile, char *sql, switch_mutex_t *mutex);
+static switch_bool_t skinny_execute_sql_callback(skinny_profile_t *profile,
+ switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
+
</ins><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> static switch_status_t channel_on_init(switch_core_session_t *session);
</span><span class="cx"> static switch_status_t channel_on_hangup(switch_core_session_t *session);
</span><span class="lines">@@ -999,6 +1004,55 @@
</span><span class="cx"> return (skinny_profile_t *) switch_core_hash_find(globals.profile_hash, profile_name);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct skinny_profile_find_listener_helper {
+ skinny_profile_t *profile;
+ listener_t *listener;
+ uint32_t line;
+};
+
+static int skinny_profile_find_listener_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ 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]);
+
+ switch_mutex_lock(profile->listener_mutex);
+ for (listener_t *l = profile->listeners; l; l = l->next) {
+ if (!strcmp(l->device_name, device_name)) {
+ helper->listener = l;
+ }
+ }
+ switch_mutex_unlock(profile->listener_mutex);
+ if(helper->listener) {
+ helper->line = relative_position;
+ }
+ return 0;
+}
+
+static switch_status_t skinny_profile_find_listener(skinny_profile_t *profile, const char *dest, listener_t **l, uint32_t *line)
+{
+ char *sql;
+ struct skinny_profile_find_listener_helper helper = {0};
+ helper.profile = profile;
+
+ if ((sql = switch_mprintf("SELECT device_name, position, "
+ "(SELECT count(*) from skinny_buttons sb2 "
+ "WHERE sb2.device_name= sb1.device_name AND sb2.type='line' AND sb2.position <= sb1.position) AS relative_position "
+ "FROM skinny_buttons sb1 WHERE type='line' and value='%s'",
+ dest))) {
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_profile_find_listener_callback, &helper);
+ switch_safe_free(sql);
+ }
+
+
+ *line = helper.line;
+ *l = helper.listener;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* SQL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -1621,19 +1675,30 @@
</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>- /* TODO: find listener(s) based on profile and dest */
- tech_pvt->listener = profile->listeners;
-
</del><ins>+ if ((skinny_profile_find_listener(profile, dest, &tech_pvt->listener, &tech_pvt->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;
+ }
+
</ins><span class="cx"> if (!tech_pvt->listener) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid destination %s in profile %s\n", dest, profile_name);
</del><ins>+ 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);
</ins><span class="cx"> cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* TODO find line */
- tech_pvt->line = 1;
</del><ins>+ if (tech_pvt->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;
+ }
</ins><span class="cx">
</span><del>- tech_pvt->listener->outgoing_session = nsession;
</del><ins>+ 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;
+ goto error;
+ }
+ tech_pvt->listener->session[tech_pvt->line] = nsession;
</ins><span class="cx"> send_call_state(tech_pvt->listener, SKINNY_RING_IN, tech_pvt->line, tech_pvt->call_id);
</span><span class="cx"> send_select_soft_keys(tech_pvt->listener, tech_pvt->line, tech_pvt->call_id,
</span><span class="cx"> SKINNY_KEY_SET_RING_IN, 0xffff);
</span><span class="lines">@@ -2800,6 +2865,7 @@
</span><span class="cx"> static switch_status_t skinny_handle_off_hook_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_profile_t *profile;
</span><ins>+ uint32_t line;
</ins><span class="cx">
</span><span class="cx"> switch_assert(listener->profile);
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="lines">@@ -2808,14 +2874,14 @@
</span><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.off_hook));
</span><span class="cx">
</span><del>- if(listener->outgoing_session) { /*answering a call */
</del><ins>+ if(request->data.off_hook.line_instance) {
+ line = request->data.off_hook.line_instance;
+ } else {
+ line = 1;
+ }
+ if(listener->session[line]) { /*answering a call */
</ins><span class="cx"> private_t *tech_pvt = NULL;
</span><del>- tech_pvt = switch_core_session_get_private(listener->outgoing_session);
- if(request->data.off_hook.line_instance) {
- tech_pvt->line = request->data.off_hook.line_instance;
- } else {
- tech_pvt->line = 1;
- }
</del><ins>+ tech_pvt = switch_core_session_get_private(listener->session[line]);
</ins><span class="cx"> set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0); /* TODO : here ? */
</span><span class="cx"> stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
</span><span class="cx"> open_receive_channel(listener,
</span><span class="lines">@@ -2850,6 +2916,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> skinny_profile_t *profile;
</span><ins>+ uint32_t line;
</ins><span class="cx">
</span><span class="cx"> switch_assert(listener->profile);
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="lines">@@ -2858,14 +2925,25 @@
</span><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.open_receive_channel_ack));
</span><span class="cx">
</span><del>- if(listener->outgoing_session) {
</del><ins>+ 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;
+ }
+ }
+ }
+
+ if(listener->session[line]) {
</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->outgoing_session);
- channel = switch_core_session_get_channel(listener->outgoing_session);
</del><ins>+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ channel = switch_core_session_get_channel(listener->session[line]);
</ins><span class="cx">
</span><span class="cx"> /* Codec */
</span><span class="cx"> tech_pvt->iananame = "PCMU"; /* TODO */
</span><span class="lines">@@ -2873,7 +2951,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->outgoing_session), "");
</del><ins>+ tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), "");
</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">@@ -2884,7 +2962,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->outgoing_session), listener->profile->ip);
</del><ins>+ tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), 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">@@ -2897,7 +2975,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->outgoing_session));
</del><ins>+ switch_core_session_get_pool(listener->session[line]));
</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">@@ -2929,22 +3007,35 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t skinny_handle_keypad_button_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><ins>+ uint32_t line;
+
</ins><span class="cx"> skinny_check_data_length(request, sizeof(request->data.keypad_button));
</span><span class="cx">
</span><del>- if(listener->outgoing_session) {
</del><ins>+ if(request->data.keypad_button.line_instance) {
+ line = request->data.keypad_button.line_instance;
+ } else {
+ /* Find first active line */
+ for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
+ if(listener->session[i]) {
+ line = i;
+ break;
+ }
+ }
+ }
+ if(listener->session[line]) {
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0)};
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->outgoing_session);
</del><ins>+ channel = switch_core_session_get_channel(listener->session[line]);
</ins><span class="cx"> assert(channel != NULL);
</span><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->outgoing_session);
</del><ins>+ tech_pvt = switch_core_session_get_private(listener->session[line]);
</ins><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><span class="cx"> /* TODO check call_id and line */
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->outgoing_session), 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(listener->session[line]), 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"> dtmf.digit = '*';
</span><span class="lines">@@ -2956,7 +3047,7 @@
</span><span class="cx"> dtmf.digit = '0' + request->data.keypad_button.button;
</span><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->outgoing_session), SWITCH_LOG_WARN, "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(listener->session[line]), 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">
</span><span class="lines">@@ -2967,6 +3058,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> skinny_profile_t *profile;
</span><ins>+ uint32_t line;
</ins><span class="cx">
</span><span class="cx"> switch_assert(listener->profile);
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="lines">@@ -2975,14 +3067,26 @@
</span><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.on_hook));
</span><span class="cx">
</span><del>- if(listener->outgoing_session) {
</del><ins>+ if(request->data.on_hook.line_instance) {
+ 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;
+ }
+ }
+ }
+
+ if(listener->session[line]) {
</ins><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->outgoing_session);
</del><ins>+ channel = switch_core_session_get_channel(listener->session[line]);
</ins><span class="cx"> assert(channel != NULL);
</span><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->outgoing_session);
</del><ins>+ tech_pvt = switch_core_session_get_private(listener->session[line]);
</ins><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><span class="cx"> switch_clear_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="lines">@@ -3232,10 +3336,10 @@
</span><span class="cx"> {
</span><span class="cx"> listener_t *listener = (listener_t *) obj;
</span><span class="cx"> switch_status_t status;
</span><del>- switch_core_session_t *session = NULL;
- switch_channel_t *channel = NULL;
</del><span class="cx"> skinny_message_t *request = NULL;
</span><span class="cx"> skinny_profile_t *profile;
</span><ins>+ int destroy_pool = 1;
+
</ins><span class="cx"> switch_assert(listener);
</span><span class="cx"> assert(listener->profile);
</span><span class="cx"> profile = listener->profile;
</span><span class="lines">@@ -3246,20 +3350,14 @@
</span><span class="cx">
</span><span class="cx"> switch_assert(listener != NULL);
</span><span class="cx">
</span><del>- if ((session = listener->session)) {
- if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
- goto done;
- }
- }
-
</del><span class="cx"> switch_socket_opt_set(listener->sock, SWITCH_SO_TCP_NODELAY, TRUE);
</span><span class="cx"> switch_socket_opt_set(listener->sock, SWITCH_SO_NONBLOCK, TRUE);
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><span class="cx"> if (zstr(listener->remote_ip)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Connection Open\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open\n");
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Connection Open from %s:%d\n", listener->remote_ip, listener->remote_port);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open from %s:%d\n", listener->remote_ip, listener->remote_port);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3273,7 +3371,7 @@
</span><span class="cx"> status = skinny_read_packet(listener, &request);
</span><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Socket Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Socket Error!\n");
</ins><span class="cx"> switch_clear_flag_locked(listener, LFLAG_RUNNING);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3289,21 +3387,15 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- done:
-
</del><span class="cx"> remove_listener(listener);
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_thread_rwlock_wrlock(listener->rwlock);
</span><span class="cx"> flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx">
</span><del>- if (listener->session) {
- channel = switch_core_session_get_channel(listener->session);
- }
-
</del><span class="cx"> if (listener->sock) {
</span><span class="cx"> close_socket(&listener->sock, profile);
</span><span class="cx"> }
</span><span class="lines">@@ -3311,18 +3403,27 @@
</span><span class="cx"> switch_thread_rwlock_unlock(listener->rwlock);
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Connection Closed\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (listener->session) {
- switch_channel_clear_flag(switch_core_session_get_channel(listener->session), CF_CONTROLLED);
- //TODO switch_clear_flag_locked(listener, LFLAG_SESSION);
- switch_core_session_rwunlock(listener->session);
- } else if (listener->pool) {
</del><ins>+ for(int line = 0 ; line < SKINNY_MAX_BUTTON_COUNT ; line++) {
+ if(listener->session[line]) {
+ switch_channel_clear_flag(switch_core_session_get_channel(listener->session[line]), CF_CONTROLLED);
+ //TODO switch_clear_flag_locked(listener, LFLAG_SESSION);
+ switch_core_session_rwunlock(listener->session[line]);
+ destroy_pool = 0;
+ }
+ }
+ if(destroy_pool == 0) {
+ goto no_destroy_pool;
+ }
+ if (listener->pool) {
</ins><span class="cx"> switch_memory_pool_t *pool = listener->pool;
</span><span class="cx"> switch_core_destroy_memory_pool(&pool);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+no_destroy_pool:
+
</ins><span class="cx"> switch_mutex_lock(profile->listener_mutex);
</span><span class="cx"> profile->listener_threads--;
</span><span class="cx"> switch_mutex_unlock(profile->listener_mutex);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>