May 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r13472 - freeswitch/trunk/src
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 17:48:16 2009 New Revision: 13472 Log: clean up 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 Wed May 27 17:48:16 2009 @@ -1923,13 +1923,12 @@ #ifdef ENABLE_ZRTP /* ZRTP Recv */ - if (bytes && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV)) { unsigned int sbytes = (int) bytes; zrtp_status_t stat = 0; - + stat = zrtp_process_srtp(rtp_session->zrtp_ctx, (void *)&rtp_session->recv_msg, &sbytes); - + switch (stat) { case zrtp_status_ok: break; @@ -2532,11 +2531,10 @@ } #ifdef ENABLE_ZRTP /* ZRTP Send */ - if (switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { unsigned int sbytes = (int) bytes; zrtp_status_t stat = zrtp_status_fail; - + stat = zrtp_process_rtp(rtp_session->zrtp_ctx, (void*)send_msg, &sbytes); switch (stat) { @@ -2813,29 +2811,28 @@ bytes = sbytes; } #ifdef ENABLE_ZRTP - /* ZRTP Send */ - - if (switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { - unsigned int sbytes = (int) bytes; - zrtp_status_t stat = zrtp_status_fail; - - stat = zrtp_process_rtp(rtp_session->zrtp_ctx, (void*)&rtp_session->write_msg, &sbytes); - - switch (stat) { - case zrtp_status_ok: - break; - case zrtp_status_drop: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); - break; - case zrtp_status_fail: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); - break; - default: - break; - } - - bytes = sbytes; + /* ZRTP Send */ + if (switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { + unsigned int sbytes = (int) bytes; + zrtp_status_t stat = zrtp_status_fail; + + stat = zrtp_process_rtp(rtp_session->zrtp_ctx, (void*)&rtp_session->write_msg, &sbytes); + + switch (stat) { + case zrtp_status_ok: + break; + case zrtp_status_drop: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); + break; + case zrtp_status_fail: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); + break; + default: + break; } + + bytes = sbytes; + } #endif if (switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_addr, 0, (void *) &rtp_session->write_msg, &bytes) != SWITCH_STATUS_SUCCESS) { rtp_session->seq--;

1 0

[Freeswitch-svn] [commit] r13471 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 27 May '09

27 May '09

Author: anthm Date: Wed May 27 14:41:41 2009 New Revision: 13471 Log: add member-type header to relevant events Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed May 27 14:41:41 2009 @@ -440,6 +440,7 @@ } switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-Type", "%s", switch_test_flag(member, MFLAG_MOD) ? "moderator" : "member"); return status; }

1 0

[Freeswitch-svn] [commit] r13470 - in freeswitch/trunk: build conf/autoload_configs
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 13:34:13 2009 New Revision: 13470 Log: adding siren to the default build and install Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed May 27 13:34:13 2009 @@ -34,7 +34,7 @@ codecs/mod_voipcodecs codecs/mod_ilbc codecs/mod_speex -#codecs/mod_siren +codecs/mod_siren #codecs/mod_celt #codecs/mod_dahdi_codec #dialplans/mod_dialplan_directory Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed May 27 13:34:13 2009 @@ -68,7 +68,7 @@ <load module="mod_ilbc"/> <load module="mod_speex"/> <load module="mod_h26x"/> -  + <load module="mod_siren"/>

1 0

[Freeswitch-svn] [commit] r13469 - freeswitch/trunk/conf
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 13:31:49 2009 New Revision: 13469 Log: clarify zrtp docs in vars.xml and give link on where to get more info Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed May 27 13:31:49 2009 @@ -27,7 +27,11 @@ <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/> <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> -  +  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/> <!--

1 0

[Freeswitch-svn] [commit] r13468 - freeswitch/trunk/conf
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 11:09:51 2009 New Revision: 13468 Log: clear up docs Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed May 27 11:09:51 2009 @@ -29,13 +29,7 @@  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/> -  +  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/> + +  + <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/> <!--

1 0

[Freeswitch-svn] [commit] r13467 - freeswitch/trunk/src/include
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Wed May 27 11:00:20 2009 New Revision: 13467 Log: build: fix msvc build (FSBUILD-165) Modified: freeswitch/trunk/src/include/switch_apr.h Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Wed May 27 11:00:20 2009 @@ -42,7 +42,7 @@ SWITCH_BEGIN_EXTERN_C #ifdef WIN32 -typedef HANDLE switch_thread_id_t; +typedef DWORD switch_thread_id_t; #else #include <pthread.h> typedef pthread_t switch_thread_id_t;

1 0

[Freeswitch-svn] [commit] r13466 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 10:49:22 2009 New Revision: 13466 Log: make xml parser happy Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed May 27 10:49:22 2009 @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>  - -<?xml version="1.0" encoding="utf-8"?>  <include> <context name="default">

1 0

