November 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3460 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 27 Nov '06

27 Nov '06

Author: anthm Date: Mon Nov 27 12:12:40 2006 New Revision: 3460 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Nov 27 12:12:40 2006 @@ -465,8 +465,7 @@ CF_CONTROLLED = (1 << 12), CF_NOMEDIA = (1 << 13), CF_SUSPEND = (1 << 14), - CF_EVENT_PARSE = (1 << 15), - CF_NO_EARLY = (1 << 16) + CF_EVENT_PARSE = (1 << 15) } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Nov 27 12:12:40 2006 @@ -2548,12 +2548,6 @@ } } if (r_sdp) { - if (switch_channel_test_flag(channel, CF_NO_EARLY)) { - //ignore 183 but how do we say we dont want it and not end the call - //nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); - return; - } - if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_set_flag(channel, CF_EARLY_MEDIA); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Nov 27 12:12:40 2006 @@ -2436,13 +2436,13 @@ peer_sessions[i] = NULL; continue; } - //switch_channel_set_flag(peer_channels[i], CF_NO_EARLY); + switch_core_session_read_lock(peer_sessions[i]); pool = NULL; peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]); assert(peer_channels[i] != NULL); - + if (table == &noop_state_handler) { table = NULL; } else if (!table) {

1 0

[commit] r3459 - freeswitch/branches/compnetwork
by Freeswitch SVN 27 Nov '06

27 Nov '06

Author: sphere Date: Mon Nov 27 10:41:28 2006 New Revision: 3459 Added: freeswitch/branches/compnetwork/ Log: Creating empty folder for compnetwork

1 0

[commit] r3458 - freeswitch/trunk/src
by Freeswitch SVN 26 Nov '06

26 Nov '06

Author: anthm Date: Sun Nov 26 15:06:04 2006 New Revision: 3458 Modified: freeswitch/trunk/src/switch_channel.c Log: update Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Nov 26 15:06:04 2006 @@ -1196,19 +1196,19 @@ return in; } } - nlen = sub_val ? strlen(sub_val) : 0; + if ((nlen = sub_val ? strlen(sub_val) : 0)) { + if (len + nlen >= olen) { + olen = (olen + len + nlen + block); + cpos = c - data; + data = realloc(data, olen); + c = data + cpos; + memset(c, 0, olen - cpos); + } - if (len + nlen >= olen) { - olen = (olen + len + nlen + block); - cpos = c - data; - data = realloc(data, olen); - c = data + cpos; - memset(c, 0, olen - cpos); - } - if (nlen) { len += nlen; strcat(c, sub_val); c += nlen; + } switch_safe_free(func_val);

1 0

[commit] r3457 - in freeswitch/branches/mishehu/src/mod: endpoints endpoints/mod_opal event_handlers/mod_cdr
by Freeswitch SVN 26 Nov '06

26 Nov '06

Author: mishehu Date: Sun Nov 26 03:09:57 2006 New Revision: 3457 Added: freeswitch/branches/mishehu/src/mod/endpoints/ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/Makefile freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.cpp freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.h freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/mod_opal.cpp Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Log: Started working on the very base of mod_opal. Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/Makefile Sun Nov 26 03:09:57 2006 @@ -0,0 +1,23 @@ +CFLAGS += -I/usr/include/ptlib -I/usr/include/opal +LDFLAGS += -lopal -lpt + +CPPCC = g++ +OBJS= + +all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).cpp + $(CPPCC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o + $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + + +%.o: %.cpp + $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $< + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.cpp Sun Nov 26 03:09:57 2006 @@ -0,0 +1,30 @@ +#include "baseopal.h" + +char BaseOPAL::*configfile = "mod_opal.conf"; + +BaseOPAL::BaseOPAL() +{ + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); +} + +void BaseOPAL::load_config() +{ + if (!(xml = switch_xml_open_cfg(configfile, &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 (!strcmp(var, "foo")) { + foo = atoi(val); + } + + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} \ No newline at end of file Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.h Sun Nov 26 03:09:57 2006 @@ -0,0 +1,18 @@ +#include <ptlib.h> + +#include <opal/buildopts.h> + +#include <h323/h323.h> +#include <h323/gkclient.h> +#include <lids/lidep.h> +#include <lids/ixjlid.h> +#include <ptclib/pstun.h> + +class BaseOPAL : public OpalManager { + public: + BaseOPAL(); + void load_config(); + private: + switch_xml_t cfg, xml, settings, param; + static char *configfile; +}; \ No newline at end of file Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/mod_opal.cpp Sun Nov 26 03:09:57 2006 @@ -0,0 +1,117 @@ +/* + * 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): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Brian West <brian.west(a)mac.com> + * + * + * + * mod_opal.cpp -- OPAL Endpoint Module + * + */ + +#include <switch.h> + +static const char modname[] = "mod_opal"; + +static switch_memory_pool_t *module_pool = NULL; +static int running = 1; + +static switch_loadable_module_interface_t opal_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ channel_endpoint_interface, + /*.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 const switch_state_handler_table_t channel_event_handlers = { + /*.on_init */ channel_on_init, + /*.on_ring */ channel_on_ring, + /*.on_execute */ channel_on_execute, + /*.on_hangup */ channel_on_hangup, + /*.on_loopback */ channel_on_loopback, + /*.on_transmit */ channel_on_transmit +}; + +static const switch_io_routines_t channel_io_routines = { + /*.outgoing_channel */ channel_outgoing_channel, + /*.answer_channel */ channel_answer_channel, + /*.read_frame */ channel_read_frame, + /*.write_frame */ channel_write_frame, + /*.kill_channel */ channel_kill_channel, + /*.waitfor_read */ channel_waitfor_read, + /*.waitfor_write */ channel_waitfor_write, + /*.send_dtmf */ channel_send_dtmf +}; + +static const switch_endpoint_interface_t channel_endpoint_interface = { + /*.interface_name */ "opal", + /*.io_routines */ &channel_io_routines, + /*.event_handlers */ &channel_event_handlers, + /*.private */ NULL, + /*.next */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + + if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return SWITCH_STATUS_TERM; + } + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &opal_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + Called when the system shuts down +SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) +{ + return SWITCH_STATUS_SUCCESS; +} +*/ + +/* + If it exists, this is called in it's own thread when the module-load completes + If it returns anything but SWITCH_STATUS_TERM it will be called again automaticly +SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) +{ + while(looping) + { + switch_yield(1000); + } + return SWITCH_STATUS_TERM; +} +*/ Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Sun Nov 26 03:09:57 2006 @@ -98,12 +98,19 @@ switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; newchannel = 0; + const char *err; + switch_xml_t xml_root; + + if ((xml_root = switch_xml_open_root(1, &err))) { + switch_console_printf(SWITCH_CHANNEL_LOG,"Reloading the XML file...\n"); + switch_xml_free(xml_root); + } + if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) switch_console_printf(SWITCH_CHANNEL_LOG,"open of %s failed\n", configfile); else { BaseRegistry& registry(BaseRegistry::get()); - registry.reset_active(); for(BaseRegistry::iterator it = registry.active_begin(); it != registry.active_end(); ++it) { basecdr_creator func = *it; @@ -111,6 +118,8 @@ std::auto_ptr<BaseCDR> ptr(_ptr); ptr->disconnect(); } + + registry.reset_active(); for(BaseRegistry::iterator it = registry.begin(); it != registry.end(); ++it) { Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Sun Nov 26 03:09:57 2006 @@ -119,6 +119,7 @@ switch_thread_rwlock_wrlock(cdr_rwlock); newcdrcontainer->reload(); switch_thread_rwlock_unlock(cdr_rwlock); + stream->write_function(stream, "XML Reloaded and mod_cdr reloaded.\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3456 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Nov '06

25 Nov '06

Author: anthm Date: Sat Nov 25 11:52:35 2006 New Revision: 3456 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add sip_authorized variable Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Nov 25 11:52:35 2006 @@ -4275,6 +4275,9 @@ if ((profile->pflags & PFLAG_AUTH_ALL) && tech_pvt && tech_pvt->key && sip) { sip_authorization_t const *authorization = NULL; + switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); + assert(channel != NULL); + if (sip->sip_authorization) { authorization = sip->sip_authorization; } else if (sip->sip_proxy_authorization) { @@ -4286,10 +4289,13 @@ } if (auth_res != AUTH_OK) { - switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); nua_respond(nh, SIP_401_UNAUTHORIZED, TAG_END()); goto done; + } + + if (session) { + switch_channel_set_variable(channel, "sip_authorized", "true"); } }

