Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (17154 => 17155)
--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-01 17:22:02 UTC (rev 17154)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-01 18:07:31 UTC (rev 17155)
@@ -65,7 +65,6 @@
" device_name VARCHAR(16),\n"
" device_instance INTEGER,\n"
" position INTEGER,\n"
- " line_instance INTEGER,\n"
" label VARCHAR(40),\n"
" value VARCHAR(24),\n"
" caller_name VARCHAR(44),\n"
@@ -89,16 +88,6 @@
" settings VARCHAR(44)\n"
");\n";
-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";
-
/*****************************************************************************/
/* PROFILES FUNCTIONS */
/*****************************************************************************/
@@ -149,106 +138,48 @@
return SWITCH_STATUS_SUCCESS;
}
-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;
+struct skinny_profile_find_listener_helper {
+ skinny_profile_t *profile;
+ listener_t *listener;
+ uint32_t line;
};
-int skinny_profile_find_session_uuid_callback(void *pArg, int argc, char **argv, char **columnNames)
+static int skinny_profile_find_listener_callback(void *pArg, int argc, char **argv, char **columnNames)
{
- struct skinny_profile_find_session_uuid_helper *helper = pArg;
+ 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]);
- char *channel_uuid = argv[0];
- uint32_t line_instance = atoi(argv[1]);
+ skinny_profile_find_listener_by_device_name(profile, device_name, &helper->listener);
- if(helper->channel_uuid == NULL) {
- helper->channel_uuid = switch_mprintf("%s", channel_uuid);
- helper->line_instance = line_instance;
- }
-
- return 0;
+ if(helper->listener) {
+ helper->line = relative_position;
+ }
+ return 0;
}
-char * skinny_profile_find_session_uuid(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id)
+static switch_status_t skinny_profile_find_listener_by_dest(skinny_profile_t *profile, const char *dest, listener_t **l, uint32_t *line)
{
- struct skinny_profile_find_session_uuid_helper helper = {0};
char *sql;
- char *device_condition = NULL;
- char *line_instance_condition = NULL;
- char *call_id_condition = NULL;
-
- switch_assert(profile);
+ struct skinny_profile_find_listener_helper helper = {0};
helper.profile = profile;
- helper.channel_uuid = NULL;
- 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);
+ 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);
switch_safe_free(sql);
}
- 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;
-}
-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);
- 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;
+ *line = helper.line;
+ *l = helper.listener;
+
+ return SWITCH_STATUS_SUCCESS;
}
/*****************************************************************************/
@@ -331,73 +262,28 @@
/*****************************************************************************/
/* CHANNEL FUNCTIONS */
/*****************************************************************************/
-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)
+uint32_t skinny_line_perform_set_state(listener_t *listener, const char *file, const char *func, int line, uint32_t instance, uint32_t state, uint32_t call_id)
{
- switch_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);
+ switch_assert(listener);
+
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG,
- "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);
-}
+ "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);
-
-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;
+ send_select_soft_keys(listener, instance, call_id, state, 0xffff);
+ listener->line_state[instance] = state;
+
+ return listener->line_state[instance];
}
-uint32_t skinny_line_get_state(listener_t *listener, uint32_t line_instance, uint32_t call_id)
+uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance)
{
- char *line_instance_condition;
- char *call_id_condition;
- char *sql;
- struct skinny_line_get_state_helper helper = {0};
+ switch_assert(listener);
- 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;
+ return listener->line_state[instance];
}
-
-
switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force)
{
int ms;
@@ -472,7 +358,9 @@
tech_pvt->read_impl.microseconds_per_packet,
tech_pvt->read_impl.samples_per_packet
) != SWITCH_STATUS_SUCCESS) {
- switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session);
+ switch_channel_t *channel = NULL;
+ channel = switch_core_session_get_channel(tech_pvt->session);
+ assert(channel != NULL);
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
switch_goto_status(SWITCH_STATUS_FALSE, end);
@@ -519,19 +407,28 @@
return status;
}
-void tech_init(private_t *tech_pvt, skinny_profile_t *profile, switch_core_session_t *session)
+void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line)
{
+ struct line_stat_res_message *button = NULL;
+
switch_assert(tech_pvt);
switch_assert(session);
+ switch_assert(listener);
tech_pvt->read_frame.data = tech_pvt->databuf;
tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
- tech_pvt->call_id = ++profile->next_call_id;
- tech_pvt->profile = profile;
+ tech_pvt->call_id = listener->profile->next_call_id++;
+ tech_pvt->listener = listener;
+ tech_pvt->line = line;
switch_core_session_set_private(session, tech_pvt);
tech_pvt->session = session;
+
+ 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);
}
/*
@@ -541,9 +438,14 @@
*/
switch_status_t channel_on_init(switch_core_session_t *session)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
- private_t *tech_pvt = switch_core_session_get_private(session);
+ switch_channel_t *channel;
+ private_t *tech_pvt = NULL;
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
switch_set_flag_locked(tech_pvt, TFLAG_IO);
/* Move channel's state machine to ROUTING. This means the call is trying
@@ -562,8 +464,15 @@
switch_status_t channel_on_routing(switch_core_session_t *session)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
+ 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);
+
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
return SWITCH_STATUS_SUCCESS;
@@ -571,8 +480,16 @@
switch_status_t channel_on_execute(switch_core_session_t *session)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
+ 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);
+
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
@@ -581,9 +498,14 @@
switch_status_t channel_on_destroy(switch_core_session_t *session)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
- private_t *tech_pvt = switch_core_session_get_private(session);
+ 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);
+
if (tech_pvt) {
if (switch_core_codec_ready(&tech_pvt->read_codec)) {
switch_core_codec_destroy(&tech_pvt->read_codec);
@@ -599,100 +521,74 @@
return SWITCH_STATUS_SUCCESS;
}
-struct channel_on_hangup_helper {
- private_t *tech_pvt;
-};
-int channel_on_hangup_callback(void *pArg, int argc, char **argv, char **columnNames)
+switch_status_t channel_on_hangup(switch_core_session_t *session)
{
- struct channel_on_hangup_helper *helper = pArg;
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
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]);
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
- 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);
-
- }
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
- 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;
-
+ listener = tech_pvt->listener;
+ assert(listener != NULL);
+
switch_clear_flag_locked(tech_pvt, TFLAG_IO);
switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
- helper.tech_pvt= tech_pvt;
+ listener->session[tech_pvt->line] = NULL;
- 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);
+ 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);
}
+ 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);
+
return SWITCH_STATUS_SUCCESS;
}
switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
- private_t *tech_pvt = switch_core_session_get_private(session);
+ 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);
+
switch (sig) {
case SWITCH_SIG_KILL:
switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
@@ -735,10 +631,16 @@
switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
- private_t *tech_pvt = switch_core_session_get_private(session);
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
int payload = 0;
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
+
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+
while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) {
if (switch_channel_ready(channel)) {
switch_yield(10000);
@@ -803,10 +705,17 @@
switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
{
- private_t *tech_pvt = switch_core_session_get_private(session);
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
//switch_frame_t *pframe;
switch_status_t status = SWITCH_STATUS_SUCCESS;
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
+
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+
if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
return SWITCH_STATUS_FALSE;
}
@@ -828,12 +737,31 @@
switch_status_t channel_answer_channel(switch_core_session_t *session)
{
+ 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);
+
+
return SWITCH_STATUS_SUCCESS;
}
switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
{
+ 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);
+
switch (msg->message_id) {
case SWITCH_MESSAGE_INDICATE_ANSWER:
{
@@ -860,7 +788,8 @@
char *profile_name, *dest;
skinny_profile_t *profile = NULL;
- char *sql;
+ listener_t *listener = NULL;
+ uint32_t line = 0;
char name[128];
switch_channel_t *channel;
switch_caller_profile_t *caller_profile;
@@ -904,8 +833,27 @@
channel = switch_core_session_get_channel(nsession);
switch_channel_set_name(channel, name);
- tech_init(tech_pvt, profile, nsession);
+ 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);
+
caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
switch_channel_set_caller_profile(channel, caller_profile);
tech_pvt->caller_profile = caller_profile;
@@ -913,23 +861,19 @@
switch_channel_set_flag(channel, CF_OUTBOUND);
switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
- 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) {
+ 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;
+ 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);
*new_session = nsession;
@@ -1073,7 +1017,7 @@
"DELETE FROM skinny_devices "
"WHERE name='%s' and instance=%d",
listener->device_name, listener->device_instance))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
@@ -1081,7 +1025,7 @@
"DELETE FROM skinny_lines "
"WHERE device_name='%s' and device_instance=%d",
listener->device_name, listener->device_instance))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
@@ -1089,7 +1033,7 @@
"DELETE FROM skinny_buttons "
"WHERE device_name='%s' and device_instance=%d",
listener->device_name, listener->device_instance))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
@@ -1128,10 +1072,9 @@
static switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream)
{
char *sql;
- if ((sql = switch_mprintf("SELECT name, user_id, instance, ip, type, max_streams, port, codec_string "
- "FROM skinny_devices WHERE name='%s'",
+ if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE name LIKE '%s'",
device_name))) {
- skinny_execute_sql_callback(profile, profile->sql_mutex, sql, dump_device_callback, stream);
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, dump_device_callback, stream);
switch_safe_free(sql);
}
@@ -1257,7 +1200,6 @@
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n");
}
- /* TODO
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);
@@ -1266,7 +1208,6 @@
destroy_pool = 0;
}
}
- */
if(destroy_pool == 0) {
goto no_destroy_pool;
}
@@ -1526,13 +1467,11 @@
switch_odbc_handle_exec(profile->master_odbc, devices_sql, NULL, NULL);
switch_odbc_handle_exec(profile->master_odbc, lines_sql, NULL, NULL);
switch_odbc_handle_exec(profile->master_odbc, buttons_sql, NULL, NULL);
- switch_odbc_handle_exec(profile->master_odbc, active_lines_sql, NULL, NULL);
} else {
if ((db = switch_core_db_open_file(profile->dbname))) {
switch_core_db_test_reactive(db, "SELECT * FROM skinny_devices", NULL, devices_sql);
switch_core_db_test_reactive(db, "SELECT * FROM skinny_lines", NULL, lines_sql);
switch_core_db_test_reactive(db, "SELECT * FROM skinny_buttons", NULL, buttons_sql);
- switch_core_db_test_reactive(db, "SELECT * FROM skinny_active_lines", NULL, active_lines_sql);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n");
continue;
@@ -1540,10 +1479,9 @@
switch_core_db_close(db);
}
- 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);
+ 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);
switch_core_hash_insert(globals.profile_hash, profile->name, profile);
profile = NULL;
@@ -1590,7 +1528,7 @@
listener_t *listener = NULL;
skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
if(listener) {
- set_ringer(listener, skinny_str2ring_type(ring_type), skinny_str2ring_mode(ring_mode), 0, 0);
+ set_ringer(listener, skinny_str2ring_type(ring_type), skinny_str2ring_mode(ring_mode), 0);
} else {
stream->write_function(stream, "Listener not found!\n");
}
@@ -1769,55 +1707,8 @@
static void event_handler(switch_event_t *event)
{
- char *subclass;
-
if (event->event_id == SWITCH_EVENT_HEARTBEAT) {
walk_listeners(kill_expired_listener, NULL);
- } 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);
- }
- }
}
}
@@ -1885,7 +1776,7 @@
if(profile) {
if ((sql = switch_mprintf("SELECT name FROM skinny_devices"))) {
- skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_list_devices_callback, &h);
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_list_devices_callback, &h);
switch_safe_free(sql);
}
}
@@ -2013,7 +1904,6 @@
profile = (skinny_profile_t *) val;
switch_mutex_init(&profile->listener_mutex, SWITCH_MUTEX_NESTED, module_pool);
- switch_mutex_init(&profile->sql_mutex, SWITCH_MUTEX_NESTED, module_pool);
switch_mutex_init(&profile->sock_mutex, SWITCH_MUTEX_NESTED, module_pool);
}
@@ -2023,11 +1913,6 @@
/* Not such severe to prevent loading */
}
- 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;
- }
-
if (switch_event_reserve_subclass(SKINNY_EVENT_REGISTER) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_REGISTER);
return SWITCH_STATUS_TERM;
@@ -2099,7 +1984,6 @@
switch_event_free_subclass(SKINNY_EVENT_REGISTER);
switch_event_unbind(&globals.heartbeat_node);
- switch_event_unbind(&globals.call_state_node);
globals.running = 0;
Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (17154 => 17155)
--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-01 17:22:02 UTC (rev 17154)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-01 18:07:31 UTC (rev 17155)
@@ -218,25 +218,23 @@
{
switch_event_t *event = (switch_event_t *) pArg;
- 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];
+ 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];
- 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);
+ 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);
return 0;
}
@@ -251,12 +249,8 @@
switch_event_create_subclass(&event, event_id, subclass_name);
switch_assert(event);
- 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);
+ 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);
switch_safe_free(sql);
}
@@ -265,30 +259,30 @@
}
/*****************************************************************************/
-switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+switch_status_t skinny_send_call_info(switch_core_session_t *session)
{
private_t *tech_pvt;
switch_channel_t *channel;
+ listener_t *listener;
char calling_party_name[40] = "UNKNOWN";
char calling_party[24] = "0000000000";
char called_party_name[40] = "UNKNOWN";
char called_party[24] = "0000000000";
- channel = switch_core_session_get_channel(session);
tech_pvt = switch_core_session_get_private(session);
+ switch_assert(tech_pvt != NULL);
+ channel = switch_core_session_get_channel(session);
+ switch_assert(channel != NULL);
+ listener = tech_pvt->listener;
+ switch_assert(listener != NULL);
+
switch_assert(tech_pvt->caller_profile != NULL);
if( switch_channel_test_flag(channel, CF_OUTBOUND) ) {
- 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);
- }
+ strncpy(calling_party_name, tech_pvt->line_displayname, 40);
+ strncpy(calling_party, tech_pvt->line_name, 24);
strncpy(called_party_name, tech_pvt->caller_profile->caller_id_name, 40);
strncpy(called_party, tech_pvt->caller_profile->caller_id_number, 24);
} else {
@@ -296,12 +290,12 @@
strncpy(calling_party, tech_pvt->caller_profile->caller_id_number, 24);
/* TODO called party */
}
- send_call_info(listener,
+ send_call_info(tech_pvt->listener,
calling_party_name, /* char calling_party_name[40], */
calling_party, /* char calling_party[24], */
called_party_name, /* char called_party_name[40], */
called_party, /* char called_party[24], */
- line_instance, /* uint32_t line_instance, */
+ tech_pvt->line, /* uint32_t line_instance, */
tech_pvt->call_id, /* uint32_t call_id, */
SKINNY_OUTBOUND_CALL, /* uint32_t call_type, */
"", /* TODO char original_called_party_name[40], */
@@ -322,427 +316,169 @@
}
/*****************************************************************************/
-switch_status_t skinny_session_walk_lines(skinny_profile_t *profile, char *channel_uuid, switch_core_db_callback_func_t callback, void *data)
+switch_status_t skinny_create_session(listener_t *listener, uint32_t line, uint32_t to_state)
{
- 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;
+ switch_core_session_t *session;
switch_channel_t *channel;
private_t *tech_pvt;
char name[128];
- char *sql;
- struct line_stat_res_message *button = NULL;
- 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;
- }
+ 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);
- skinny_line_get(listener, *line_instance_p, &button);
+ session = listener->session[line];
- 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;
- }
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
+
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+ } else {
- 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;
- }
+ 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;
+ }
- 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;
- }
+ 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;
+ }
- switch_core_session_add_stream(nsession, NULL);
+ switch_core_session_add_stream(session, NULL);
- tech_init(tech_pvt, listener->profile, nsession);
+ tech_init(tech_pvt, session, listener, line);
- channel = switch_core_session_get_channel(nsession);
+ channel = switch_core_session_get_channel(session);
- 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);
+ 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);
- 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;
- }
+ 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;
+ }
- 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;
- }
+ 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;
+ }
- switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
+ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
- 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);
}
-
- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+
+ set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
set_speaker_mode(listener, SKINNY_SPEAKER_ON);
- 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);
+ 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);
goto done;
error:
- if (nsession) {
- switch_core_session_destroy(&nsession);
+ if (session) {
+ switch_core_session_destroy(&session);
}
return SWITCH_STATUS_FALSE;
done:
- switch_core_session_rwunlock(nsession);
- *session = nsession;
+ listener->session[line] = session;
return SWITCH_STATUS_SUCCESS;
}
-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_process_dest(listener_t *listener, uint32_t line)
{
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);
+ channel = switch_core_session_get_channel(listener->session[line]);
+ assert(channel != NULL);
- 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);
- }
+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ assert(tech_pvt != NULL);
- switch_core_session_rwunlock(session);
-
- return SWITCH_STATUS_SUCCESS;
-}
+ 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);
+ }
-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);
-
+ send_dialed_number(listener, tech_pvt->dest, tech_pvt->line, tech_pvt->call_id);
+ skinny_answer(listener->session[line]);
+ }
return SWITCH_STATUS_SUCCESS;
}
-
-struct skinny_session_answer_helper {
+switch_status_t skinny_answer(switch_core_session_t *session)
+{
private_t *tech_pvt;
listener_t *listener;
- 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);
+
tech_pvt = switch_core_session_get_private(session);
+ switch_assert(tech_pvt != NULL);
- helper.tech_pvt = tech_pvt;
- helper.listener = listener;
- helper.line_instance = line_instance;
+ listener = tech_pvt->listener;
+ switch_assert(listener != NULL);
- 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);
-
+ 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);
return SWITCH_STATUS_SUCCESS;
}
-switch_status_t skinny_session_start_media(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+switch_status_t skinny_hold_line(listener_t *listener, uint32_t line)
{
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);
-
- 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);
+ channel = switch_core_session_get_channel(listener->session[line]);
+ assert(channel != NULL);
- switch_core_session_rwunlock(session);
-
- return SWITCH_STATUS_SUCCESS;
-}
+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ assert(tech_pvt != NULL);
-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);
-
/* TODO */
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Hold is not implemented yet. Hanging up the line.\n");
switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
- switch_core_session_rwunlock(session);
-
return SWITCH_STATUS_SUCCESS;
}
-switch_status_t skinny_session_unhold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+switch_status_t skinny_unhold_line(listener_t *listener, uint32_t line)
{
/* TODO */
return SWITCH_STATUS_SUCCESS;
@@ -789,7 +525,7 @@
instance,
listener->device_name, listener->device_instance
))) {
- skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_get_callback, &helper);
+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_line_get_callback, &helper);
switch_safe_free(sql);
}
*button = helper.button;
@@ -833,7 +569,7 @@
listener->device_name, listener->device_instance,
SKINNY_BUTTON_SPEED_DIAL
))) {
- skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_speed_dial_get_callback, &helper);
+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_speed_dial_get_callback, &helper);
switch_safe_free(sql);
}
*button = helper.button;
@@ -878,7 +614,7 @@
listener->device_instance,
SKINNY_BUTTON_SERVICE_URL
))) {
- skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_service_url_get_callback, &helper);
+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_service_url_get_callback, &helper);
switch_safe_free(sql);
}
*button = helper.button;
@@ -924,7 +660,7 @@
listener->device_instance,
SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL
))) {
- skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_feature_get_callback, &helper);
+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper);
switch_safe_free(sql);
}
*button = helper.button;
@@ -968,8 +704,7 @@
switch_status_t set_ringer(listener_t *listener,
uint32_t ring_type,
uint32_t ring_mode,
- uint32_t line_instance,
- uint32_t call_id)
+ uint32_t unknown)
{
skinny_message_t *message;
message = switch_core_alloc(listener->pool, 12+sizeof(message->data.ringer));
@@ -977,8 +712,7 @@
message->length = 4 + sizeof(message->data.ringer);
message->data.ringer.ring_type = ring_type;
message->data.ringer.ring_mode = ring_mode;
- message->data.ringer.line_instance = line_instance;
- message->data.ringer.call_id = call_id;
+ message->data.ringer.unknown = unknown;
skinny_send_reply(listener, message);
return SWITCH_STATUS_SUCCESS;
}
@@ -1256,26 +990,10 @@
return SWITCH_STATUS_SUCCESS;
}
-switch_status_t send_display_pri_notify(listener_t *listener,
- uint32_t message_timeout,
- uint32_t priority,
- char *notify)
+switch_status_t send_reset(listener_t *listener,
+ uint32_t reset_type)
{
skinny_message_t *message;
- 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;
message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reset));
message->type = RESET_MESSAGE;
message->length = 4 + sizeof(message->data.reset);
@@ -1360,7 +1078,7 @@
request->data.reg.max_streams,
"" /* codec_string */
))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
@@ -1372,7 +1090,6 @@
if (xskinny) {
xbuttons = switch_xml_child(xskinny, "buttons");
if (xbuttons) {
- uint32_t line_instance = 1;
for (xbutton = switch_xml_child(xbuttons, "button"); xbutton; xbutton = xbutton->next) {
uint32_t position = atoi(switch_xml_attr_soft(xbutton, "position"));
uint32_t type = skinny_str2button(switch_xml_attr_soft(xbutton, "type"));
@@ -1389,16 +1106,16 @@
uint32_t noanswer_duration = atoi(switch_xml_attr_soft(xbutton, "noanswer-duration"));
if ((sql = switch_mprintf(
"INSERT INTO skinny_lines "
- "(device_name, device_instance, position, line_instance, "
+ "(device_name, device_instance, position, "
"label, value, caller_name, "
"ring_on_idle, ring_on_active, busy_trigger, "
"forward_all, forward_busy, forward_noanswer, noanswer_duration) "
- "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++,
+ "VALUES('%s', %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d)",
+ request->data.reg.device_name, request->data.reg.instance, position,
label, value, caller_name,
ring_on_idle, ring_on_active, busy_trigger,
forward_all, forward_busy, forward_noanswer, noanswer_duration))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
} else {
@@ -1414,7 +1131,7 @@
label,
value,
settings))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
}
@@ -1428,9 +1145,9 @@
message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_ack));
message->type = REGISTER_ACK_MESSAGE;
message->length = 4 + sizeof(message->data.reg_ack);
- 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;
+ 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;
skinny_send_reply(listener, message);
/* Send CapabilitiesReqMessage */
@@ -1510,7 +1227,7 @@
SKINNY_BUTTON_SPEED_DIAL,
listener->device_name
))) {
- skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_config_stat_res_callback, message);
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_config_stat_res_callback, message);
switch_safe_free(sql);
}
skinny_send_reply(listener, message);
@@ -1570,10 +1287,10 @@
codec_string,
listener->device_name
))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
"Codecs %s supported.\n", codec_string);
return SWITCH_STATUS_SUCCESS;
}
@@ -1592,11 +1309,11 @@
if ((sql = switch_mprintf(
"UPDATE skinny_devices SET port=%d WHERE name='%s' and instance=%d",
- request->data.port.port,
+ request->data.as_uint16,
listener->device_name,
listener->device_instance
))) {
- skinny_execute_sql(profile, sql, profile->sql_mutex);
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
switch_safe_free(sql);
}
return SWITCH_STATUS_SUCCESS;
@@ -1661,7 +1378,7 @@
SKINNY_BUTTON_UNDEFINED,
listener->device_name, listener->device_instance
))) {
- skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_handle_button_template_request_callback, &helper);
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper);
switch_safe_free(sql);
}
@@ -1674,7 +1391,7 @@
SKINNY_BUTTON_LINE,
listener->device_name, listener->device_instance
))) {
- skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_handle_button_template_request_callback, &helper);
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper);
switch_safe_free(sql);
}
@@ -1747,7 +1464,7 @@
skinny_send_reply(listener, message);
/* Init the states */
- send_select_soft_keys(listener, 0, 0, SKINNY_KEY_SET_ON_HOOK, 0xffff);
+ skinny_line_set_state(listener, 0, SKINNY_KEY_SET_ON_HOOK, 0);
return SWITCH_STATUS_SUCCESS;
}
@@ -1879,128 +1596,173 @@
switch_status_t skinny_handle_soft_key_event_message(listener_t *listener, skinny_message_t *request)
{
switch_status_t status = SWITCH_STATUS_SUCCESS;
- uint32_t line_instance = 0;
- switch_core_session_t *session = NULL;
+
+ skinny_profile_t *profile;
switch_channel_t *channel = NULL;
+ uint32_t line;
private_t *tech_pvt = NULL;
- switch_assert(listener);
- switch_assert(listener->profile);
-
- skinny_check_data_length(request, sizeof(request->data.soft_key_event));
- line_instance = request->data.soft_key_event.line_instance;
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
- switch(request->data.soft_key_event.event) {
- case SOFTKEY_REDIAL:
- status = skinny_create_ingoing_session(listener, &line_instance, &session);
+ profile = listener->profile;
- 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);
+ skinny_check_data_length(request, sizeof(request->data.soft_key_event));
- 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);
+ 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)) {
- 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);
+ 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);
- if(session) {
- channel = switch_core_session_get_channel(session);
+ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
- 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);
+ break;
+ default:
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Unknown SoftKeyEvent type while busy: %d.\n", request->data.soft_key_event.event);
+ }
}
-
- if(session) {
- switch_core_session_rwunlock(session);
- }
-
return status;
}
switch_status_t skinny_handle_off_hook_message(listener_t *listener, skinny_message_t *request)
{
- uint32_t line_instance;
- switch_core_session_t *session = NULL;
- private_t *tech_pvt = NULL;
+ skinny_profile_t *profile;
+ uint32_t line;
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ profile = listener->profile;
+
skinny_check_data_length(request, sizeof(request->data.off_hook));
- if(request->data.off_hook.line_instance > 0) {
- line_instance = request->data.off_hook.line_instance;
+ if(request->data.off_hook.line_instance) {
+ line = request->data.off_hook.line_instance;
} else {
- line_instance = 1;
+ line = 1;
}
-
- 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);
+ if(listener->session[line]) { /*answering a call */
+ skinny_answer(listener->session[line]);
} else { /* start a new call */
- 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);
+ skinny_create_session(listener, line, SKINNY_KEY_SET_OFF_HOOK);
}
return SWITCH_STATUS_SUCCESS;
}
switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_message_t *request)
{
+ skinny_profile_t *profile;
struct speed_dial_stat_res_message *button = NULL;
- uint32_t line_instance = 0;
- uint32_t call_id = 0;
- switch_core_session_t *session = NULL;
+ uint32_t line = 0;
+ private_t *tech_pvt = NULL;
- skinny_check_data_length(request, sizeof(request->data.stimulus)-sizeof(request->data.stimulus.call_id));
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
- if(skinny_check_data_length_soft(request, sizeof(request->data.stimulus))) {
- call_id = request->data.stimulus.call_id;
- }
+ profile = listener->profile;
+ 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;
+ }
switch(request->data.stimulus.instance_type) {
case SKINNY_BUTTON_LAST_NUMBER_REDIAL:
- skinny_create_ingoing_session(listener, &line_instance, &session);
- skinny_session_process_dest(session, listener, line_instance, "redial", '\0', 0);
+ 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 SKINNY_BUTTON_VOICEMAIL:
- skinny_create_ingoing_session(listener, &line_instance, &session);
- skinny_session_process_dest(session, listener, line_instance, "vmain", '\0', 0);
+ 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);
break;
case SKINNY_BUTTON_SPEED_DIAL:
skinny_speed_dial_get(listener, request->data.stimulus.instance, &button);
if(strlen(button->line) > 0) {
- skinny_create_ingoing_session(listener, &line_instance, &session);
- skinny_session_process_dest(session, listener, line_instance, button->line, '\0', 0);
+ 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);
}
break;
default:
@@ -2012,21 +1774,35 @@
switch_status_t skinny_handle_open_receive_channel_ack_message(listener_t *listener, skinny_message_t *request)
{
switch_status_t status = SWITCH_STATUS_SUCCESS;
- uint32_t line_instance = 0;
- switch_core_session_t *session;
+ skinny_profile_t *profile;
+ uint32_t line = 0;
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ profile = listener->profile;
+
skinny_check_data_length(request, sizeof(request->data.open_receive_channel_ack));
- session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.open_receive_channel_ack.pass_thru_party_id);
+ 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(session) {
+ if(listener->session[line]) {
const char *err = NULL;
private_t *tech_pvt = NULL;
switch_channel_t *channel = NULL;
struct in_addr addr;
- tech_pvt = switch_core_session_get_private(session);
- channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(listener->session[line]);
+ channel = switch_core_session_get_channel(listener->session[line]);
/* Codec */
tech_pvt->iananame = "PCMU"; /* TODO */
@@ -2034,7 +1810,7 @@
tech_pvt->rm_rate = 8000; /* TODO */
tech_pvt->rm_fmtp = NULL; /* TODO */
tech_pvt->agreed_pt = (switch_payload_t) 0; /* TODO */
- tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(session), "");
+ tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), "");
skinny_tech_set_codec(tech_pvt, 0);
if ((status = skinny_tech_set_codec(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) {
goto end;
@@ -2045,7 +1821,7 @@
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
return SWITCH_STATUS_FALSE;
}
- tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(session), listener->profile->ip);
+ tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), listener->profile->ip);
tech_pvt->remote_sdp_audio_ip = inet_ntoa(request->data.open_receive_channel_ack.ip);
tech_pvt->remote_sdp_audio_port = request->data.open_receive_channel_ack.port;
@@ -2058,7 +1834,7 @@
tech_pvt->read_impl.samples_per_packet,
tech_pvt->codec_ms * 1000,
(switch_rtp_flag_t) 0, "soft", &err,
- switch_core_session_get_pool(session));
+ switch_core_session_get_pool(listener->session[line]));
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG,
"AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
switch_channel_get_name(channel),
@@ -2082,12 +1858,7 @@
0, /* uint16_t max_frames_per_packet, */
0 /* uint32_t g723_bitrate */
);
- if (switch_channel_get_state(channel) == CS_NEW) {
- switch_channel_set_state(channel, CS_INIT);
- }
switch_channel_mark_answered(channel);
-
- switch_core_session_rwunlock(session);
}
end:
return status;
@@ -2095,28 +1866,35 @@
switch_status_t skinny_handle_keypad_button_message(listener_t *listener, skinny_message_t *request)
{
- uint32_t line_instance = 0;
- switch_core_session_t *session;
+ uint32_t line = 0;
skinny_check_data_length(request, sizeof(request->data.keypad_button));
-
- if(request->data.keypad_button.line_instance) {
- line_instance = request->data.keypad_button.line_instance;
- } else {
- line_instance = 1;
- }
- session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.keypad_button.call_id);
-
- if(session) {
+ /* 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]) {
switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL;
char digit = '\0';
- channel = switch_core_session_get_channel(session);
- tech_pvt = switch_core_session_get_private(session);
+ 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);
- 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);
+ 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);
if (request->data.keypad_button.button == 14) {
digit = '*';
@@ -2125,14 +1903,21 @@
} else if (request->data.keypad_button.button >= 0 && request->data.keypad_button.button <= 9) {
digit = '0' + request->data.keypad_button.button;
} else {
- 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);
+ 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);
}
/* TODO check call_id and line */
- if((skinny_line_get_state(listener, line_instance, tech_pvt->call_id) == SKINNY_OFF_HOOK)) {
+ 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);
+ }
- skinny_session_process_dest(session, listener, line_instance, NULL, digit, 0);
+ tech_pvt->dest[strlen(tech_pvt->dest)] = digit;
+
+ skinny_process_dest(listener, tech_pvt->line);
} else {
if(digit != '\0') {
switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0)};
@@ -2140,7 +1925,6 @@
switch_channel_queue_dtmf(channel, &dtmf);
}
}
- switch_core_session_rwunlock(session);
}
return SWITCH_STATUS_SUCCESS;
@@ -2149,23 +1933,35 @@
switch_status_t skinny_handle_on_hook_message(listener_t *listener, skinny_message_t *request)
{
switch_status_t status = SWITCH_STATUS_SUCCESS;
- switch_core_session_t *session = NULL;
- uint32_t line_instance = 0;
+ skinny_profile_t *profile;
+ uint32_t line = 0;
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ profile = listener->profile;
+
skinny_check_data_length(request, sizeof(request->data.on_hook));
- line_instance = request->data.on_hook.line_instance;
-
- session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.on_hook.call_id);
+ 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;
+ }
+ }
+ }
- if(session) {
+ if(listener->session[line]) {
switch_channel_t *channel = NULL;
- channel = switch_core_session_get_channel(session);
+ channel = switch_core_session_get_channel(listener->session[line]);
+ assert(channel != NULL);
switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-
- switch_core_session_rwunlock(session);
}
return status;
}