January 2007 - Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r3886 - in freeswitch/branches/knhor/trunk/src: . include mod/endpoints/mod_dingaling
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: knhor Date: Mon Jan 1 19:40:28 2007 New Revision: 3886 Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/knhor/trunk/src/switch_event.c Log: add "subscribe" and "unsubscribe" event generation for conference targets Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_types.h Mon Jan 1 19:40:28 2007 @@ -724,6 +724,8 @@ SWITCH_EVENT_PRESENCE_IN - Presence in SWITCH_EVENT_PRESENCE_OUT - Presence out SWITCH_EVENT_PRESENCE_PROBE - Presence probe + SWITCH_EVENT_PRESENCE_SUBSCRIBE - Presence subscribe + SWITCH_EVENT_PRESENCE_UNSUBSCRIBE - Presnece unsubscribe SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_DETECTED_SPEECH - Detected Speech @@ -762,6 +764,8 @@ SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_PRESENCE_PROBE, + SWITCH_EVENT_PRESENCE_SUBSCRIBE, + SWITCH_EVENT_PRESENCE_UNSUBSCRIBE, SWITCH_EVENT_ROSTER, SWITCH_EVENT_CODEC, SWITCH_EVENT_BACKGROUND_JOB, Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Jan 1 19:40:28 2007 @@ -193,6 +193,7 @@ static int sin_callback(void *pArg, int argc, char **argv, char **columnNames); #define is_special(s) (s && (strstr(s, "ext+") || strstr(s, "user+"))) +#define is_conference(s) (s && (strstr(s, "conf+"))) static char *translate_rpid(char *in, char *ext) { @@ -2145,19 +2146,29 @@ case LDL_SIGNAL_VCARD: do_vcard(handle, to, from, subject); break; + case LDL_SIGNAL_UNSUBSCRIBE: if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';", from, to))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } - + if (is_conference(to)) { + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_UNSUBSCRIBE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "unsubscribe"); + switch_event_fire(&event); + } + } break; case LDL_SIGNAL_SUBSCRIBE: if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';\n" - "insert into subscriptions values('%q','%q','%q','%q');\n", from, to, from, to, msg, subject))) { + "insert into subscriptions values('%q','%q','%q','%q');\n", from, to, from, to, msg, subject))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } @@ -2166,19 +2177,18 @@ ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); } -#if 0 - if (is_special(to)) { - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + if (is_conference(to)) { + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_SUBSCRIBE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); - //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "unknown"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Click To Call"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "subscribe"); switch_event_fire(&event); } } -#endif break; + case LDL_SIGNAL_ROSTER: if (switch_event_create(&event, SWITCH_EVENT_ROSTER) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); @@ -2186,19 +2196,22 @@ switch_event_fire(&event); } break; + case LDL_SIGNAL_PRESENCE_PROBE: if (is_special(to)) { - ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); - } else { + ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); + } else { if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "probe"); switch_event_fire(&event); } - } - break; + } + break; + case LDL_SIGNAL_PRESENCE_IN: if ((sql = switch_mprintf("update subscriptions set show='%q', status='%q' where sub_from='%q'", msg, subject, from))) { @@ -2212,6 +2225,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", msg); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", subject); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "in"); switch_event_fire(&event); } @@ -2243,9 +2257,11 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "out"); switch_event_fire(&event); } break; + default: break; } Modified: freeswitch/branches/knhor/trunk/src/switch_event.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_event.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_event.c Mon Jan 1 19:40:28 2007 @@ -126,6 +126,8 @@ "PRESENCE_IN", "PRESENCE_OUT", "PRESENCE_PROBE", + "PRESENCE_SUBSCRIBE", + "PRESENCE_UNSUBSCRIBE", "ROSTER", "CODEC", "BACKGROUND_JOB",

1 0