1 0

[commit] r3455 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Nov '06

25 Nov '06

Author: anthm Date: Sat Nov 25 11:35:56 2006 New Revision: 3455 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add vars Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Nov 25 11:35:56 2006 @@ -3930,8 +3930,8 @@ char *displayname; char *username, *to_username = NULL; char *url_user = (char *) from->a_url->url_user; - char *to_user, *to_host; - + char *to_user, *to_host, *to_port; + if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); @@ -3944,6 +3944,9 @@ to_user = (char *) to->a_url->url_user; to_host = (char *) to->a_url->url_host; + if (!(to_port = (char *) to->a_url->url_port)) { + to_port = "5060"; + } if (switch_strlen_zero(to_user)) { /* if sofia doesnt parse the To: right, we'll have to do it */ if ((to_user = sip_header_as_string(tech_pvt->home, (sip_header_t *) to))) { @@ -3985,7 +3988,7 @@ } if (profile->pflags & PFLAG_FULL_ID) { - if (!(to_username = switch_mprintf("%s@%s", (char *) to_user, (char *) to_host))) { + if (!(to_username = switch_mprintf("%s@%s:%s", (char *) to_user, (char *) to_host, to_port))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); switch_safe_free(username); return; @@ -4006,6 +4009,11 @@ switch_channel_set_variable(channel, "sip_from_user_stripped", (char *)from->a_url->url_user); } switch_channel_set_variable(channel, "sip_from_host", (char *) from->a_url->url_host); + switch_channel_set_variable(channel, "sip_from_port", (char *) from->a_url->url_port); + + switch_channel_set_variable(channel, "sip_to_user", (char *) to_user); + switch_channel_set_variable(channel, "sip_to_host", to_host); + switch_channel_set_variable(channel, "sip_to_port", (char *) to_port); if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), (char *) from->a_url->url_user, profile->dialplan,

1 0

[commit] r3454 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 24 Nov '06

24 Nov '06

Author: knhor Date: Fri Nov 24 14:34:38 2006 New Revision: 3454 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: change caller control mute, to only be mute, not deaf and mute. add the ability to operate on the last (oldest) member of the conference. 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 Fri Nov 24 14:34:38 2006 @@ -795,7 +795,7 @@ { if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { conf_api_sub_mute(member, NULL, NULL); - conf_api_sub_deaf(member, NULL, NULL); +// conf_api_sub_deaf(member, NULL, NULL); } else { conf_api_sub_unmute(member, NULL, NULL); } @@ -2373,18 +2373,18 @@ /* API Interface Function sub-commands */ static api_command_t conf_api_sub_commands[] = { {"list", &conf_api_sub_list, 0, "<confname> list [delim <string>]"}, - {"energy", &conf_api_sub_energy, 1, "<confname> energy <member_id|all> [<newval>]"}, - {"volume in", &conf_api_sub_volume_in, 1, "<confname> volume_in <member_id|all> [<newval>]"}, - {"volume out", &conf_api_sub_volume_out, 1, "<confname> volume_out <member_id|all> [<newval>]"}, + {"energy", &conf_api_sub_energy, 1, "<confname> energy <member_id|all|last> [<newval>]"}, + {"volume in", &conf_api_sub_volume_in, 1, "<confname> volume_in <member_id|all|last> [<newval>]"}, + {"volume out", &conf_api_sub_volume_out, 1, "<confname> volume_out <member_id|all|last> [<newval>]"}, {"play", &conf_api_sub_play, 0, "<confname> play <file_path> [<member_id>]"}, {"say", &conf_api_sub_say, 2, "<confname> say <text>"}, {"saymember", &conf_api_sub_saymember, 2, "<confname> saymember <member_id><text>"}, - {"stop", &conf_api_sub_stop, 1, "<confname> stop <[current|all]> [<member_id>]"}, - {"kick", &conf_api_sub_kick, 1, "<confname> kick <[member_id|all]>"}, - {"mute", &conf_api_sub_mute, 1, "<confname> mute <[member_id|all]>"}, - {"unmute", &conf_api_sub_unmute, 1, "<confname> unmute <[member_id|all]>"}, - {"deaf", &conf_api_sub_deaf, 1, "<confname> deaf <[member_id|all]>"}, - {"undeaf", &conf_api_sub_undeaf, 1, "<confname> undef <[member_id|all]>"}, + {"stop", &conf_api_sub_stop, 1, "<confname> stop <[current|all|last]> [<member_id>]"}, + {"kick", &conf_api_sub_kick, 1, "<confname> kick <[member_id|all|last]>"}, + {"mute", &conf_api_sub_mute, 1, "<confname> mute <[member_id|all]|last>"}, + {"unmute", &conf_api_sub_unmute, 1, "<confname> unmute <[member_id|all]|last>"}, + {"deaf", &conf_api_sub_deaf, 1, "<confname> deaf <[member_id|all]|last>"}, + {"undeaf", &conf_api_sub_undeaf, 1, "<confname> undef <[member_id|all]|last>"}, {"relate", &conf_api_sub_relate, 0, "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"}, {"lock", &conf_api_sub_lock, 0, "<confname> lock"}, {"unlock", &conf_api_sub_unlock, 0, "<confname> unlock"}, @@ -2429,7 +2429,7 @@ uint32_t cnum = atoi(argv[0]); conference_obj_t *conference = (cnum != 0 ? (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]) : NULL); - if(cnum == 0 || (cnum != 0 && conference != NULL)) { + if(cnum == 0 || (cnum != 0 && conference != NULL && argc >= 3)) { int argn = (cnum != 0 ? 1 : 0); // loop through the command table to find a match @@ -2450,9 +2450,32 @@ { uint32_t id = atoi(argv[argn+1]); int all = ( id == 0 && strcasecmp(argv[argn+1], "all") == 0 ); + int last = ( id == 0 && strcasecmp(argv[argn+1], "last") == 0 ); if(all) { conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); + } else if (last) { + conference_member_t *member = NULL; + conference_member_t *last_member = NULL; + + switch_mutex_lock(conference->member_mutex); + + // find last (oldest) member + member = conference->members; + while (member != NULL) { + if (last_member == NULL || member->id > last_member->id) { + last_member = member; + } + member = member->next; + } + + // exec functio on last (oldest) member + if (last_member != NULL) { + conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; + pfn(last_member, stream, argv[argn+2]); + } + + switch_mutex_unlock(conference->member_mutex); } else { conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; conference_member_t *member = conference_member_get(conference, id); @@ -2493,7 +2516,11 @@ stream->write_function(stream, "Confernece command '%s' not found.\nTry 'help conference'\n", argv[argn]); } } else { - stream->write_function(stream,"No Conference called %s found.\n",argv[0]); + if (argc < 3) { + stream->write_function(stream,"Conference argument required\n"); + } else { + stream->write_function(stream,"No Conference called %s found.\n",argv[0]); + } } } else {

1 0

[commit] r3453 - freeswitch/branches/voltsmith
by Freeswitch SVN 24 Nov '06

24 Nov '06

Author: sphere Date: Fri Nov 24 12:16:27 2006 New Revision: 3453 Added: freeswitch/branches/voltsmith/ Log: Creating empty folder for voltsmith

1 0

[commit] r3452 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Nov '06

24 Nov '06

Author: mikej Date: Fri Nov 24 10:44:10 2006 New Revision: 3452 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: use LF, not CRLF Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Nov 24 10:44:10 2006 @@ -4466,9 +4466,9 @@ SIPTAG_CONTACT_STR(oregp->register_from), SIPTAG_EXPIRES_STR(oregp->expires_str), NUTAG_REGISTRAR(oregp->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), - NUTAG_OUTBOUND("no-validate"), - NUTAG_KEEPALIVE(0), + NUTAG_OUTBOUND("no-options-keepalive"), + NUTAG_OUTBOUND("no-validate"), + NUTAG_KEEPALIVE(0), TAG_NULL()); oregp->retry = now + 10; oregp->state = REG_STATE_TRYING;

1 0

[commit] r3451 - in freeswitch/trunk: . src/mod/applications/mod_dptools
by Freeswitch SVN 24 Nov '06

24 Nov '06

Author: mikej Date: Fri Nov 24 10:43:46 2006 New Revision: 3451 Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add "log" application to print log messages From Mike Murdock. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Fri Nov 24 10:43:46 2006 @@ -30,6 +30,8 @@ Ken Rice of Asteria Solutions Group, INC <ken AT asteriasgi.com> - xmlcdr, sofia improvements, load testing. Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks. Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups. + Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements. + A big THANK YOU goes to: Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Nov 24 10:43:46 2006 @@ -1,401 +1,422 @@ -/* - * 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): - * - * Anthony Minessale II <anthmct(a)yahoo.com> - * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> - * - * - * mod_dptools.c -- Raw Audio File Streaming Application Module - * - */ -#include <switch.h> - -static const char modname[] = "mod_dptools"; - -static const switch_application_interface_t detect_speech_application_interface; - -static void detect_speech_function(switch_core_session_t *session, char *data) -{ - char *argv[4]; - int argc; - char *lbuf = NULL; - - if ((lbuf = switch_core_session_strdup(session, data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { - if (!strcasecmp(argv[0], "grammar") && argc >= 1) { - switch_ivr_detect_speech_load_grammar(session, argv[1], argv[2]); - } else if (!strcasecmp(argv[0], "nogrammar")) { - switch_ivr_detect_speech_unload_grammar(session, argv[1]); - } else if (!strcasecmp(argv[0], "pause")) { - switch_ivr_pause_detect_speech(session); - } else if (!strcasecmp(argv[0], "resume")) { - switch_ivr_resume_detect_speech(session); - } else if (!strcasecmp(argv[0], "stop")) { - switch_ivr_stop_detect_speech(session); - } else if (argc >= 3) { - switch_ivr_detect_speech(session, argv[0], argv[1], argv[2], argv[3], NULL); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", detect_speech_application_interface.syntax); - } - -} - -static void ringback_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - switch_channel_ringback(channel); -} - -static void transfer_function(switch_core_session_t *session, char *data) -{ - int argc; - char *argv[4] = {0}; - char *mydata; - - if ((mydata = switch_core_session_strdup(session, data))) { - if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { - switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n"); - } - } -} - -static void sleep_function(switch_core_session_t *session, char *data) -{ - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); - } else { - uint32_t ms = atoi(data); - switch_ivr_sleep(session, ms); - } -} - -static void eval_function(switch_core_session_t *session, char *data) -{ - return; -} - -static void answer_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - switch_channel_answer(channel); -} - -static void set_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - char *var, *val = NULL; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); - } else { - var = switch_core_session_strdup(session, data); - val = strchr(var, '='); - - if (val) { - *val++ = '\0'; - if (!strcmp(val, "_UNDEF_")) { - val = NULL; - } - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, val ? val : "UNDEF"); - switch_channel_set_variable(channel, var, val); - } -} - -static void privacy_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - switch_caller_profile_t *caller_profile; - char *arg; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - caller_profile = switch_channel_get_caller_profile(channel); - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n"); - } else { - arg = switch_core_session_strdup(session, data); - - switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); - - if(!strcasecmp(arg, "no")) { - switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); - switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(arg, "yes")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(arg, "full")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(arg, "name")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); - } else if (!strcasecmp(arg, "number")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); - } -} - -static void strftime_function(switch_core_session_t *session, char *data) -{ - char *argv[2]; - int argc; - char *lbuf; - - if ((lbuf = switch_core_session_strdup(session, data))&&(argc = switch_separate_string(lbuf, '=', argv, (sizeof(argv) / sizeof(argv[0])))) > 1) { - switch_size_t retsize; - switch_time_exp_t tm; - char date[80] = ""; - switch_channel_t *channel; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), argv[1], &tm); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date); - switch_channel_set_variable(channel, argv[0], date); - } -} - -static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) -{ - switch_size_t retsize; - switch_time_exp_t tm; - char date[80] = ""; - - switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), fmt, &tm); - stream->write_function(stream, date); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) -{ - switch_event_t *event; - char *lbuf, *argv[4]; - int argc = 0; - switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; - - if (fmt && (lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { - if (!strcasecmp(argv[0], "out")) { - type = SWITCH_EVENT_PRESENCE_OUT; - } else if (argc != 4) { - stream->write_function(stream, "Invalid"); - return SWITCH_STATUS_SUCCESS; - } - - if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "dp"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", __FILE__); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", argv[1]); - if (type == SWITCH_EVENT_PRESENCE_IN) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", argv[2]); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", argv[3]); - } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } - stream->write_function(stream, "Event Sent"); - switch_safe_free(lbuf); - } else { - stream->write_function(stream, "Invalid"); - } - - return SWITCH_STATUS_SUCCESS; -} - - -static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) -{ - char *lbuf, *argv[4]; - int argc = 0; - - if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { - switch_chat_interface_t *ci; - - if ((ci = switch_loadable_module_get_chat_interface(argv[0]))) { - ci->chat_send("dp", argv[1], argv[2], "", argv[3], ""); - stream->write_function(stream, "Sent"); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", argv[0]); - } - } else { - stream->write_function(stream, "Invalid"); - } - - return SWITCH_STATUS_SUCCESS; -} - - -static switch_api_interface_t chat_api_interface = { - /*.interface_name */ "chat", - /*.desc */ "chat", - /*.function */ chat_api_function, - /*.syntax */ "<proto>|<from>|<to>|<message>", - /*.next */ NULL -}; - -static switch_api_interface_t dptools_api_interface = { - /*.interface_name */ "strftime", - /*.desc */ "strftime", - /*.function */ strftime_api_function, - /*.syntax */ "<format_string>", - /*.next */ &chat_api_interface -}; - -static switch_api_interface_t presence_api_interface = { - /*.interface_name */ "presence", - /*.desc */ "presence", - /*.function */ presence_api_function, - /*.syntax */ "<user> <rpid> <message>", - /*.next */ &dptools_api_interface -}; - -static const switch_application_interface_t detect_speech_application_interface = { - /*.interface_name */ "detect_speech", - /*.application_function */ detect_speech_function, - /* long_desc */ "Detect speech on a channel.", - /* short_desc */ "Detect speech", - /* syntax */ "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume", - /*.next */ NULL -}; - -static const switch_application_interface_t ringback_application_interface = { - /*.interface_name */ "ringback", - /*.application_function */ ringback_function, - /* long_desc */ "Indicate Ringback on a channel.", - /* short_desc */ "Indicate Ringback", - /* syntax */ "", - /*.next */ &detect_speech_application_interface -}; - -static const switch_application_interface_t set_application_interface = { - /*.interface_name */ "set", - /*.application_function */ set_function, - /* long_desc */ "Set a channel varaible for the channel calling the application.", - /* short_desc */ "Set a channel varaible", - /* syntax */ "<varname>=[<value>|_UNDEF_]", - /*.next */ &ringback_application_interface -}; - -static const switch_application_interface_t answer_application_interface = { - /*.interface_name */ "answer", - /*.application_function */ answer_function, - /* long_desc */ "Answer the call for a channel.", - /* short_desc */ "Answer the call", - /* syntax */ "", - /*.next */ &set_application_interface - -}; - -static const switch_application_interface_t eval_application_interface = { - /*.interface_name */ "eval", - /*.application_function */ eval_function, - /* long_desc */ "Do Nothing", - /* short_desc */ "Do Nothing", - /* syntax */ "", - /*.next */ &answer_application_interface - -}; - -static const switch_application_interface_t strftime_application_interface = { - /*.interface_name */ "strftime", - /*.application_function */ strftime_function, - /* long_desc */ NULL, - /* short_desc */ NULL, - /* syntax */ NULL, - /*.next */ &eval_application_interface - -}; - -static const switch_application_interface_t sleep_application_interface = { - /*.interface_name */ "sleep", - /*.application_function */ sleep_function, - /* long_desc */ "Pause the channel for a given number of milliseconds, consuming the audio for that period of time.", - /* short_desc */ "Pause a channel", - /* syntax */ "<pausemilliseconds>", - /* next */ &strftime_application_interface -}; - -static const switch_application_interface_t transfer_application_interface = { - /*.interface_name */ "transfer", - /*.application_function */ transfer_function, - /* long_desc */ "Immediatly transfer the calling channel to a new extension", - /* short_desc */ "Transfer a channel", - /* syntax */ "<exten> [<dialplan> <context>]", - /* next */ &sleep_application_interface -}; - -static const switch_application_interface_t privacy_application_interface = { - /*.interface_name */ "privacy", - /*.application_function */ privacy_function, - /* long_desc */ "Set caller privacy on calls.", - /* short_desc */ "Set privacy on calls", - /* syntax */ "off|on|name|full|number", - /*.next */ &transfer_application_interface -}; - -static const switch_loadable_module_interface_t mod_dptools_module_interface = { - /*.module_name = */ modname, - /*.endpoint_interface = */ NULL, - /*.timer_interface = */ NULL, - /*.dialplan_interface = */ NULL, - /*.codec_interface = */ NULL, - /*.application_interface */ &privacy_application_interface, - /*.api_interface */ &presence_api_interface -}; - -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 = &mod_dptools_module_interface; - - - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} - -/* 'switch_module_runtime' will start up in a thread by itself just by having it exist -if it returns anything but SWITCH_STATUS_TERM it will be called again automaticly -*/ - - -//switch_status_t switch_module_runtime(void) +/* + * 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): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> + * Michael Murdock <mike at mmurdock dot org> + * + * + * mod_dptools.c -- Raw Audio File Streaming Application Module + * + */ +#include <switch.h> + +static const char modname[] = "mod_dptools"; + +static const switch_application_interface_t detect_speech_application_interface; + +static void detect_speech_function(switch_core_session_t *session, char *data) +{ + char *argv[4]; + int argc; + char *lbuf = NULL; + + if ((lbuf = switch_core_session_strdup(session, data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (!strcasecmp(argv[0], "grammar") && argc >= 1) { + switch_ivr_detect_speech_load_grammar(session, argv[1], argv[2]); + } else if (!strcasecmp(argv[0], "nogrammar")) { + switch_ivr_detect_speech_unload_grammar(session, argv[1]); + } else if (!strcasecmp(argv[0], "pause")) { + switch_ivr_pause_detect_speech(session); + } else if (!strcasecmp(argv[0], "resume")) { + switch_ivr_resume_detect_speech(session); + } else if (!strcasecmp(argv[0], "stop")) { + switch_ivr_stop_detect_speech(session); + } else if (argc >= 3) { + switch_ivr_detect_speech(session, argv[0], argv[1], argv[2], argv[3], NULL); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", detect_speech_application_interface.syntax); + } + +} + +static void ringback_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_ringback(channel); +} + +static void transfer_function(switch_core_session_t *session, char *data) +{ + int argc; + char *argv[4] = {0}; + char *mydata; + + if ((mydata = switch_core_session_strdup(session, data))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n"); + } + } +} + +static void sleep_function(switch_core_session_t *session, char *data) +{ + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); + } else { + uint32_t ms = atoi(data); + switch_ivr_sleep(session, ms); + } +} + +static void eval_function(switch_core_session_t *session, char *data) +{ + return; +} + +static void answer_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_answer(channel); +} + +static void set_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + char *var, *val = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + } else { + var = switch_core_session_strdup(session, data); + val = strchr(var, '='); + + if (val) { + *val++ = '\0'; + if (!strcmp(val, "_UNDEF_")) { + val = NULL; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, val ? val : "UNDEF"); + switch_channel_set_variable(channel, var, val); + } +} + +static void log_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s\n", data); + } +} + +static void privacy_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + char *arg; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + caller_profile = switch_channel_get_caller_profile(channel); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n"); + } else { + arg = switch_core_session_strdup(session, data); + + switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); + + if(!strcasecmp(arg, "no")) { + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "yes")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "full")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "name")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + } else if (!strcasecmp(arg, "number")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); + } +} + +static void strftime_function(switch_core_session_t *session, char *data) +{ + char *argv[2]; + int argc; + char *lbuf; + + if ((lbuf = switch_core_session_strdup(session, data))&&(argc = switch_separate_string(lbuf, '=', argv, (sizeof(argv) / sizeof(argv[0])))) > 1) { + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), argv[1], &tm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date); + switch_channel_set_variable(channel, argv[0], date); + } +} + +static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), fmt, &tm); + stream->write_function(stream, date); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_event_t *event; + char *lbuf, *argv[4]; + int argc = 0; + switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; + + if (fmt && (lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + if (!strcasecmp(argv[0], "out")) { + type = SWITCH_EVENT_PRESENCE_OUT; + } else if (argc != 4) { + stream->write_function(stream, "Invalid"); + return SWITCH_STATUS_SUCCESS; + } + + if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "dp"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", __FILE__); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", argv[1]); + if (type == SWITCH_EVENT_PRESENCE_IN) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", argv[2]); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", argv[3]); + } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } + stream->write_function(stream, "Event Sent"); + switch_safe_free(lbuf); + } else { + stream->write_function(stream, "Invalid"); + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + char *lbuf, *argv[4]; + int argc = 0; + + if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { + switch_chat_interface_t *ci; + + if ((ci = switch_loadable_module_get_chat_interface(argv[0]))) { + ci->chat_send("dp", argv[1], argv[2], "", argv[3], ""); + stream->write_function(stream, "Sent"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", argv[0]); + } + } else { + stream->write_function(stream, "Invalid"); + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_api_interface_t chat_api_interface = { + /*.interface_name */ "chat", + /*.desc */ "chat", + /*.function */ chat_api_function, + /*.syntax */ "<proto>|<from>|<to>|<message>", + /*.next */ NULL +}; + +static switch_api_interface_t dptools_api_interface = { + /*.interface_name */ "strftime", + /*.desc */ "strftime", + /*.function */ strftime_api_function, + /*.syntax */ "<format_string>", + /*.next */ &chat_api_interface +}; + +static switch_api_interface_t presence_api_interface = { + /*.interface_name */ "presence", + /*.desc */ "presence", + /*.function */ presence_api_function, + /*.syntax */ "<user> <rpid> <message>", + /*.next */ &dptools_api_interface +}; + +static const switch_application_interface_t detect_speech_application_interface = { + /*.interface_name */ "detect_speech", + /*.application_function */ detect_speech_function, + /* long_desc */ "Detect speech on a channel.", + /* short_desc */ "Detect speech", + /* syntax */ "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume", + /*.next */ NULL +}; + +static const switch_application_interface_t ringback_application_interface = { + /*.interface_name */ "ringback", + /*.application_function */ ringback_function, + /* long_desc */ "Indicate Ringback on a channel.", + /* short_desc */ "Indicate Ringback", + /* syntax */ "", + /*.next */ &detect_speech_application_interface +}; + +static const switch_application_interface_t set_application_interface = { + /*.interface_name */ "set", + /*.application_function */ set_function, + /* long_desc */ "Set a channel varaible for the channel calling the application.", + /* short_desc */ "Set a channel varaible", + /* syntax */ "<varname>=[<value>|_UNDEF_]", + /*.next */ &ringback_application_interface +}; + +static const switch_application_interface_t log_application_interface = { + /*.interface_name */ "log", + /*.application_function */ log_function, + /* long_desc */ "Logs a channel varaible for the channel calling the application.", + /* short_desc */ "Logs a channel varaible", + /* syntax */ "<varname>", + /*.next */ &set_application_interface +}; + +static const switch_application_interface_t answer_application_interface = { + /*.interface_name */ "answer", + /*.application_function */ answer_function, + /* long_desc */ "Answer the call for a channel.", + /* short_desc */ "Answer the call", + /* syntax */ "", + /*.next */ &log_application_interface + +}; + +static const switch_application_interface_t eval_application_interface = { + /*.interface_name */ "eval", + /*.application_function */ eval_function, + /* long_desc */ "Do Nothing", + /* short_desc */ "Do Nothing", + /* syntax */ "", + /*.next */ &answer_application_interface + +}; + +static const switch_application_interface_t strftime_application_interface = { + /*.interface_name */ "strftime", + /*.application_function */ strftime_function, + /* long_desc */ NULL, + /* short_desc */ NULL, + /* syntax */ NULL, + /*.next */ &eval_application_interface + +}; + +static const switch_application_interface_t sleep_application_interface = { + /*.interface_name */ "sleep", + /*.application_function */ sleep_function, + /* long_desc */ "Pause the channel for a given number of milliseconds, consuming the audio for that period of time.", + /* short_desc */ "Pause a channel", + /* syntax */ "<pausemilliseconds>", + /* next */ &strftime_application_interface +}; + +static const switch_application_interface_t transfer_application_interface = { + /*.interface_name */ "transfer", + /*.application_function */ transfer_function, + /* long_desc */ "Immediatly transfer the calling channel to a new extension", + /* short_desc */ "Transfer a channel", + /* syntax */ "<exten> [<dialplan> <context>]", + /* next */ &sleep_application_interface +}; + +static const switch_application_interface_t privacy_application_interface = { + /*.interface_name */ "privacy", + /*.application_function */ privacy_function, + /* long_desc */ "Set caller privacy on calls.", + /* short_desc */ "Set privacy on calls", + /* syntax */ "off|on|name|full|number", + /*.next */ &transfer_application_interface +}; + +static const switch_loadable_module_interface_t mod_dptools_module_interface = { + /*.module_name = */ modname, + /*.endpoint_interface = */ NULL, + /*.timer_interface = */ NULL, + /*.dialplan_interface = */ NULL, + /*.codec_interface = */ NULL, + /*.application_interface */ &privacy_application_interface, + /*.api_interface */ &presence_api_interface +}; + +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 = &mod_dptools_module_interface; + + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* 'switch_module_runtime' will start up in a thread by itself just by having it exist +if it returns anything but SWITCH_STATUS_TERM it will be called again automaticly +*/ + + +//switch_status_t switch_module_runtime(void)

1 0