- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3240 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Oct '06

31 Oct '06

Author: mikej Date: Tue Oct 31 00:42:40 2006 New Revision: 3240 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: use switch_payload_t for the rtp payload numbers. 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 Tue Oct 31 00:42:40 2006 @@ -252,7 +252,7 @@ struct private_object { sofia_private_t sofia_private; uint32_t flags; - uint32_t agreed_pt; + switch_payload_t agreed_pt; switch_core_session_t *session; switch_frame_t read_frame; const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS]; @@ -2016,7 +2016,7 @@ tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; - tech_pvt->agreed_pt = map->rm_pt; + tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt; break; } else { match = 0;

1 0

[commit] r3239 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 31 Oct '06

31 Oct '06

Author: mikej Date: Tue Oct 31 00:04:47 2006 New Revision: 3239 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: formatting whitespace changes from knhor branch. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 31 00:04:47 2006 @@ -58,8 +58,8 @@ switch_core_measure_time(switch_core_uptime(), &duration); if (stream->event) { - http = switch_event_get_header(stream->event, "http-host"); - } + http = switch_event_get_header(stream->event, "http-host"); + } if (http || (cmd && strstr(cmd, "html"))) { html = 1; @@ -139,23 +139,24 @@ } - static switch_status_t load_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { if (session) { return SWITCH_STATUS_FALSE; } + if (switch_strlen_zero(mod)) { stream->write_function(stream, "USAGE: %s\n", load_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } + switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod); stream->write_function(stream, "OK\n"); + return SWITCH_STATUS_SUCCESS; } - static switch_status_t reload_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; @@ -170,6 +171,7 @@ } stream->write_function(stream, "OK [%s]\n", err); + return SWITCH_STATUS_SUCCESS; } @@ -195,7 +197,6 @@ return SWITCH_STATUS_SUCCESS; } - static switch_status_t transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; @@ -234,8 +235,6 @@ return SWITCH_STATUS_SUCCESS; } - - static switch_status_t uuid_bridge_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[4] = {0}; @@ -258,8 +257,6 @@ return SWITCH_STATUS_SUCCESS; } - - static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; @@ -419,10 +416,7 @@ holder->stream->write_function(holder->stream, "%s%s", argv[x], x == (argc - 1) ? "\n" : ","); } } - - - holder->count++; return 0; } @@ -440,43 +434,38 @@ } if (stream->event) { - holder.http = switch_event_get_header(stream->event, "http-host"); - } + holder.http = switch_event_get_header(stream->event, "http-host"); + } holder.print_title = 1; - if (!cmd) { - sprintf (sql, "select * from interfaces"); - } - else if ( !strcmp(cmd,"codec") || !strcmp(cmd,"dialplan") || - !strcmp(cmd,"file") || !strcmp(cmd,"timer") - ) { - sprintf (sql, "select type, name from interfaces where type = '%s'", cmd); - } - else if (!strcmp(cmd,"application") || !strcmp(cmd,"api")) { - sprintf (sql, "select name, description, syntax from interfaces where type = '%s'", cmd); - } - else if ( !strcmp(cmd,"calls")) { - sprintf (sql, "select * from calls"); - } - else if ( !strcmp(cmd,"channels")) { - sprintf (sql, "select * from channels"); - } - else if (!strncasecmp(cmd, "help", 4)) { + // If you changes the field qty or order of any of these select + // statmements, you must also change show_callback and friends to match! + if (!cmd) { + sprintf (sql, "select * from interfaces"); + } else if ( !strcmp(cmd,"codec") || !strcmp(cmd,"dialplan") || !strcmp(cmd,"file") || !strcmp(cmd,"timer")) { + sprintf (sql, "select type, name from interfaces where type = '%s'", cmd); + } else if (!strcmp(cmd,"application") || !strcmp(cmd,"api")) { + sprintf (sql, "select name, description, syntax from interfaces where type = '%s'", cmd); + } else if ( !strcmp(cmd,"calls")) { + sprintf (sql, "select * from calls"); + } else if ( !strcmp(cmd,"channels")) { + sprintf (sql, "select * from channels"); + } else if (!strncasecmp(cmd, "help", 4)) { char *cmdname = NULL; + help = 1; holder.print_title = 0; if ((cmdname = strchr(cmd, ' ')) != 0) { *cmdname++ = '\0'; - sprintf (sql, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); + sprintf (sql, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { - sprintf (sql, "select name, syntax, description from interfaces where type = 'api'"); + sprintf (sql, "select name, syntax, description from interfaces where type = 'api'"); } - } - else { + } else { stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); - return SWITCH_STATUS_SUCCESS; - } + return SWITCH_STATUS_SUCCESS; + } holder.stream = stream; holder.count = 0; @@ -517,11 +506,16 @@ sprintf (showcmd, "help %s", cmd); } - if (all) + if (all) { stream->write_function(stream, "\nValid Commands:\n\n"); + } + show_function(showcmd, session, stream); - if (all) + + if (all) { stream->write_function(stream, "version\n" "shutdown - stop the program\n"); + } + return SWITCH_STATUS_SUCCESS; } @@ -614,7 +608,6 @@ /*.next */ &kill_api_interface }; - static const switch_loadable_module_interface_t mod_commands_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, @@ -625,15 +618,11 @@ /*.api_interface */ &originate_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_commands_module_interface; - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } -

1 0

[commit] r3237 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 30 Oct '06

30 Oct '06

Author: anthm Date: Mon Oct 30 15:54:24 2006 New Revision: 3237 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Oct 30 15:54:24 2006 @@ -191,7 +191,7 @@ static ldl_status handle_response(ldl_handle_t *handle, char *id); static switch_status_t load_config(void); -#define is_special(s) (strstr(s, "ext+") || strstr(s, "user+") || strstr(s, "conf+")) +#define is_special(s) (s && (strstr(s, "ext+") || strstr(s, "user+") || strstr(s, "conf+"))) static char *translate_rpid(char *in, char *ext) {

1 0

[commit] r3236 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 30 Oct '06

30 Oct '06

Author: anthm Date: Mon Oct 30 10:27:05 2006 New Revision: 3236 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: let sofia have here way 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 Oct 30 10:27:05 2006 @@ -252,6 +252,7 @@ struct private_object { sofia_private_t sofia_private; uint32_t flags; + uint32_t agreed_pt; switch_core_session_t *session; switch_frame_t read_frame; const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS]; @@ -1329,7 +1330,7 @@ tech_pvt->local_sdp_audio_port, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, - tech_pvt->read_codec.implementation->ianacode, + tech_pvt->agreed_pt, tech_pvt->read_codec.implementation->microseconds_per_frame / 1000); @@ -1352,7 +1353,7 @@ tech_pvt->local_sdp_audio_port, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, - tech_pvt->read_codec.implementation->ianacode, + tech_pvt->agreed_pt, tech_pvt->read_codec.implementation->encoded_bytes_per_frame, tech_pvt->codec_ms * 1000, (switch_rtp_flag_t) flags, @@ -2015,6 +2016,7 @@ tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; + tech_pvt->agreed_pt = map->rm_pt; break; } else { match = 0;

1 0

[commit] r3233 - freeswitch/trunk/src
by Freeswitch SVN 30 Oct '06

30 Oct '06

Author: mikej Date: Sun Oct 29 20:36:51 2006 New Revision: 3233 Modified: freeswitch/trunk/src/switch.c Log: formatting and comments. More to come. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sun Oct 29 20:36:51 2006 @@ -33,111 +33,146 @@ #include <switch.h> +//pid filename: Stores the process id of the freeswitch process #define PIDFILE "freeswitch.pid" -#define LOGFILE "freeswitch.log" +static char *pfile = PIDFILE; +//log filename: Filename of the freeswitch log file to be used if we are in background mode +#define LOGFILE "freeswitch.log" static char *lfile = LOGFILE; -static char *pfile = PIDFILE; + +//If we are a windows service, what should we be called #define SERVICENAME "Freeswitch" +//Picky compiler #ifdef __ICC #pragma warning (disable:167) #endif - #ifdef WIN32 #include <winsock2.h> #include <windows.h> + +//event to signal shutdown (for you unix people, this is like a pthread_cond) static HANDLE shutdown_event; #endif +//signal handler for when freeswitch is running in background mode. +//signal triggers the shutdown of freeswitch static void handle_SIGHUP(int sig) { uint32_t arg = 0; if(sig); + //send shutdown signal to the freeswitch core switch_core_session_ctl(SCSC_SHUTDOWN, &arg); return; } - +//kill a freeswitch process running in background mode static int freeswitch_kill_background() { - FILE *f; - char path[256] = ""; - pid_t pid = 0; + FILE *f; //FILE handle to open the pid file + char path[256] = ""; //full path of the PID file + pid_t pid = 0; //pid from the pid file + + //set the globals so we can use the global paths. switch_core_set_globals(); + + //get the full path of the pid file. snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + + //open the pid file if ((f = fopen(path, "r")) == 0) { + //pid file does not exist fprintf(stderr, "Cannot open pid file %s.\n", path); return 255; } + + //pull the pid from the file fscanf(f, "%d", &pid); + + //if we have a valid pid if (pid > 0) { + + //kill the freeswitch running at the pid we found fprintf(stderr, "Killing: %d\n", (int) pid); #ifdef WIN32 + //for windows we need the event to signal for shutting down a background freewitc snprintf(path, sizeof(path), "Global\\Freeswitch.%d", pid); + + //open the event so we can signal it shutdown_event = OpenEvent(EVENT_MODIFY_STATE, FALSE, path); + + //did we sucessfully open the event if (!shutdown_event) { /* we can't get the event, so we can't signal the process to shutdown */ fprintf(stderr, "ERROR: Can't Shutdown: %d\n", (int) pid); } else { + //signal the event to shutdown SetEvent(shutdown_event); } + //cleanup CloseHandle(shutdown_event); #else + //for unix, send the signal to kill. kill(pid, SIGTERM); #endif } + //be nice and close the file handle to the pid file fclose(f); + return 0; } #ifdef WIN32 + +//we need these vars to handle the service SERVICE_STATUS_HANDLE hStatus; SERVICE_STATUS status; +//Handler function for service start/stop from the service void WINAPI ServiceCtrlHandler( DWORD control ) { - switch( control ) - { - case SERVICE_CONTROL_SHUTDOWN: - case SERVICE_CONTROL_STOP: - // do shutdown stuff here + switch( control ) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + // do shutdown stuff here switch_core_destroy(); - status.dwCurrentState = SERVICE_STOPPED; - status.dwWin32ExitCode = 0; - status.dwCheckPoint = 0; - status.dwWaitHint = 0; - break; - case SERVICE_CONTROL_INTERROGATE: - // just set the current state to whatever it is... - break; - } + status.dwCurrentState = SERVICE_STOPPED; + status.dwWin32ExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + break; + case SERVICE_CONTROL_INTERROGATE: + // just set the current state to whatever it is... + break; + } - SetServiceStatus( hStatus, &status ); + SetServiceStatus( hStatus, &status ); } void WINAPI service_main( DWORD numArgs, char **args ) { const char *err = NULL; - // we have to initialize the service-specific stuff - memset( &status, 0, sizeof(SERVICE_STATUS) ); - status.dwServiceType = SERVICE_WIN32; - status.dwCurrentState = SERVICE_START_PENDING; - status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + // we have to initialize the service-specific stuff + memset( &status, 0, sizeof(SERVICE_STATUS) ); + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_START_PENDING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - hStatus = RegisterServiceCtrlHandler( SERVICENAME, &ServiceCtrlHandler ); + hStatus = RegisterServiceCtrlHandler( SERVICENAME, &ServiceCtrlHandler ); - SetServiceStatus( hStatus, &status ); + SetServiceStatus( hStatus, &status ); set_high_priority(); if (switch_core_init_and_modload(lfile, &err) != SWITCH_STATUS_SUCCESS) { - status.dwCurrentState = SERVICE_STOPPED; + status.dwCurrentState = SERVICE_STOPPED; } else { status.dwCurrentState = SERVICE_RUNNING; } - SetServiceStatus( hStatus, &status ); + SetServiceStatus( hStatus, &status ); } #endif @@ -153,23 +188,22 @@ int x, die = 0; #ifdef WIN32 - SERVICE_TABLE_ENTRY dispatchTable[] = - { - { SERVICENAME, &service_main }, - { NULL, NULL } - }; + SERVICE_TABLE_ENTRY dispatchTable[] = + { + { SERVICENAME, &service_main }, + { NULL, NULL } + }; #endif for (x = 1; x < argc; x++) { #ifdef WIN32 if (x == 1) { if (argv[x] && !strcmp(argv[x], "-service")) { - if(StartServiceCtrlDispatcher( dispatchTable ) == 0 ) - { - //Not loaded as a service - fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n"); - fprintf(stderr, "To install the service load freeswitch with -install\n"); - } + if(StartServiceCtrlDispatcher( dispatchTable ) == 0 ) { + //Not loaded as a service + fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n"); + fprintf(stderr, "To install the service load freeswitch with -install\n"); + } exit(0); } if (argv[x] && !strcmp(argv[x], "-install")) { @@ -180,30 +214,29 @@ GetModuleFileName( NULL, exePath, 1024 ); snprintf(servicePath, sizeof(servicePath), "%s -service", exePath); CreateService( - handle, - SERVICENAME, - SERVICENAME, - GENERIC_READ | GENERIC_EXECUTE, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_AUTO_START, - SERVICE_ERROR_IGNORE, - servicePath, - NULL, - NULL, - NULL, - NULL, - NULL - ); + handle, + SERVICENAME, + SERVICENAME, + GENERIC_READ | GENERIC_EXECUTE, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START, + SERVICE_ERROR_IGNORE, + servicePath, + NULL, + NULL, + NULL, + NULL, + NULL + ); exit(0); } if (argv[x] && !strcmp(argv[x], "-uninstall")) { SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS ); SC_HANDLE service = OpenService( handle, SERVICENAME, DELETE ); - if( service != NULL ) - { - // remove the service! - DeleteService( service ); - } + if( service != NULL ) { + // remove the service! + DeleteService( service ); + } exit(0); } } @@ -211,7 +244,7 @@ if (argv[x] && !strcmp(argv[x], "-hp")) { set_high_priority(); } - + if (argv[x] && !strcmp(argv[x], "-stop")) { die++; }

1 0

[commit] r3228 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 29 Oct '06

29 Oct '06

Author: anthm Date: Sun Oct 29 13:15:53 2006 New Revision: 3228 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: doh, thx CtRiX 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 Sun Oct 29 13:15:53 2006 @@ -186,7 +186,7 @@ int argc = 0; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; - if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + 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) {

1 0

[commit] r3227 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_sofia
by Freeswitch SVN 29 Oct '06

29 Oct '06

Author: anthm Date: Sun Oct 29 12:57:55 2006 New Revision: 3227 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Oct 29 12:57:55 2006 @@ -1497,6 +1497,12 @@ } if ((mdl_profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + + if ((mdl_profile->user_flags & LDL_FLAG_COMPONENT) && strchr(outbound_profile->caller_id_number, '@')) { + snprintf(ubuf, sizeof(ubuf), "%s/talk", outbound_profile->caller_id_number); + user = ubuf; + } + if (!ldl_handle_ready(mdl_profile->handle)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! we are not logged in yet!\n"); terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); 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 Sun Oct 29 12:57:55 2006 @@ -3693,7 +3693,7 @@ char *username, *to_username = NULL; char *url_user = (char *) from->a_url->url_user; char *to_user, *to_host; - char *a,*b; + 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__); @@ -3754,18 +3754,19 @@ } } - if ((a = strchr(to_user, '+')) && (b = strrchr(to_user, '+')) && a != b) { - *b = '@'; - } - attach_private(session, profile, tech_pvt, username); channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); set_chat_hash(tech_pvt, sip); - switch_channel_set_variable(channel, "sip_fromuser", (char *) from->a_url->url_user); - switch_channel_set_variable(channel, "sip_fromhost", (char *) from->a_url->url_host); + switch_channel_set_variable(channel, "sip_from_user", (char *) from->a_url->url_user); + if (from->a_url->url_user && *from->a_url->url_user == '+') { + switch_channel_set_variable(channel, "sip_from_user_stripped", (char *)(from->a_url->url_user+1)); + } else { + 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); 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] r3226 - in freeswitch/trunk: libs/libspeakup src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 29 Oct '06

29 Oct '06

Author: anthm Date: Sun Oct 29 10:36:23 2006 New Revision: 3226 Modified: freeswitch/trunk/libs/libspeakup/Makefile.in freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/switch_channel.c Log: update Modified: freeswitch/trunk/libs/libspeakup/Makefile.in ============================================================================== --- freeswitch/trunk/libs/libspeakup/Makefile.in (original) +++ freeswitch/trunk/libs/libspeakup/Makefile.in Sun Oct 29 10:36:23 2006 @@ -136,6 +136,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -164,12 +165,9 @@ VERSION = @VERSION@ WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@ WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -186,25 +184,32 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ new_AM_CFLAGS = @new_AM_CFLAGS@ new_AM_LDFLAGS = @new_AM_LDFLAGS@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Oct 29 10:36:23 2006 @@ -2449,7 +2449,7 @@ char *context; char *cid_name; char *cid_num; - char *t, *them = NULL; + char *tmp, *t, *them = NULL; memset(payloads, 0, sizeof(payloads)); @@ -2481,8 +2481,6 @@ } } - - if (!(context = ldl_session_get_value(dlsession, "context"))) { context = profile->context; } @@ -2502,6 +2500,21 @@ tech_pvt->them = switch_core_session_strdup(session, ldl_session_get_callee(dlsession)); tech_pvt->us = switch_core_session_strdup(session, ldl_session_get_caller(dlsession)); + + if ((tmp = strdup(tech_pvt->us))) { + char *p, *q; + + if ((p = strchr(tmp, '@'))) { + *p++ = '\0'; + if ((q = strchr(p, '/'))) { + *q = '\0'; + } + switch_channel_set_variable(channel, "dl_from_user", tmp); + switch_channel_set_variable(channel, "dl_from_host", p); + } + + switch_safe_free(tmp); + } if (!tech_pvt->caller_profile) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating an identity for %s %s <%s> %s\n", Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Oct 29 10:36:23 2006 @@ -1171,7 +1171,7 @@ return in; } } - nlen = strlen(sub_val); + nlen = sub_val ? strlen(sub_val) : 0; if (len + nlen >= olen) { olen += block; cpos = c - data; @@ -1186,10 +1186,11 @@ vname = data + vvalpos; } - len += nlen; - strcat(c, sub_val); - c += nlen; - + if (nlen) { + len += nlen; + strcat(c, sub_val); + c += nlen; + } if (func_val) { free(func_val); func_val = NULL;

1 0

[commit] r3225 - freeswitch/trunk
by Freeswitch SVN 28 Oct '06

28 Oct '06

Author: mikej Date: Sat Oct 28 15:59:01 2006 New Revision: 3225 Modified: freeswitch/trunk/README Log: this was all wrong.. blanking it out for now.. I am sure we should have somthing useful in there. Modified: freeswitch/trunk/README ============================================================================== --- freeswitch/trunk/README (original) +++ freeswitch/trunk/README Sat Oct 28 15:59:01 2006 @@ -1,40 +0,0 @@ -Freeswitch depends on several out of tree libraries. All of freeswitch depends on APR, and mod_exosip depends on osip, exosip, jtrhead, and jrtplib. -Download locations and links for details can be found below. - -Apr info available at: http://apr.apache.org - -Download Locations: -apr: http://apache.mirrors.versehost.com/apr/apr-1.2.2.tar.gz - -Backup Download Locations: -apr: http://www.sofaswitch.org/mikej/apr-1.2.2.tar.gz - - -Exosip\Osip info available at: http://www.antisip.com/ - -Download Locations: -osip: http://www.antisip.com/download/libosip2-2.2.1.tar.gz -exosip: http://www.antisip.com/download/libeXosip-0.9.0.tar.gz - -Backup Download Locations: -osip: http://www.sofaswitch.org/mikej/libosip2-2.2.1.tar.gz -exosip: http://www.sofaswitch.org/mikej/libeXosip-0.9.0.tar.gz - - -Jthread\Jrtplib info available at: http://research.edm.luc.ac.be/jori/page.html - -Download Locations: -jthread: http://research.edm.luc.ac.be/jori/jthread/jthread-1.1.2.tar.gz -jrtplib: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib-3.3.0.tar.gz - -Backup Download Locations: -jthread: http://www.sofaswitch.org/mikej/jthread-1.1.2.tar.gz -jrtplib: http://www.sofaswitch.org/mikej/jrtplib-3.3.0.tar.gz - -MSVC Notes: -Freeswitch will compile and run from Microsoft Visual Studio 2005. -If using the Visual C++ Express edition, please make sure that the location of the include and lib directories are propperly set in the file -C:\Program Files\Microsoft Visual Studio 8\VC\vcpackages\VCProjectEngine.Dll.Express.Config. -The automated build process for te dependecy libraries will not work without these settings. - -

1 0

[commit] r3223 - in freeswitch/trunk/src: . include
by Freeswitch SVN 28 Oct '06

28 Oct '06

Author: mikej Date: Sat Oct 28 00:40:59 2006 New Revision: 3223 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr.c Log: Add new higher level ivr functions from Paul Tinsley. Thanks Paul. Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Sat Oct 28 00:40:59 2006 @@ -152,6 +152,40 @@ void *buf, unsigned int buflen); +/*! + \brief Function to evaluate an expression against a string + \param target The string to find a match in + \param expression The regular expression to run against the string + \return Boolean if a match was found or not +*/ +SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression); + +/*! + \brief Play a sound and gather digits with the number of retries specified if the user doesn't give digits in the set time + \param session the current session to play sound to and collect digits + \param min_digits the fewest digits allowed for the response to be valid + \param max_digits the max number of digits to accept + \param max_tries number of times to replay the sound and capture digits + \param timeout time to wait for input (this is per iteration, so total possible time = max_tries * (timeout + audio playback length) + \param valid_terminators for input that can include # or * (useful for variable length prompts) + \param audio_file file to play + \param bad_input_audio_file file to play if the input from the user was invalid + \param digit_buffer variable digits captured will be put back into (empty if capture failed) + \param digit_buffer_length length of the buffer for digits (should be the same or larger than max_digits) + \return switch status, used to note status of channel (will still return success if digit capture failed) + \note to test for digit capture failure look for \0 in the first position of the buffer +*/ +SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t *session, + unsigned int min_digits, + unsigned int max_digits, + unsigned int max_tries, + unsigned int timeout, + char* valid_terminators, + char* audio_file, + char* bad_input_audio_file, + void* digit_buffer, + unsigned int digit_buffer_length, + char* digits_regex); SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session, switch_speech_handle_t *sh, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Oct 28 00:40:59 2006 @@ -24,8 +24,8 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Paul D. Tinsley <pdt at jackhammer.org> * - * * switch_ivr_api.c -- IVR Library * */ @@ -938,9 +938,169 @@ return status; } +SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression) { + const char* error = NULL; //Used to hold any errors + int error_offset = 0; //Holds the offset of an error + pcre* pcre_prepared = NULL; //Holds the compiled regex + int match_count = 0; //Number of times the regex was matched + int offset_vectors[2]; //not used, but has to exist or pcre won't even try to find a match + + //Compile the expression + pcre_prepared = pcre_compile(expression, 0, &error, &error_offset, NULL); + //See if there was an error in the expression + if(error != NULL) { + //Clean up after ourselves + if(pcre_prepared) { + pcre_free(pcre_prepared); + pcre_prepared = NULL; + } + //Note our error + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Regular Expression Error expression[%s] error[%s] location[%d]\n", expression, error, error_offset); + //We definitely didn't match anything + return SWITCH_STATUS_FALSE; + } + + //So far so good, run the regex + match_count = pcre_exec(pcre_prepared, NULL, target, (int) strlen(target), 0, 0, offset_vectors, sizeof(offset_vectors) / sizeof(offset_vectors[0])); + + //Clean up + if(pcre_prepared) { + pcre_free(pcre_prepared); + pcre_prepared = NULL; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "number of matches: %d\n", match_count); + + //Was it a match made in heaven? + if(match_count > 0) { + return SWITCH_STATUS_SUCCESS; + } else { + return SWITCH_STATUS_FALSE; + } +} + +SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t *session, + unsigned int min_digits, + unsigned int max_digits, + unsigned int max_tries, + unsigned int timeout, + char* valid_terminators, + char* prompt_audio_file, + char* bad_input_audio_file, + void* digit_buffer, + unsigned int digit_buffer_length, + char* digits_regex) +{ + + char terminator; //used to hold terminator recieved from + switch_channel_t *channel; //the channel contained in session + switch_status_t status; //used to recieve state out of called functions + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_play_and_get_digits(session, %d, %d, %d, %d, %s, %s, %s, digit_buffer, %d, %s)\n", min_digits, max_digits, max_tries, timeout, valid_terminators, prompt_audio_file, bad_input_audio_file, digit_buffer_length, digits_regex); + + //Get the channel + channel = switch_core_session_get_channel(session); + + //Make sure somebody is home + assert(channel != NULL); + + //Answer the channel if it hasn't already been answered + switch_channel_answer(channel); + + //Start pestering the user for input + for(;(switch_channel_get_state(channel) == CS_EXECUTE) && max_tries > 0; max_tries--) { + //make the buffer so fresh and so clean clean + memset(digit_buffer, 0, digit_buffer_length); + + //Play the file + status = switch_ivr_play_file(session, NULL, prompt_audio_file, NULL, NULL, digit_buffer, digit_buffer_length); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play gave up %s", digit_buffer); + + //Make sure we made it out alive + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + break; + } + + //we only get one digit out of playback, see if thats all we needed and what we got + if(max_digits == 1 && status == SWITCH_STATUS_BREAK) { + //Check the digit if we have a regex + if(digits_regex != NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking regex [%s] on [%s]\n", digits_regex, digit_buffer); + + //Make sure the digit is allowed + if(switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Match found!\n"); + //jobs done + break; + } else { + //See if a bad input prompt was specified, if so, play it + if(strlen(bad_input_audio_file) > 0) { + status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL, NULL, NULL, 0); + + //Make sure we made it out alive + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + break; + } + } + } + } else { + //jobs done + break; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Calling more digits try %d\n", max_tries); + + //Try to grab some more digits for the timeout period + status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout); + + //Make sure we made it out alive + if(status != SWITCH_STATUS_SUCCESS) { + //Bail + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + break; + } + + //see if we got enough + if(min_digits <= strlen(digit_buffer)) { + //See if we need to test a regex + if(digits_regex != NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking regex [%s] on [%s]\n", digits_regex, digit_buffer); + //Test the regex + if(switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Match found!\n"); + //Jobs done + return switch_channel_get_state(channel); + } else { + //See if a bad input prompt was specified, if so, play it + if(strlen(bad_input_audio_file) > 0) { + status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL, NULL, NULL, 0); + + //Make sure we made it out alive + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + break; + } + } + } + } else { + //Jobs done + return switch_channel_get_state(channel); + } + } + } + + //if we got here, we got no digits or lost the channel + digit_buffer = "\0"; + return switch_channel_get_state(channel); +} + + SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session, switch_speech_handle_t *sh, switch_codec_t *codec, @@ -970,14 +1130,14 @@ if (!sh) { return SWITCH_STATUS_FALSE; } - + switch_channel_answer(channel); write_frame.data = abuf; write_frame.buflen = sizeof(abuf); - samples = (uint32_t)(sh->rate / 50); - len = samples * 2; + samples = (uint32_t)(sh->rate / 50); + len = samples * 2; flags = 0; switch_sleep(200000); @@ -1012,8 +1172,8 @@ if (input_callback || buf) { /* - dtmf handler function you can hook up to be executed when a digit is dialed during playback - if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + dtmf handler function you can hook up to be executed when a digit is dialed during playback + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. */ if (switch_channel_has_dtmf(channel)) { if (buf && !strcasecmp(buf, "_break_")) { @@ -1041,7 +1201,7 @@ break; } } - + if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_PAUSE)) { if (timer) { if ((x = switch_core_timer_next(timer)) < 0) { @@ -1054,7 +1214,7 @@ while (switch_channel_test_flag(channel, CF_HOLD)) { switch_yield(10000); } - + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } @@ -1064,10 +1224,10 @@ flags = SWITCH_SPEECH_FLAG_BLOCKING; status = switch_core_speech_read_tts(sh, - abuf, - &ilen, - &rate, - &flags); + abuf, + &ilen, + &rate, + &flags); if (status != SWITCH_STATUS_SUCCESS) { for( x = 0; !done && x < lead_in_out; x++) { @@ -1084,7 +1244,7 @@ } done = 1; } - + if (done) { break; } @@ -1115,15 +1275,15 @@ while (switch_channel_test_flag(channel, CF_HOLD)) { switch_yield(10000); } - + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } } } - - + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done speaking text\n"); flags = 0; switch_core_speech_flush_tts(sh);

1 0