[commit] r3885 - freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: outcast Date: Mon Jan 1 16:26:05 2007 New Revision: 3885 Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Log: corrected if statement to check if mysql_xml is null. Also added a check for the section type. Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c ============================================================================== --- freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c (original) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Mon Jan 1 16:26:05 2007 @@ -79,38 +79,41 @@ return NULL; } - snprintf(mysql_query, sizeof(mysql_query), "SELECT data FROM xml_templates WHERE section = \"%s\" and name = \"%s\"", mysql_section, mysql_key_value); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Built query: %s\nSize: %d\n", mysql_query, sizeof(mysql_query)); + if(!(strcmp(mysql_section, "configuration"))) { + snprintf(mysql_query, sizeof(mysql_query), "SELECT data FROM xml_templates WHERE section = \"%s\" and name = \"%s\"", mysql_section, mysql_key_value); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Built query: %s\nSize: %d\n", mysql_query, sizeof(mysql_query)); - if(mysql_real_query(&globals.mysql, mysql_query, strlen(mysql_query)) == 0){ + if(mysql_real_query(&globals.mysql, mysql_query, strlen(mysql_query)) == 0){ - result = mysql_store_result(&globals.mysql); - if(result){ + result = mysql_store_result(&globals.mysql); + if(result){ - if(mysql_num_fields(result) == 1) { - if(!(row = mysql_fetch_row(result))) { + if(mysql_num_fields(result) == 1) { + if(!(row = mysql_fetch_row(result))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned an empty result\n"); - return NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned an empty result\n"); + return NULL; + } else { + + mysql_xml = strdup(row[0]); + } } else { - mysql_xml = strdup(row[0]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Incorrect amount of fields retrived please check MySQL query.\n"); + return NULL; } } else { - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Incorrect amount of fields retrived please check MySQL query.\n"); - return NULL; - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No records found for %s in database\n", mysql_key_value); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No records found for %s in database\n", mysql_key_value); + return NULL; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Mysql Error: %s\n", mysql_error(&globals.mysql)); return NULL; - } + } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Mysql Error: %s\n", mysql_error(&globals.mysql)); - return NULL; - } - - if(mysql_query == NULL) { + return NULL; + } + if(mysql_xml == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned a null value\n"); return NULL; }

1 0

