- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10294 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 12:36:08 2008 New Revision: 10294 Log: add patch from MODAPP-162 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Nov 7 12:36:08 2008 @@ -2090,7 +2090,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if ( !switch_strlen_zero(profile->storage_dir) ) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2244,7 +2244,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_mprintf("%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2724,7 +2724,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, id); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR,

1 0

[commit] r10298 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 18:25:38 2008 New Revision: 10298 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: move bind to load func Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Nov 7 18:25:38 2008 @@ -756,6 +756,13 @@ switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); + if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + return SWITCH_STATUS_GENERR; + } + + switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "socket", "Connect to a socket", "Connect to a socket", socket_function, "<ip>[:<port>]", SAF_SUPPORT_NOMEDIA); @@ -1901,13 +1908,6 @@ listen_list.ready = 1; - if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - - switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE); - for (;;) { if (switch_core_new_memory_pool(&listener_pool) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r10297 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 18:08:57 2008 New Revision: 10297 Modified: freeswitch/trunk/src/switch_core_session.c Log: prevent seg Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Nov 7 18:08:57 2008 @@ -79,6 +79,8 @@ void *val; switch_core_session_t *session; + if (!var_val) return; + switch_mutex_lock(runtime.throttle_mutex); for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); @@ -86,7 +88,7 @@ const char *this_val; session = (switch_core_session_t *) val; switch_core_session_read_lock(session); - if ((this_val = switch_channel_get_variable(session->channel, var_name)) && && var_val && (!strcmp(this_val, var_val))) { + if ((this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) { switch_channel_hangup(switch_core_session_get_channel(session), cause); } switch_core_session_rwunlock(session);

1 0

[commit] r10296 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 18:01:06 2008 New Revision: 10296 Modified: freeswitch/trunk/src/switch_core_session.c Log: prevent seg Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Nov 7 18:01:06 2008 @@ -86,7 +86,7 @@ const char *this_val; session = (switch_core_session_t *) val; switch_core_session_read_lock(session); - if ((this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) { + if ((this_val = switch_channel_get_variable(session->channel, var_name)) && && var_val && (!strcmp(this_val, var_val))) { switch_channel_hangup(switch_core_session_get_channel(session), cause); } switch_core_session_rwunlock(session);

1 0

[commit] r10295 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 17:16:22 2008 New Revision: 10295 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Nov 7 17:16:22 2008 @@ -2505,7 +2505,7 @@ } } else if (tech_pvt && switch_test_flag(tech_pvt, TFLAG_SDP) && !r_sdp) { - nua_respond(tech_pvt->nh, SIP_200_OK, TAG_END()); + nua_respond(tech_pvt->nh, SIP_202_ACCEPTED, TAG_END()); goto done; } else { ss_state = nua_callstate_completed;

1 0

[commit] r10294 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 12:36:08 2008 New Revision: 10294 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add patch from MODAPP-162 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Nov 7 12:36:08 2008 @@ -2090,7 +2090,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if ( !switch_strlen_zero(profile->storage_dir) ) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2244,7 +2244,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_mprintf("%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2724,7 +2724,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, id); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR,

1 0

[commit] r10293 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 12:22:17 2008 New Revision: 10293 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: sleep a few more nanoseconds till pekka looks at this Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Nov 7 12:22:17 2008 @@ -2046,7 +2046,7 @@ /* dirty hack to avoid race condition in the library */ if (status == 200 || status == 183) { - switch_yield(1);// printf("Avoiding Segfault!!!\n"); + switch_yield(100);// printf("Avoiding Segfault!!!\n"); } if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {

1 0

[commit] r10291 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 12:00:46 2008 New Revision: 10291 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: make multiple-registations=true use the contact method and call-id option to do it the old way Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Nov 7 12:00:46 2008 @@ -1163,13 +1163,14 @@ profile->pflags &= ~PFLAG_SECURE; } } else if (!strcasecmp(var, "multiple-registrations")) { - if (!strcasecmp(val, "contact")) { + if (!strcasecmp(val, "call-id")) { profile->pflags |= PFLAG_MULTIREG; - profile->pflags |= PFLAG_MULTIREG_CONTACT; - } else if (switch_true(val)) { + } else if (!strcasecmp(val, "contact") || switch_true(val)) { profile->pflags |= PFLAG_MULTIREG; + profile->pflags |= PFLAG_MULTIREG_CONTACT; } else { profile->pflags &= ~PFLAG_MULTIREG; + profile->pflags &= ~PFLAG_MULTIREG_CONTACT; } } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) { if (switch_true(val)) { @@ -1622,13 +1623,14 @@ profile->pflags |= PFLAG_SECURE; } } else if (!strcasecmp(var, "multiple-registrations")) { - if (!strcasecmp(val, "contact")) { + if (!strcasecmp(val, "call-id")) { profile->pflags |= PFLAG_MULTIREG; - profile->pflags |= PFLAG_MULTIREG_CONTACT; - } else if (switch_true(val)) { + } else if (!strcasecmp(val, "contact") || switch_true(val)) { profile->pflags |= PFLAG_MULTIREG; + profile->pflags |= PFLAG_MULTIREG_CONTACT; } else { profile->pflags &= ~PFLAG_MULTIREG; + profile->pflags &= ~PFLAG_MULTIREG_CONTACT; } } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) { if (switch_true(val)) {

1 0

[commit] r10289 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 09:48:49 2008 New Revision: 10289 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix MODEVENT-32 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Nov 7 09:48:49 2008 @@ -87,8 +87,12 @@ typedef struct listener listener_t; static struct { + switch_mutex_t *listener_mutex; + switch_event_node_t *node; +} globals; + +static struct { switch_socket_t *sock; - switch_mutex_t *mutex; switch_mutex_t *sock_mutex; listener_t *listeners; uint8_t ready; @@ -114,9 +118,9 @@ static uint32_t next_id(void) { uint32_t id; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); id = ++prefs.id; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); return id; } @@ -126,16 +130,11 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj); static void launch_listener_thread(listener_t *listener); -static struct { - switch_event_node_t *node; -} globals; - - static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_level_t level) { listener_t *l; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) { char *data = strdup(node->data); @@ -160,7 +159,7 @@ } } } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); return SWITCH_STATUS_SUCCESS; } @@ -212,7 +211,7 @@ lp = listen_list.listeners; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); while(lp) { int send = 0; @@ -321,7 +320,7 @@ } } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); } SWITCH_STANDARD_APP(socket_function) @@ -456,11 +455,11 @@ } switch_event_unbind(&globals.node); - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { close_socket(&l->sock); } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); @@ -470,17 +469,17 @@ static void add_listener(listener_t *listener) { /* add me to the listeners so I get events */ - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); listener->next = listen_list.listeners; listen_list.listeners = listener; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); } static void remove_listener(listener_t *listener) { listener_t *l, *last = NULL; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { if (l == listener) { if (last) { @@ -491,7 +490,7 @@ } last = l; } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); } @@ -499,7 +498,7 @@ { listener_t *l, *r = NULL; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { if (l->id && l->id == id) { if (switch_thread_rwlock_tryrdlock(l->rwlock) == SWITCH_STATUS_SUCCESS) { @@ -508,7 +507,7 @@ break; } } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); return r; } @@ -755,6 +754,8 @@ switch_application_interface_t *app_interface; switch_api_interface_t *api_interface; + switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "socket", "Connect to a socket", "Connect to a socket", socket_function, "<ip>[:<port>]", SAF_SUPPORT_NOMEDIA); @@ -1591,9 +1592,9 @@ switch_channel_t *channel = NULL; switch_event_t *revent = NULL; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); prefs.threads++; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); switch_assert(listener != NULL); @@ -1785,9 +1786,9 @@ switch_core_destroy_memory_pool(&pool); } - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); prefs.threads--; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); return NULL; } @@ -1871,7 +1872,7 @@ return SWITCH_STATUS_TERM; } - switch_mutex_init(&listen_list.mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool);

1 0

[commit] r10288 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 09:34:20 2008 New Revision: 10288 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: add patch from MODAPP-161 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Nov 7 09:34:20 2008 @@ -547,7 +547,7 @@ id = argv[1]; max = atoi(argv[2]); - if (argc == 4) { + if (argc >= 4) { xfer_exten = argv[3]; } else { xfer_exten = limit_def_xfer_exten; @@ -568,7 +568,7 @@ got = atoi(buf); if (got + 1 > max) { - switch_ivr_session_transfer(session, xfer_exten, NULL, NULL); + switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); goto done; }

1 0