- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12333 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: anthm Date: Fri Feb 27 13:39:58 2009 New Revision: 12333 Log: reverse define to allow it to be passed in as positive from configure (no real change) Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri Feb 27 13:39:58 2009 @@ -40,7 +40,9 @@ //#define DESTROY_POOLS //#define INSTANTLY_DESTROY_POOLS /*#define LOCK_MORE*/ +#ifndef SWITCH_POOL_RECYCLE #define PER_POOL_LOCK 1 +#endif static struct { switch_mutex_t *mem_lock;

1 0

[commit] r12332 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 13:29:52 2009 New Revision: 12332 Log: fix leak Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Feb 27 13:29:52 2009 @@ -279,7 +279,9 @@ *dt = new_dtmf; while (switch_queue_trypush(channel->dtmf_queue, dt) != SWITCH_STATUS_SUCCESS) { - switch_queue_trypop(channel->dtmf_queue, &pop); + if (switch_queue_trypop(channel->dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { + free(pop); + } if (++x > 100) { status = SWITCH_STATUS_FALSE; free(dt);

1 0

[commit] r12331 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 13:24:56 2009 New Revision: 12331 Log: dont need safe_free here Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Feb 27 13:24:56 2009 @@ -1133,7 +1133,7 @@ } pvt->ts.duration = duration; teletone_run(&pvt->ts, buf); - switch_safe_free(pop); + free(pop); } if (switch_buffer_inuse(pvt->audio_buffer) && (bytes = switch_buffer_read(pvt->audio_buffer, frame->data, frame->datalen))) {

1 0

[commit] r12330 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 13:22:30 2009 New Revision: 12330 Log: Fix leak Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Feb 27 13:22:30 2009 @@ -1133,6 +1133,7 @@ } pvt->ts.duration = duration; teletone_run(&pvt->ts, buf); + switch_safe_free(pop); } if (switch_buffer_inuse(pvt->audio_buffer) && (bytes = switch_buffer_read(pvt->audio_buffer, frame->data, frame->datalen))) {

1 0

[commit] r12329 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: anthm Date: Fri Feb 27 12:52:15 2009 New Revision: 12329 Log: gimmie back my 136 bytes Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Feb 27 12:52:15 2009 @@ -1766,6 +1766,7 @@ *dtmf = *_dtmf; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP RECV DTMF %c:%d\n", dtmf->digit, dtmf->duration); bytes++; + free(pop); } switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex);

1 0

[commit] r12328 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 12:15:50 2009 New Revision: 12328 Log: move this debug line into profile debug Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Feb 27 12:15:50 2009 @@ -866,7 +866,9 @@ } if (auth_res != AUTH_OK && !stale) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host); + if (profile->debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host); + } if (auth_res == AUTH_FORBIDDEN) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); } else {

1 0

[commit] r12327 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 10:38:19 2009 New Revision: 12327 Log: Whitespace can be a bitch Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 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 Feb 27 10:38:19 2009 @@ -1271,6 +1271,10 @@ acs->ack = 1; SWITCH_STANDARD_STREAM(stream); + + if (!strcasecmp(acs->api_cmd, "unload") || !strcasecmp(acs->arg, "mod_event_socket")) { + + } if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { reply = stream.data; @@ -1351,7 +1355,7 @@ *reply = '\0'; - if (switch_stristr("unload mod_event_socket", cmd)) { + if (switch_stristr("unload", cmd) && switch_stristr("mod_event_socket", cmd)) { cmd = cheat; }

1 0

[commit] r12326 - in freeswitch/trunk/src/mod: event_handlers/mod_event_socket xml_int/mod_xml_rpc
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: anthm Date: Fri Feb 27 10:35:42 2009 New Revision: 12326 Log: avoiding initial paradox of doom Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c 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 Feb 27 10:35:42 2009 @@ -906,7 +906,7 @@ char *api_command = switch_event_get_header(stream->param_event, "fsapi-command"); char *api_args = switch_event_get_header(stream->param_event, "fsapi-args"); switch_event_t *event, *oevent; - + if (!(api_command)) { stream->write_function(stream, "<data><reply type=\"error\">INVALID API COMMAND!</reply></data>\n"); goto end; @@ -916,6 +916,12 @@ switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); oevent = stream->param_event; stream->param_event = event; + + if (!strcasecmp(api_command, "unload") && !strcasecmp(api_args, "mod_event_socket")) { + api_command = "bgapi"; + api_args = "unload mod_event_socket"; + } + switch_api_execute(api_command, api_args, NULL, stream); stream->param_event = oevent; stream->write_function(stream, " </api-command>\n</data>"); @@ -1341,9 +1347,14 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; char *cmd = switch_event_get_header(*event, "command"); - + char cheat[] = "api bgapi unload mod_event_socket"; + *reply = '\0'; + if (switch_stristr("unload mod_event_socket", cmd)) { + cmd = cheat; + } + if (!strncasecmp(cmd, "exit", 4)) { switch_clear_flag_locked(listener, LFLAG_RUNNING); switch_snprintf(reply, reply_len, "+OK bye"); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Fri Feb 27 10:35:42 2009 @@ -453,6 +453,7 @@ char *path_info = NULL; abyss_bool ret = TRUE; int html = 0, text = 0, xml = 0; + const char *api_str; stream.data = r; stream.write_function = http_stream_write; @@ -681,8 +682,14 @@ ConnWrite(r->conn, "\r\n", 2); } + if (switch_stristr("unload", command) && switch_stristr("mod_xml_rpc", r->requestInfo.query)) { + command = "bgapi"; + api_str = "unload mod_xml_rpc"; + } else { + api_str = r->requestInfo.query; + } - if (switch_api_execute(command, r->requestInfo.query, NULL, &stream) == SWITCH_STATUS_SUCCESS) { + if (switch_api_execute(command, api_str, NULL, &stream) == SWITCH_STATUS_SUCCESS) { ResponseStatus(r, 200); r->responseStarted = TRUE; //r->done = TRUE; @@ -711,6 +718,8 @@ char *command = NULL, *arg = NULL; switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; + const char *x_command = "bgapi", x_arg= "unload mod_xml_rpc"; + /* Parse our argument array. */ xmlrpc_decompose_value(envP, paramArrayP, "(ss)", &command, &arg); @@ -720,6 +729,13 @@ return NULL; } + if (switch_stristr("unload", command) && switch_stristr("mod_xml_rpc", arg)) { + switch_safe_free(command); + command = x_command; + switch_safe_free(arg); + arg = x_arg; + } + SWITCH_STANDARD_STREAM(stream); if (switch_api_execute(command, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { /* Return our result. */ @@ -730,8 +746,14 @@ } /* xmlrpc-c requires us to free memory it malloced from xmlrpc_decompose_value */ - switch_safe_free(command); - switch_safe_free(arg); + if (command != x_command) { + switch_safe_free(command); + } + + if (arg != x_arg) { + switch_safe_free(arg); + } + return val; }

1 0

[commit] r12325 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 10:18:28 2009 New Revision: 12325 Log: doh Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri Feb 27 10:18:28 2009 @@ -712,7 +712,7 @@ int max, activity; esl_status_t status = ESL_SUCCESS; - if (!handle->connected || !handle || handle->sock == -1) { + if (!handle || !handle->connected || handle->sock == -1) { return ESL_FAIL; }

1 0

[commit] r12324 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 10:03:22 2009 New Revision: 12324 Log: remove dirty hack to get around a bug in sofia which has now been fixed. And fix registering to pointers isn't allowed Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Feb 27 10:03:22 2009 @@ -2500,11 +2500,6 @@ } } - /* dirty hack to avoid race condition in the library */ - if (status == 200 || status == 183) { - switch_yield(100);// printf("Avoiding Segfault!!!\n"); - } - if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { if (!sofia_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Feb 27 10:03:22 2009 @@ -1552,6 +1552,13 @@ ret = AUTH_FORBIDDEN; goto end; + } else { + const char *type = switch_xml_attr(user, "type"); + if (type && !strcasecmp(type, "pointer")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant register a pointer.\n"); + ret = AUTH_FORBIDDEN; + goto end; + } } if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) {

1 0