[commit] r3884 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: knhor Date: Mon Jan 1 14:33:36 2007 New Revision: 3884 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: instead of requiring a profile name for the conference, use the profile "default" for not specified Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jan 1 14:33:36 2007 @@ -3094,13 +3094,12 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - char *profile_name = strchr(argv[0],'@'); assert(conference != NULL); assert(stream != NULL); /* if we have a conference name with a profile name, and at least one member to transfer */ - if (argc >= 2 && !switch_strlen_zero(argv[0]) && !switch_strlen_zero(profile_name)) { + if (argc >= 2 && !switch_strlen_zero(argv[0])) { int x; for (x = 1; x<argc; x++) { @@ -3122,6 +3121,7 @@ switch_memory_pool_t *pool = NULL; conf_xml_cfg_t xml_cfg = {0}; char *conf_name; + char *profile_name; /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -3133,13 +3133,15 @@ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } /* get the xml config sections */ if (conference_get_xml_sections(profile_name, &xml_cfg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); goto done; } - } /* Create the conference object. */ new_conference = conference_new(conf_name, &xml_cfg, pool); @@ -3243,7 +3245,7 @@ {"say", (api_cmd_fn_t)&conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, {"saymember", (api_cmd_fn_t)&conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, {"stop", (api_cmd_fn_t)&conf_api_sub_stop, CONF_API_SUB_MEMBER_TARGET, "<confname> stop <[current|all|last]> [<member_id>]"}, - {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name@conference_profile_name> <member id> [...<member id>]"}, + {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name[@conference_profile_name]> <member id> [...<member id>]"}, {"undeaf", (api_cmd_fn_t)&conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, {"unlock", (api_cmd_fn_t)&conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, {"unmute", (api_cmd_fn_t)&conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, @@ -3686,13 +3688,15 @@ /* is there profile specification ? */ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } /* get the xml config sections */ if (conference_get_xml_sections(profile_name, &xml_cfg) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */

1 0

[commit] r3883 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: knhor Date: Mon Jan 1 11:14:46 2007 New Revision: 3883 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: require a profile name when transfering members to another conference. fix conference presence for transfered members Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jan 1 11:14:46 2007 @@ -3094,11 +3094,13 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + char *profile_name = strchr(argv[0],'@'); assert(conference != NULL); assert(stream != NULL); - if (argc >= 2 && !switch_strlen_zero(argv[0])) { + /* if we have a conference name with a profile name, and at least one member to transfer */ + if (argc >= 2 && !switch_strlen_zero(argv[0]) && !switch_strlen_zero(profile_name)) { int x; for (x = 1; x<argc; x++) { @@ -3120,7 +3122,6 @@ switch_memory_pool_t *pool = NULL; conf_xml_cfg_t xml_cfg = {0}; char *conf_name; - char *profile_name; /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -3242,7 +3243,7 @@ {"say", (api_cmd_fn_t)&conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, {"saymember", (api_cmd_fn_t)&conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, {"stop", (api_cmd_fn_t)&conf_api_sub_stop, CONF_API_SUB_MEMBER_TARGET, "<confname> stop <[current|all|last]> [<member_id>]"}, - {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, + {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name@conference_profile_name> <member id> [...<member id>]"}, {"undeaf", (api_cmd_fn_t)&conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, {"unlock", (api_cmd_fn_t)&conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, {"unmute", (api_cmd_fn_t)&conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, @@ -4123,7 +4124,23 @@ conf_api_dispatch(conference, &stream, argc, argv, (const char *)body); } #endif - } + } else if (perm != NULL) { + char *p = strdup(perm); + + if (p != NULL) { + char *str = p; + + while(*p) { + if(*p == '|') { + *p = '\n'; + } + p++; + } + stream.write_function(&stream, "valid commands are;%s", str); + + free(str); + } + } } else { stream.write_function(&stream, "No parameters specified.\nTry 'help'\n"); } @@ -4180,6 +4197,8 @@ char *commands = (char *) switch_xml_attr(xml_kvp, "commands"); if (!switch_strlen_zero(name) && !switch_strlen_zero(commands)) { + // "commands" MUST be validated against the conf_api_sub_commands[] table + // and any invalid commands MUST be removed before being inserted in the hash switch_core_hash_insert(conference->chat_permissions_map, name, commands); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "chat-permissions %s=%s\n",name,commands); count ++; @@ -4460,7 +4479,8 @@ if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); +// switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); // i think this is wrong + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_fire(&event);

1 0

[commit] r3882 - freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: outcast Date: Mon Jan 1 04:33:18 2007 New Revision: 3882 Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Log: Giving credit where credit is due!!!!! Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c ============================================================================== --- freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c (original) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Mon Jan 1 04:33:18 2007 @@ -28,7 +28,7 @@ * * mod_xml_mysql.c -- CURL XML Gateway * - * Based on mod_xml_curl by Michael Jerris <mike(a)jerris.com> + * Based on mod_xml_curl by Anthony Minessale II <anthmct(a)yahoo.com> */

1 0

[commit] r3881 - freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: outcast Date: Mon Jan 1 04:28:22 2007 New Revision: 3881 Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/Makefile freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/README freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Log: new mod_xml_mysql module. Just testing some stuff. I will have better version soon. Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/Makefile Mon Jan 1 04:28:22 2007 @@ -0,0 +1,20 @@ +FLAGS += $(shell mysql_config --include) +LDFLAGS += $(shell mysql_config --libs) + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + + + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.so *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/README ============================================================================== --- (empty file) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/README Mon Jan 1 04:28:22 2007 @@ -0,0 +1,10 @@ +mod_xml_mysql +----- + + +This is an experimental module that I have written to load Freeswitch's configuration from a MySQL database. It may seem a bit crude. This is my first module for Freeswitch and the first time I have used the MySQL API. I would highly recommend not to use this in production. The database schema currently is not included due to the fact it is lame. I will come up with a better database schema and version of the module hopfully by mid-Jan. If you have any quesitons please email me. + + +Outcast aka James Jones <james(a)virtualrealmsoftware.com> + + Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c ============================================================================== --- (empty file) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Mon Jan 1 04:28:22 2007 @@ -0,0 +1,219 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Outcast aka James Jones <james(a)virtualrealmsoftware.com> + * Michael Jerris <mike(a)jerris.com> + * + * mod_xml_mysql.c -- CURL XML Gateway + * + * Based on mod_xml_curl by Michael Jerris <mike(a)jerris.com> + */ + + +#include <switch.h> +#include <mysql/mysql.h> + +static const char modname[] = "mod_xml_mysql"; + + +static struct { + char *dbname; + char *bindings; + char *dbuser; + char *dbpass; + char *dbhost; + char *debug; + MYSQL mysql; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbname, globals.dbname); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbuser, globals.dbuser); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbpass, globals.dbpass); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbhost, globals.dbhost); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_debug, globals.debug); + + +static switch_xml_t xml_mysql_fetch(char *section, + char *tag_name, + char *key_name, + char *key_value, + char *params) +{ + char *mysql_section = NULL; + char *mysql_tag_name = NULL; + char *mysql_key_name = NULL; + char *mysql_key_value = NULL; + char *mysql_params = NULL; + char *mysql_xml = NULL; + char mysql_query[1000]; + switch_xml_t xml = NULL; + MYSQL_RES *result; + MYSQL_ROW row; + + if (!((mysql_section = section) && (mysql_tag_name = tag_name) && (mysql_key_name = key_name) && (mysql_key_value = key_value))) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + return NULL; + } + + snprintf(mysql_query, sizeof(mysql_query), "SELECT data FROM xml_templates WHERE section = \"%s\" and name = \"%s\"", mysql_section, mysql_key_value); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Built query: %s\nSize: %d\n", mysql_query, sizeof(mysql_query)); + + if(mysql_real_query(&globals.mysql, mysql_query, strlen(mysql_query)) == 0){ + + result = mysql_store_result(&globals.mysql); + if(result){ + + if(mysql_num_fields(result) == 1) { + if(!(row = mysql_fetch_row(result))) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned an empty result\n"); + return NULL; + } else { + + mysql_xml = strdup(row[0]); + } + } else { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Incorrect amount of fields retrived please check MySQL query.\n"); + return NULL; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No records found for %s in database\n", mysql_key_value); + return NULL; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Mysql Error: %s\n", mysql_error(&globals.mysql)); + return NULL; + } + + if(mysql_query == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned a null value\n"); + return NULL; + } + + if (!(xml = switch_xml_parse_str(mysql_xml, strlen(mysql_xml)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + mysql_free_result(result); + return xml; +} + + +static switch_loadable_module_interface_t xml_mysql_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +static switch_status_t do_config(void) +{ + char *cf = "xml_mysql.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "dbname")) { + char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); + set_global_bindings(bindings); + set_global_dbname(val); + } else if (!strcasecmp(var, "dbhost")) { + set_global_dbhost(val); + } else if (!strcasecmp(var, "dbuser")) { + set_global_dbuser(val); + } else if (!strcasecmp(var, "dbpass")) { + set_global_dbpass(val); + } else if (!strcasecmp(var, "dbdebug")) { + set_global_debug(val); + } + } + } + + switch_xml_free(xml); + + return globals.dbname ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &xml_mysql_module_interface; + + if (do_config() == SWITCH_STATUS_SUCCESS) { + if(mysql_init(&globals.mysql)==NULL) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to iniate MySQL Connection\n"); + return SWITCH_STATUS_FALSE; + } + + if (!mysql_real_connect(&globals.mysql,globals.dbhost, globals.dbuser, globals.dbpass, globals.dbname,0,NULL,0)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to connect to Database: %s @ %s\n", globals.dbname, globals.dbhost); + return SWITCH_STATUS_FALSE; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding MySQL Fetch Function [%s] [%s]\n", + globals.dbname, globals.bindings ? globals.bindings : "all"); + switch_xml_bind_search_function(xml_mysql_fetch, switch_xml_parse_section_string(globals.bindings)); + } else { + return SWITCH_STATUS_FALSE; + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + mysql_close(&globals.mysql); + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0