[Freeswitch-svn] [commit] r13465 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 09:07:13 2009 New Revision: 13465 Log: You know FreeBSD is lame... Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Wed May 27 09:07:13 2009 @@ -45,11 +45,11 @@ $(DESTDIR)$(PREFIX)/grammar/model/communicator: $(GETLIB) $(SPHINXMODEL).tar.gz mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator - cp -drp $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator + cp -rp $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator $(DESTDIR)$(PREFIX)/grammar/model/wsj1: mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1 - cp -drp $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/wsj1 + cp -rp $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/wsj1 dictionary: @cp -f $(POCKETSPHINX_DIR)/model/lm/cmudict.0.6d $(DESTDIR)$(PREFIX)/grammar/default.dic

1 0

[Freeswitch-svn] [commit] r13464 - freeswitch/trunk/src
by FreeSWITCH SVN 27 May '09

27 May '09

Author: anthm Date: Wed May 27 08:06:27 2009 New Revision: 13464 Log: fix typo Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Wed May 27 08:06:27 2009 @@ -1288,7 +1288,7 @@ line++; if (err && stderr) { - fprintf(stderr, "Error [%s] in line %s line %d\n", err, file, line); + fprintf(stderr, "Error [%s] in file %s line %d\n", err, file, line); } /* we ignore <include> or </include> for the sake of validators as well as <?xml version="1.0"?> type stuff */

1 0

[Freeswitch-svn] [commit] r13463 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Wed May 27 00:44:21 2009 New Revision: 13463 Log: cleanup, fix leak Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj Wed May 27 00:44:21 2009 @@ -42,7 +42,9 @@ /> <Tool Name="VCCLCompilerTool" + PreprocessorDefinitions="" UsePrecompiledHeader="0" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool" @@ -167,7 +169,9 @@ /> <Tool Name="VCCLCompilerTool" + PreprocessorDefinitions="" UsePrecompiledHeader="0" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Wed May 27 00:44:21 2009 @@ -257,14 +257,13 @@ void debug_event_handler(switch_event_t *event) { - switch_event_header_t *event_header = NULL; - if (!event) { return; } /* Print out all event headers, for fun */ if (event->headers) { + switch_event_header_t *event_header = NULL; for (event_header = event->headers; event_header; event_header = event_header->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Header info: %s => %s\n", event_header->name, event_header->value); } @@ -277,9 +276,15 @@ char *argv[4] = { 0 }; const char *uuid; switch_channel_t *channel = switch_core_session_get_channel(session); + char *mydup; + + if (!destination) { + return; + } - /* TODO: dup dest first */ - switch_separate_string(destination, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + mydup = strdup(destination); + switch_assert(mydup); + switch_separate_string(mydup, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); /* Find the uuid of our B leg. If it exists, transfer it first */ if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { @@ -302,6 +307,7 @@ /* Transfer the A leg */ switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + free(mydup); } @@ -312,7 +318,7 @@ char sql[1024] = ""; SQLHSTMT stmt; - snprintf(sql, 1024, SQL_SAVE, globals.db_table, globals.db_column_cash, globals.db_column_cash, billamount, globals.db_column_account, billaccount); + switch_snprintf(sql, 1024, SQL_SAVE, globals.db_table, globals.db_column_cash, globals.db_column_cash, billamount, globals.db_column_account, billaccount); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing update query\n[%s]\n", sql); if (switch_odbc_handle_exec(globals.master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { @@ -339,7 +345,7 @@ #ifdef SWITCH_HAVE_ODBC char sql[1024] = ""; nibblebill_results_t pdata; - float balance = 0.00; + float balance = 0.00f; memset(&pdata, 0, sizeof(pdata)); snprintf(sql, 1024, SQL_LOOKUP, globals.db_column_cash, globals.db_table, globals.db_column_account, billaccount); @@ -375,7 +381,6 @@ switch_time_t ts = switch_micro_time_now(); float billamount; char date[80] = ""; - char *tmp; char *uuid; switch_size_t retsize; switch_time_exp_t tm; @@ -438,9 +443,6 @@ /* Have we done any billing on this channel yet? If no, set up vars for doing so */ if (!nibble_data) { nibble_data = switch_core_session_alloc(session, sizeof(*nibble_data)); - if (!nibble_data) { - switch_assert(nibble_data); - } memset(nibble_data, 0, sizeof(*nibble_data)); /* Setup new billing data (based on call answer time, in case this module started late with active calls) */ @@ -470,9 +472,7 @@ nibble_data->bill_adjustments = 0; /* Update channel variable with current billing */ - tmp = switch_mprintf("%f", nibble_data->total); - switch_channel_set_variable(channel, "nibble_total_billed", tmp); - switch_safe_free(tmp); + switch_channel_set_variable_printf(channel, "nibble_total_billed", "%f", nibble_data->total); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to log to database!\n"); } @@ -726,7 +726,7 @@ char *lbuf = NULL; char *argv[3] = { 0 }; - if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + if (!switch_strlen_zero(data) && (lbuf = strdup(data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if (!strcasecmp(argv[0], "adjust") && argc == 2) { nibblebill_adjust(session, (float)atof(argv[1])); @@ -744,6 +744,7 @@ switch_core_session_enable_heartbeat(session, atoi(argv[1])); } } + switch_safe_free(lbuf); } /* We get here from the API only (theoretically) */ @@ -786,7 +787,7 @@ stream->write_function(stream, "-USAGE: %s\n", API_SYNTAX); } } - + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; }

1 0