March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4429 - freeswitch/trunk/src
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: anthm Date: Fri Mar 2 12:55:22 2007 New Revision: 4429 Modified: freeswitch/trunk/src/switch_core.c Log: change wanring level Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Mar 2 12:55:22 2007 @@ -961,7 +961,7 @@ assert(codec != NULL); if (!codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initilized!\n"); return SWITCH_STATUS_GENERR; }

1 0

[commit] r4427 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: mikej Date: Fri Mar 2 04:23:16 2007 New Revision: 4427 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj Log: sync changed proj file to the uuid in my working copy. Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj Fri Mar 2 04:23:16 2007 @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="mod_xml_cdr" - ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}" + ProjectGUID="{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" RootNamespace="mod_xml_cdr" Keyword="Win32Proj" >

1 0

[commit] r4426 - freeswitch/trunk/src
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: mikej Date: Fri Mar 2 04:22:34 2007 New Revision: 4426 Modified: freeswitch/trunk/src/switch.c Log: catch up with changed prototype Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Mar 2 04:22:34 2007 @@ -142,7 +142,7 @@ case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: /* Shutdown freeswitch */ - switch_core_destroy(0); + switch_core_destroy(); /* set service status valuse */ status.dwCurrentState = SERVICE_STOPPED; status.dwWin32ExitCode = 0;

1 0

[commit] r4425 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: mikej Date: Fri Mar 2 04:11:50 2007 New Revision: 4425 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: this appears to make more compilers happy. 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 Mar 2 04:11:50 2007 @@ -4258,7 +4258,7 @@ } -#define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, ##varprefix "_user", ##varprefix "_host", ##varprefix "_port", ##varprefix "_uri") +#define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri") static const char * _url_set_chanvars(switch_core_session_t *session, url_t *url, const char * user_var, const char * host_var, const char * port_var, const char * uri_var) { const char *user = NULL, *host = NULL, *port = NULL; @@ -4399,7 +4399,7 @@ if (sip->sip_from && sip->sip_from->a_url) { from_user = sip->sip_from->a_url->url_user; from_host = sip->sip_from->a_url->url_host; - channel_name = url_set_chanvars(session, sip->sip_from->a_url, "sip_from"); + channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from); if (!switch_strlen_zero(from_user)) { if (*from_user == '+') { @@ -4427,7 +4427,7 @@ } if (sip->sip_request && sip->sip_request->rq_url) { - const char * req_uri = url_set_chanvars(session, sip->sip_request->rq_url, "sip_req"); + const char * req_uri = url_set_chanvars(session, sip->sip_request->rq_url, sip_req); if (profile->pflags & PFLAG_FULL_ID) { destination_number = req_uri; } else { @@ -4436,11 +4436,11 @@ } if (sip->sip_to && sip->sip_to->a_url) { - url_set_chanvars(session, sip->sip_to->a_url, "sip_to"); + url_set_chanvars(session, sip->sip_to->a_url, sip_to); } if (sip->sip_contact && sip->sip_contact->m_url) { - const char *contact_uri = url_set_chanvars(session, sip->sip_contact->m_url, "sip_contact"); + const char *contact_uri = url_set_chanvars(session, sip->sip_contact->m_url, sip_contact); if (!channel_name) { channel_name = contact_uri; }

1 0

