From 3731c4ab91705dffa911a79c8357e879854704bc Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Wed, 10 Mar 2010 13:49:53 +0000 Subject: [PATCH] Skinny: - allow several instances of the same device on different sockets - move lines to table skinny_lines, as they need more params - various small changes git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16959 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_skinny/mod_skinny.c | 49 ++++-- src/mod/endpoints/mod_skinny/mod_skinny.h | 1 + .../endpoints/mod_skinny/skinny_protocol.c | 150 ++++++++++++------ .../endpoints/mod_skinny/skinny_protocol.h | 3 +- 4 files changed, 143 insertions(+), 60 deletions(-) diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c index f52304c481..4fff074c0f 100644 --- a/src/mod/endpoints/mod_skinny/mod_skinny.c +++ b/src/mod/endpoints/mod_skinny/mod_skinny.c @@ -49,23 +49,41 @@ skinny_globals_t globals; /*****************************************************************************/ static char devices_sql[] = "CREATE TABLE skinny_devices (\n" - " name VARCHAR(16),\n" + " name VARCHAR(16),\n" " user_id INTEGER,\n" " instance INTEGER,\n" - " ip VARCHAR(255),\n" + " ip VARCHAR(15),\n" " type INTEGER,\n" " max_streams INTEGER,\n" " port INTEGER,\n" " codec_string VARCHAR(255)\n" ");\n"; +static char lines_sql[] = + "CREATE TABLE skinny_lines (\n" + " device_name VARCHAR(16),\n" + " device_instance INTEGER,\n" + " position INTEGER,\n" + " label VARCHAR(40),\n" + " value VARCHAR(24),\n" + " caller_name VARCHAR(44),\n" + " ring_on_idle INTEGER,\n" + " ring_on_active INTEGER,\n" + " busy_trigger INTEGER,\n" + " forward_all VARCHAR(255),\n" + " forward_busy VARCHAR(255),\n" + " forward_noanswer VARCHAR(255),\n" + " noanswer_duration INTEGER\n" + ");\n"; + static char buttons_sql[] = "CREATE TABLE skinny_buttons (\n" " device_name VARCHAR(16),\n" + " device_instance INTEGER,\n" " position INTEGER,\n" " type INTEGER,\n" " label VARCHAR(40),\n" - " value VARCHAR(24),\n" + " value VARCHAR(255),\n" " settings VARCHAR(44)\n" ");\n"; @@ -148,9 +166,9 @@ static switch_status_t skinny_profile_find_listener_by_dest(skinny_profile_t *pr 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'", + "(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); @@ -996,16 +1014,24 @@ static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch if ((sql = switch_mprintf( "DELETE FROM skinny_devices " - "WHERE name='%s'", - listener->device_name))) { + "WHERE name='%s' and instance=%d", + listener->device_name, listener->device_instance))) { + skinny_execute_sql(profile, sql, profile->listener_mutex); + switch_safe_free(sql); + } + + if ((sql = switch_mprintf( + "DELETE FROM skinny_lines " + "WHERE device_name='%s' and device_instance=%d", + listener->device_name, listener->device_instance))) { skinny_execute_sql(profile, sql, profile->listener_mutex); switch_safe_free(sql); } if ((sql = switch_mprintf( "DELETE FROM skinny_buttons " - "WHERE device_name='%s'", - listener->device_name))) { + "WHERE device_name='%s' and device_instance=%d", + listener->device_name, listener->device_instance))) { skinny_execute_sql(profile, sql, profile->listener_mutex); switch_safe_free(sql); } @@ -1438,10 +1464,12 @@ static switch_status_t load_skinny_config(void) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn); 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); } 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); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); @@ -1451,6 +1479,7 @@ static switch_status_t load_skinny_config(void) } 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); diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.h b/src/mod/endpoints/mod_skinny/mod_skinny.h index a59417502a..88a5b70287 100644 --- a/src/mod/endpoints/mod_skinny/mod_skinny.h +++ b/src/mod/endpoints/mod_skinny/mod_skinny.h @@ -102,6 +102,7 @@ typedef enum { struct listener { skinny_profile_t *profile; char device_name[16]; + uint32_t device_instance; switch_core_session_t *session[SKINNY_MAX_LINES]; uint32_t line_state[SKINNY_MAX_LINES]; /* See enum skinny_key_set */ diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.c b/src/mod/endpoints/mod_skinny/skinny_protocol.c index 10b7622d64..ed9efa9916 100644 --- a/src/mod/endpoints/mod_skinny/skinny_protocol.c +++ b/src/mod/endpoints/mod_skinny/skinny_protocol.c @@ -138,6 +138,7 @@ SKINNY_DECLARE_ID2STR(skinny_ring_mode2str, SKINNY_RING_MODES, "RingModeUnknown" SKINNY_DECLARE_STR2ID(skinny_str2ring_mode, SKINNY_RING_MODES, -1) struct skinny_table SKINNY_BUTTONS[] = { + {"Unknown", SKINNY_BUTTON_UNKNOWN}, {"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL}, {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL}, {"Line", SKINNY_BUTTON_LINE}, @@ -403,7 +404,7 @@ switch_status_t skinny_device_event(listener_t *listener, switch_event_t **ev, s switch_event_create_subclass(&event, event_id, subclass_name); switch_assert(event); - if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE name='%s'", listener->device_name))) { + 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); } @@ -506,7 +507,7 @@ switch_status_t skinny_create_session(listener_t *listener, uint32_t line, uint3 channel = switch_core_session_get_channel(session); - snprintf(name, sizeof(name), "SKINNY/%s/%s/%d", listener->profile->name, listener->device_name, tech_pvt->line); + 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(session) != SWITCH_STATUS_SUCCESS) { @@ -655,7 +656,7 @@ int skinny_line_get_callback(void *pArg, int argc, char **argv, char **columnNam helper->button->number = helper->pos; strncpy(helper->button->name, argv[2], 24); /* label */ strncpy(helper->button->shortname, argv[3], 40); /* value */ - strncpy(helper->button->displayname, argv[4], 44); /* settings */ + strncpy(helper->button->displayname, argv[4], 44); /* caller_name */ } return 0; } @@ -672,13 +673,12 @@ void skinny_line_get(listener_t *listener, uint32_t instance, struct line_stat_r helper.button = switch_core_alloc(listener->pool, sizeof(struct line_stat_res_message)); if ((sql = switch_mprintf( - "SELECT '%d' AS wanted_position, position, label, value, settings " - "FROM skinny_buttons " - "WHERE device_name='%s' AND type=%d " + "SELECT '%d' AS wanted_position, position, label, value, caller_name " + "FROM skinny_lines " + "WHERE device_name='%s' AND device_instance=%d " "ORDER BY position", instance, - listener->device_name, - SKINNY_BUTTON_LINE + listener->device_name, listener->device_instance ))) { skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_line_get_callback, &helper); switch_safe_free(sql); @@ -718,10 +718,10 @@ void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed if ((sql = switch_mprintf( "SELECT '%d' AS wanted_position, position, label, value, settings " "FROM skinny_buttons " - "WHERE device_name='%s' AND type=%d " + "WHERE device_name='%s' AND device_instance=%d AND type=%d " "ORDER BY position", instance, - listener->device_name, + listener->device_name, listener->device_instance, SKINNY_BUTTON_SPEED_DIAL ))) { skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_speed_dial_get_callback, &helper); @@ -762,10 +762,11 @@ void skinny_service_url_get(listener_t *listener, uint32_t instance, struct serv if ((sql = switch_mprintf( "SELECT '%d' AS wanted_position, position, label, value, settings " "FROM skinny_buttons " - "WHERE device_name='%s' AND type=%d " + "WHERE device_name='%s' AND device_instance=%d AND type=%d " "ORDER BY position", instance, listener->device_name, + listener->device_instance, SKINNY_BUTTON_SERVICE_URL ))) { skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_service_url_get_callback, &helper); @@ -807,11 +808,12 @@ void skinny_feature_get(listener_t *listener, uint32_t instance, struct feature_ if ((sql = switch_mprintf( "SELECT '%d' AS wanted_position, position, label, value, settings " "FROM skinny_buttons " - "WHERE device_name='%s' AND NOT (type=%d OR type=%d OR type=%d) " + "WHERE device_name='%s' AND device_instance=%d AND NOT (type=%d OR type=%d) " "ORDER BY position", instance, listener->device_name, - SKINNY_BUTTON_LINE, SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL + listener->device_instance, + SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL ))) { skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper); switch_safe_free(sql); @@ -1237,6 +1239,7 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r strcpy(listener->device_name, request->data.reg.device_name); + listener->device_instance = request->data.reg.instance; xskinny = switch_xml_child(xuser, "skinny"); if (xskinny) { @@ -1247,19 +1250,45 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r uint32_t type = skinny_str2button(switch_xml_attr_soft(xbutton, "type")); const char *label = switch_xml_attr_soft(xbutton, "label"); const char *value = switch_xml_attr_soft(xbutton, "value"); - const char *settings = switch_xml_attr_soft(xbutton, "settings"); - if ((sql = switch_mprintf( - "INSERT INTO skinny_buttons " - "(device_name, position, type, label, value, settings) " - "VALUES('%s', %d, %d, '%s', '%s', '%s')", - request->data.reg.device_name, - position, - type, - label, - value, - settings))) { - skinny_execute_sql(profile, sql, profile->listener_mutex); - switch_safe_free(sql); + if(type == SKINNY_BUTTON_LINE) { + const char *caller_name = switch_xml_attr_soft(xbutton, "caller-name"); + uint32_t ring_on_idle = atoi(switch_xml_attr_soft(xbutton, "ring-on-idle")); + uint32_t ring_on_active = atoi(switch_xml_attr_soft(xbutton, "ring-on-active")); + uint32_t busy_trigger = atoi(switch_xml_attr_soft(xbutton, "busy-trigger")); + const char *forward_all = switch_xml_attr_soft(xbutton, "forward-all"); + const char *forward_busy = switch_xml_attr_soft(xbutton, "forward-busy"); + const char *forward_noanswer = switch_xml_attr_soft(xbutton, "forward-noanswer"); + 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, " + "label, value, caller_name, " + "ring_on_idle, ring_on_active, busy_trigger, " + "forward_all, forward_busy, forward_noanswer, noanswer_duration) " + "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->listener_mutex); + switch_safe_free(sql); + } + } else { + const char *settings = switch_xml_attr_soft(xbutton, "settings"); + if ((sql = switch_mprintf( + "INSERT INTO skinny_buttons " + "(device_name, device_instance, position, type, label, value, settings) " + "VALUES('%s', %d, %d, %d, '%s', '%s', '%s')", + request->data.reg.device_name, + request->data.reg.instance, + position, + type, + label, + value, + settings))) { + skinny_execute_sql(profile, sql, profile->listener_mutex); + switch_safe_free(sql); + } } } } @@ -1343,12 +1372,13 @@ switch_status_t skinny_handle_config_stat_request(listener_t *listener, skinny_m if ((sql = switch_mprintf( "SELECT name, user_id, instance, '' AS user_name, '' AS server_name, " - "(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type=%d) AS number_lines, " - "(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type=%d) AS number_speed_dials " + "(SELECT COUNT(*) FROM skinny_lines WHERE device_name='%s' AND device_instance=%d) AS number_lines, " + "(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND device_instance=%d AND type=%d) AS number_speed_dials " "FROM skinny_devices WHERE name='%s' ", listener->device_name, - SKINNY_BUTTON_LINE, + listener->device_instance, listener->device_name, + listener->device_instance, SKINNY_BUTTON_SPEED_DIAL, listener->device_name ))) { @@ -1433,9 +1463,10 @@ switch_status_t skinny_handle_port_message(listener_t *listener, skinny_message_ skinny_check_data_length(request, sizeof(request->data.as_uint16)); if ((sql = switch_mprintf( - "UPDATE skinny_devices SET port='%d' WHERE name='%s'", + "UPDATE skinny_devices SET port=%d WHERE name='%s' and instance=%d", request->data.as_uint16, - listener->device_name + listener->device_name, + listener->device_instance ))) { skinny_execute_sql(profile, sql, profile->listener_mutex); switch_safe_free(sql); @@ -1446,6 +1477,7 @@ switch_status_t skinny_handle_port_message(listener_t *listener, skinny_message_ struct button_template_helper { skinny_message_t *message; int count[SKINNY_BUTTON_UNDEFINED+1]; + int max_position; }; int skinny_handle_button_template_request_callback(void *pArg, int argc, char **argv, char **columnNames) @@ -1453,26 +1485,19 @@ int skinny_handle_button_template_request_callback(void *pArg, int argc, char ** struct button_template_helper *helper = pArg; skinny_message_t *message = helper->message; /* char *device_name = argv[0]; */ - int position = atoi(argv[1]); - uint32_t type = atoi(argv[2]); - int i; - - if(type > SKINNY_BUTTON_UNDEFINED) { - type = SKINNY_BUTTON_UNDEFINED; - } - /* fill buttons between previous one and current one */ - for(i = message->data.button_template.button_count; i+1 < position; i++) { - message->data.button_template.btn[i].instance_number = ++helper->count[SKINNY_BUTTON_UNDEFINED]; - message->data.button_template.btn[i].button_definition = SKINNY_BUTTON_UNDEFINED; - message->data.button_template.button_count++; - message->data.button_template.total_button_count++; - } + /* uint32_t device_instance = argv[1]; */ + int position = atoi(argv[2]); + uint32_t type = atoi(argv[3]); + /* int relative_position = atoi(argv[4]); */ - message->data.button_template.btn[i].instance_number = ++helper->count[type]; + message->data.button_template.btn[position-1].instance_number = ++helper->count[type]; message->data.button_template.btn[position-1].button_definition = type; message->data.button_template.button_count++; message->data.button_template.total_button_count++; + if(position > helper->max_position) { + helper->max_position = position; + } return 0; } @@ -1498,16 +1523,43 @@ switch_status_t skinny_handle_button_template_request(listener_t *listener, skin message->data.button_template.total_button_count = 0; helper.message = message; + /* Add buttons */ if ((sql = switch_mprintf( - "SELECT device_name, position, type " - "FROM skinny_buttons WHERE device_name='%s' ORDER BY position", - listener->device_name + "SELECT device_name, device_instance, position, MIN(type, %d) AS type " + "FROM skinny_buttons " + "WHERE device_name='%s' AND device_instance=%d " + "ORDER BY position", + SKINNY_BUTTON_UNDEFINED, + listener->device_name, listener->device_instance ))) { skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper); switch_safe_free(sql); } + /* Add lines */ + if ((sql = switch_mprintf( + "SELECT device_name, device_instance, position, %d AS type " + "FROM skinny_lines " + "WHERE device_name='%s' AND device_instance=%d " + "ORDER BY position", + SKINNY_BUTTON_LINE, + listener->device_name, listener->device_instance + ))) { + skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper); + switch_safe_free(sql); + } + + /* Fill remaining buttons with Undefined */ + for(int i = 0; i+1 < helper.max_position; i++) { + if(message->data.button_template.btn[i].button_definition == SKINNY_BUTTON_UNKNOWN) { + message->data.button_template.btn[i].instance_number = ++helper.count[SKINNY_BUTTON_UNDEFINED]; + message->data.button_template.btn[i].button_definition = SKINNY_BUTTON_UNDEFINED; + message->data.button_template.button_count++; + message->data.button_template.total_button_count++; + } + } + skinny_send_reply(listener, message); return SWITCH_STATUS_SUCCESS; diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.h b/src/mod/endpoints/mod_skinny/skinny_protocol.h index c9a3d12b09..fe847d49c3 100644 --- a/src/mod/endpoints/mod_skinny/skinny_protocol.h +++ b/src/mod/endpoints/mod_skinny/skinny_protocol.h @@ -705,6 +705,7 @@ enum skinny_call_type { }; enum skinny_button_definition { + SKINNY_BUTTON_UNKNOWN = 0x00, SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01, SKINNY_BUTTON_SPEED_DIAL = 0x02, SKINNY_BUTTON_LINE = 0x09, @@ -713,7 +714,7 @@ enum skinny_button_definition { SKINNY_BUTTON_SERVICE_URL = 0x14, SKINNY_BUTTON_UNDEFINED = 0xFF, }; -struct skinny_table SKINNY_BUTTONS[8]; +struct skinny_table SKINNY_BUTTONS[9]; const char *skinny_button2str(uint32_t id); uint32_t skinny_str2button(const char *str); #define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)