[commit] r4423 - freeswitch/trunk/src
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: brian Date: Fri Mar 2 00:53:45 2007 New Revision: 4423 Modified: freeswitch/trunk/src/switch.c Log: we really should use this way to comment. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Mar 2 00:53:45 2007 @@ -35,18 +35,18 @@ #include <switch.h> -//pid filename: Stores the process id of the freeswitch process +/* pid filename: Stores the process id of the freeswitch process */ #define PIDFILE "freeswitch.pid" static char *pfile = PIDFILE; -//log filename: Filename of the freeswitch log file to be used if we are in background mode +/* 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; -//If we are a windows service, what should we be called +/* If we are a windows service, what should we be called */ #define SERVICENAME "Freeswitch" -//Picky compiler +/* Picky compiler */ #ifdef __ICC #pragma warning (disable:167) #endif @@ -55,73 +55,74 @@ #include <winsock2.h> #include <windows.h> -//event to signal shutdown (for you unix people, this is like a pthread_cond) +/* 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 +/* 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 + /* send shutdown signal to the freeswitch core */ switch_core_session_ctl(SCSC_SHUTDOWN, &arg); return; } -//kill a freeswitch process running in background mode +/* kill a freeswitch process running in background mode */ static int freeswitch_kill_background() { - 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 + 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. + /* set the globals so we can use the global paths. */ switch_core_set_globals(); - //get the full path of the pid file. + /* 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 + /* open the pid file */ if ((f = fopen(path, "r")) == 0) { - //pid file does not exist + /* pid file does not exist */ fprintf(stderr, "Cannot open pid file %s.\n", path); return 255; } - //pull the pid from the file + /* pull the pid from the file */ fscanf(f, "%d", &pid); - //if we have a valid pid + /* if we have a valid pid */ if (pid > 0) { - //kill the freeswitch running at the pid we found + /* 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 + /* for windows we need the event to signal for shutting down a background freewitch */ snprintf(path, sizeof(path), "Global\\Freeswitch.%d", pid); - //open the event so we can signal it + /* open the event so we can signal it */ shutdown_event = OpenEvent(EVENT_MODIFY_STATE, FALSE, path); - //did we sucessfully open the event + /* 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 + /* signal the event to shutdown */ SetEvent(shutdown_event); } - //cleanup + /* cleanup */ CloseHandle(shutdown_event); #else - //for unix, send the signal to kill. + /* for unix, send the signal to kill. */ kill(pid, SIGTERM); #endif } - //be nice and close the file handle to the pid file + /* be nice and close the file handle to the pid file */ fclose(f); return 0; @@ -129,81 +130,81 @@ #ifdef WIN32 -//we need these vars to handle the service +/* we need these vars to handle the service */ SERVICE_STATUS_HANDLE hStatus; SERVICE_STATUS status; -//Handler function for service start/stop from the service +/* Handler function for service start/stop from the service */ void WINAPI ServiceCtrlHandler( DWORD control ) { switch( control ) { case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: - //Shutdown freeswitch + /* Shutdown freeswitch */ switch_core_destroy(0); - //set service status valuse + /* set service status valuse */ status.dwCurrentState = SERVICE_STOPPED; status.dwWin32ExitCode = 0; status.dwCheckPoint = 0; status.dwWaitHint = 0; break; case SERVICE_CONTROL_INTERROGATE: - // we already set the service status every time it changes. - // if there are other times we change it and don't update, we should do so here + /* we already set the service status every time it changes. */ + /* if there are other times we change it and don't update, we should do so here */ break; } SetServiceStatus( hStatus, &status ); } -//the main service entry point +/* the main service entry point */ void WINAPI service_main( DWORD numArgs, char **args ) { - const char *err = NULL; //error value for return from freeswitch initialization - // we have to initialize the service-specific stuff + const char *err = NULL; /* error value for return from freeswitch initialization */ + /* 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; - //register our handler for service control messages + /* register our handler for service control messages */ hStatus = RegisterServiceCtrlHandler( SERVICENAME, &ServiceCtrlHandler ); - //update the service status + /* update the service status */ SetServiceStatus( hStatus, &status ); - //run freeswitch with elevated priority + /* run freeswitch with elevated priority */ set_high_priority(); - //attempt to initialize freeswitch and load modules + /* attempt to initialize freeswitch and load modules */ if (switch_core_init_and_modload(lfile, &err) != SWITCH_STATUS_SUCCESS) { - //freeswitch did not start sucessfully + /* freeswitch did not start sucessfully */ status.dwCurrentState = SERVICE_STOPPED; } else { - //freeswitch started + /* freeswitch started */ status.dwCurrentState = SERVICE_RUNNING; } - //update the service status + /* update the service status */ SetServiceStatus( hStatus, &status ); } #endif -//the main application entry point +/* the main application entry point */ int main(int argc, char *argv[]) { - char pid_path[256] = ""; // full path to the pid file - const char *err = NULL; // error value for return from freeswitch initialization + char pid_path[256] = ""; /* full path to the pid file */ + const char *err = NULL; /* error value for return from freeswitch initialization */ #ifndef WIN32 - int nf = 0; // TRUE if we are running in nofork mode + int nf = 0; /* TRUE if we are running in nofork mode */ #endif - int nc = 0; // TRUE if we are running in noconsole mode - FILE *f; // file handle to the pid file - pid_t pid = 0; // - int x; // - int die = 0; // + int nc = 0; /* TRUE if we are running in noconsole mode */ + FILE *f; /* file handle to the pid file */ + pid_t pid = 0; + int x; + int die = 0; char *usageDesc; int alt_dirs = 0; @@ -245,7 +246,7 @@ if (x == 1) { if (argv[x] && !strcmp(argv[x], "-service")) { if(StartServiceCtrlDispatcher( dispatchTable ) == 0 ) { - //Not loaded as a service + /* 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"); } @@ -279,7 +280,7 @@ SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS ); SC_HANDLE service = OpenService( handle, SERVICENAME, DELETE ); if( service != NULL ) { - // remove the service! + /* remove the service! */ DeleteService( service ); } exit(0);

1 0

[commit] r4422 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: mikej Date: Thu Mar 1 20:44:36 2007 New Revision: 4422 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: when using ext-sip-ip, bind to the internal address, but still have the external address in the contact and via headers. 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 Thu Mar 1 20:44:36 2007 @@ -5074,7 +5074,6 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; sofia_profile_t *profile = NULL; char url[512] = ""; - char bindurl[512] =""; switch_mutex_lock(globals.mutex); globals.running = 1; switch_mutex_unlock(globals.mutex); @@ -5272,13 +5271,10 @@ profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); } if (profile->extsipip) { - snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->extsipip, profile->sip_port); - snprintf(bindurl, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); - profile->url = switch_core_strdup(profile->pool, url); - profile->bindurl = switch_core_strdup(profile->pool, bindurl); + profile->url = switch_core_sprintf(profile->pool, "sip:mod_sofia@%s:%d", profile->extsipip, profile->sip_port); + profile->bindurl = switch_core_sprintf(profile->pool, "%s;maddr=%s", profile->url, profile->sipip); } else { - snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); - profile->url = switch_core_strdup(profile->pool, url); + profile->url = switch_core_sprintf(profile->pool, "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); profile->bindurl = profile->url; } }

1 0

[commit] r4421 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Mar '07

02 Mar '07

Author: mikej Date: Thu Mar 1 19:36:05 2007 New Revision: 4421 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tokenizing is much better than stringizing any day. oh, and those quotes don't belong. 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 Thu Mar 1 19:36:05 2007 @@ -4258,7 +4258,7 @@ } -#define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri") +#define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, ##varprefix "_user", ##varprefix "_host", ##varprefix "_port", ##varprefix "_uri") static const char * _url_set_chanvars(switch_core_session_t *session, url_t *url, const char * user_var, const char * host_var, const char * port_var, const char * uri_var) { const char *user = NULL, *host = NULL, *port = NULL;

1 0

[commit] r4419 - in freeswitch/trunk/src: . include mod/endpoints/mod_portaudio
by Freeswitch SVN 01 Mar '07

01 Mar '07

Author: anthm Date: Thu Mar 1 12:23:02 2007 New Revision: 4419 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_loadable_module.c Log: cleanup Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Mar 1 12:23:02 2007 @@ -233,10 +233,9 @@ /*! \brief Destroy the core - \param vg nonzero to skip core uninitilize for memory debugging \note to be called at application shutdown */ -SWITCH_DECLARE(switch_status_t) switch_core_destroy(int vg); +SWITCH_DECLARE(switch_status_t) switch_core_destroy(void); ///\} Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Mar 1 12:23:02 2007 @@ -1045,9 +1045,14 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { - switch_core_codec_destroy(&globals.read_codec); - switch_core_codec_destroy(&globals.write_codec); - + if (globals.read_codec.implementation) { + switch_core_codec_destroy(&globals.read_codec); + } + + if (globals.write_codec.implementation) { + switch_core_codec_destroy(&globals.write_codec); + } + Pa_Terminate(); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Mar 1 12:23:02 2007 @@ -198,9 +198,6 @@ const char *err = NULL; // error value for return from freeswitch initialization #ifndef WIN32 int nf = 0; // TRUE if we are running in nofork mode - int vg = 0; // Allways TRUE on windows to not do apr_terminate -#else - int vg = 1; // TRUE if we are running in vg mode #endif int nc = 0; // TRUE if we are running in noconsole mode FILE *f; // file handle to the pid file @@ -233,7 +230,6 @@ "\t-hp -- enable high priority settings\n" "\t-stop -- stop freeswitch\n" "\t-nc -- do not output to a console and background\n" - "\t-vg -- enable valgrind mode\n" "\t-conf [confdir] -- specify an alternate config dir\n" "\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n"; @@ -307,9 +303,6 @@ nc++; } - if (argv[x] && !strcmp(argv[x], "-vg")) { - vg++; - } if (argv[x] && !strcmp(argv[x], "-conf")) { x++; @@ -389,7 +382,7 @@ switch_core_runtime_loop(nc); - return switch_core_destroy(vg); + return switch_core_destroy(); } /* For Emacs: Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 1 12:23:02 2007 @@ -590,13 +590,13 @@ if (switch_test_flag(session, SSF_DESTROYED)) { status = SWITCH_STATUS_FALSE; #ifdef SWITCH_DEBUG_RWLOCKS - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "%s Read lock FAIL\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "%s Read lock FAIL\n", switch_channel_get_name(session->channel)); #endif } else { status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock); #ifdef SWITCH_DEBUG_RWLOCKS - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "%s Read lock AQUIRED\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "%s Read lock AQUIRED\n", switch_channel_get_name(session->channel)); #endif } @@ -612,7 +612,7 @@ int line) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "%s Write lock AQUIRED\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "%s Write lock AQUIRED\n", switch_channel_get_name(session->channel)); #else SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session) @@ -627,7 +627,7 @@ const char *func, int line) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "%s Read/Write lock CLEARED\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "%s Read/Write lock CLEARED\n", switch_channel_get_name(session->channel)); #else SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session) @@ -4563,7 +4563,7 @@ return 0; } -SWITCH_DECLARE(switch_status_t) switch_core_destroy(int vg) +SWITCH_DECLARE(switch_status_t) switch_core_destroy(void) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_SHUTDOWN) == SWITCH_STATUS_SUCCESS) { @@ -4590,9 +4590,6 @@ switch_core_db_close(runtime.db); switch_core_db_close(runtime.event_db); switch_xml_destroy(); - if (vg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Full destruction of the core disabled for memory debugging purposes.\n"); - } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n"); switch_log_shutdown(); @@ -4617,9 +4614,7 @@ if (runtime.memory_pool) { apr_pool_destroy(runtime.memory_pool); - if (!vg) { - apr_terminate(); - } + //apr_terminate(); } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Mar 1 12:23:02 2007 @@ -75,7 +75,7 @@ for (restarts = 0; status != SWITCH_STATUS_TERM; restarts++) { status = module->switch_module_runtime(); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Thread ended for %s\n", module->module_interface->module_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Thread ended for %s\n", module->module_interface->module_name); if (ts->pool) { switch_memory_pool_t *pool = ts->pool;

1 0

[commit] r4418 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 01 Mar '07

01 Mar '07

Author: anthm Date: Thu Mar 1 11:11:08 2007 New Revision: 4418 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: add patch to fix stun issue 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 Thu Mar 1 11:11:08 2007 @@ -365,7 +365,7 @@ static switch_status_t tech_choose_port(private_object_t *tech_pvt); -static void do_invite(switch_core_session_t *session); +static switch_status_t do_invite(switch_core_session_t *session); static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp); @@ -889,7 +889,7 @@ tech_pvt = switch_core_session_get_private(*session); if (tech_pvt) { - if (state > CS_INIT && state < CS_HANGUP) { + if (state < CS_HANGUP) { switch_channel_hangup(channel, cause); } @@ -960,7 +960,7 @@ return SWITCH_STATUS_SUCCESS; } -static void do_invite(switch_core_session_t *session) +static switch_status_t do_invite(switch_core_session_t *session) { char rpid[1024] = { 0 }; char alert_info[1024] = { 0 }; @@ -979,6 +979,7 @@ void *vval; char *extra_headers = NULL; const void *vvar; + switch_status_t status = SWITCH_STATUS_FALSE; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1010,7 +1011,7 @@ } if (tech_choose_port(tech_pvt) != SWITCH_STATUS_SUCCESS) { - return; + return status; } set_local_sdp(tech_pvt, NULL, 0, NULL, 0); @@ -1108,9 +1109,12 @@ TAG_END()); switch_safe_free(stream.data); + status = SWITCH_STATUS_SUCCESS; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); } + + return status; } @@ -1230,7 +1234,9 @@ } if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - do_invite(session); + if (do_invite(session) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } } /* Move Channel's State Machine to RING */ Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Mar 1 11:11:08 2007 @@ -2795,7 +2795,9 @@ valid_channels++; state = switch_channel_get_state(peer_channels[i]); - if (state >= CS_RING) { + if (state >= CS_HANGUP) { + goto notready; + } else if (state >= CS_RING) { goto endfor1; }

1 0