- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7412 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: brian Date: Mon Jan 28 15:14:38 2008 New Revision: 7412 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix race loop 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 Mon Jan 28 15:14:38 2008 @@ -901,7 +901,7 @@ if (unlink(file_path) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path); } - goto record_file; + goto end; } else { status = SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7411 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: brian Date: Mon Jan 28 14:50:42 2008 New Revision: 7411 Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Log: adding example of 32k local stream Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Mon Jan 28 14:50:42 2008 @@ -14,4 +14,13 @@ <param name="interval" value="20"/> <param name="timer_name" value="soft"/> </directory> +  </configuration>

1 0

[commit] r7410 - freeswitch/trunk/src/mod/codecs/mod_speex
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: brian Date: Mon Jan 28 14:45:56 2008 New Revision: 7410 Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Log: tweaks Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Mon Jan 28 14:45:56 2008 @@ -268,7 +268,7 @@ /*.fmtp */ NULL, /*.samples_per_second */ 32000, /*.actual_samples_per_second */ 32000, - /*.bits_per_second */ 256000, + /*.bits_per_second */ 44000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 640, /*.bytes_per_frame */ 1280, @@ -311,7 +311,7 @@ /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.actual_samples_per_second */ 8000, - /*.bits_per_second */ 3300, + /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 60000, /*.samples_per_frame */ 480, /*.bytes_per_frame */ 960, @@ -333,7 +333,7 @@ /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.actual_samples_per_second */ 8000, - /*.bits_per_second */ 22000, + /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 40000, /*.samples_per_frame */ 240, /*.bytes_per_frame */ 640, @@ -356,7 +356,7 @@ /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.actual_samples_per_second */ 8000, - /*.bits_per_second */ 1650, + /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 30000, /*.samples_per_frame */ 240, /*.bytes_per_frame */ 480,

1 0

[commit] r7409 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: brian Date: Mon Jan 28 14:23:46 2008 New Revision: 7409 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: we do support ultra-wideband too Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Mon Jan 28 14:23:46 2008 @@ -397,7 +397,7 @@ if (!strcasecmp(var, "rate")) { int tmp = atoi(val); - if (tmp == 8000 || tmp == 16000) { + if (tmp == 8000 || tmp == 16000 || tmp == 32000) { source->rate = tmp; } } else if (!strcasecmp(var, "shuffle")) {

1 0

[commit] r7408 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: anthm Date: Mon Jan 28 13:16:17 2008 New Revision: 7408 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: fix timing issue in portaudio 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 Mon Jan 28 13:16:17 2008 @@ -540,12 +540,14 @@ } switch_mutex_lock(globals.device_lock); + get_samples: if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame, &globals.timer)) == 0) { switch_mutex_unlock(globals.device_lock); - goto cng; + switch_yield(1000); + goto get_samples; } else { globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; @@ -731,7 +733,7 @@ globals.read_frame.buflen = sizeof(globals.databuf); globals.cng_frame.data = globals.cngbuf; globals.cng_frame.buflen = sizeof(globals.cngbuf); - globals.cng_frame.datalen = sizeof(globals.cngbuf); + globals.cng_frame.datalen = switch_bytes_per_frame(globals.sample_rate, globals.codec_ms) * 2; switch_set_flag((&globals.cng_frame), SFF_CNG); /* connect my internal structure to the blank pointer passed to me */

1 0

[commit] r7407 - freeswitch/trunk/src
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: anthm Date: Mon Jan 28 12:45:12 2008 New Revision: 7407 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix FSCORE-96 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 28 12:45:12 2008 @@ -1513,6 +1513,8 @@ if (flags && *flags & SFF_RFC2833) { send_msg->header.pt = rtp_session->te; } + data = send_msg->body; + datalen -= rtp_header_len; } else { uint8_t m = 0;

1 0

[commit] r7406 - freeswitch/trunk
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: anthm Date: Mon Jan 28 10:55:24 2008 New Revision: 7406 Modified: freeswitch/trunk/Makefile.am Log: add make current Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Jan 28 10:55:24 2008 @@ -288,6 +288,11 @@ $(MAKE) -j core $(MAKE) -j modules +current: update-clean + svn update + $(MAKE) all + $(MAKE) install + wayclean: clean modules: libfreeswitch.la

1 0

[commit] r7405 - freeswitch/trunk/debian
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: cypromis Date: Mon Jan 28 07:27:28 2008 New Revision: 7405 Modified: freeswitch/trunk/debian/dirs freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: patches from fli, thank you fixed double installs and some missing dirs in debian packaging Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Mon Jan 28 07:27:28 2008 @@ -1,7 +1,13 @@ -opt/freeswitch +opt/freeswitch/conf/dialplan/extensions +opt/freeswitch/conf/sip_profiles/nat +opt/freeswitch/conf/sip_profiles/default +opt/freeswitch/conf/sip_profiles/outbound +opt/freeswitch/conf/directory/default +opt/freeswitch/conf/autoload_configs +opt/freeswitch/conf/jingle_profiles +opt/freeswitch/conf/mrcp_profiles opt/freeswitch/log opt/freeswitch/db -opt/freeswitch/bin opt/freeswitch/bin/scripts etc/opt etc/monit Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Jan 28 07:27:28 2008 @@ -1,24 +1,15 @@ -/opt/freeswitch/conf -/opt/freeswitch/conf/dialplan -/opt/freeswitch/conf/dialplan/extensions /opt/freeswitch/conf/dialplan/public.xml /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/vars.xml /opt/freeswitch/conf/mime.types /opt/freeswitch/conf/web-vm.tpl /opt/freeswitch/conf/tetris.ttml -/opt/freeswitch/conf/sip_profiles /opt/freeswitch/conf/sip_profiles/outbound.xml /opt/freeswitch/conf/sip_profiles/nat.xml -/opt/freeswitch/conf/sip_profiles/nat /opt/freeswitch/conf/sip_profiles/nat/example.xml -/opt/freeswitch/conf/sip_profiles/default /opt/freeswitch/conf/sip_profiles/default/example.xml /opt/freeswitch/conf/sip_profiles/default.xml -/opt/freeswitch/conf/sip_profiles/outbound /opt/freeswitch/conf/sip_profiles/outbound/example.xml -/opt/freeswitch/conf/directory -/opt/freeswitch/conf/directory/default /opt/freeswitch/conf/directory/default/1007.xml /opt/freeswitch/conf/directory/default/1001.xml /opt/freeswitch/conf/directory/default/1008.xml @@ -46,7 +37,6 @@ /opt/freeswitch/conf/voicemail.tpl /opt/freeswitch/conf/freeswitch.xml /opt/freeswitch/conf/extensions.conf -/opt/freeswitch/conf/autoload_configs /opt/freeswitch/conf/autoload_configs/ivr.conf.xml /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml /opt/freeswitch/conf/autoload_configs/switch.conf.xml @@ -77,9 +67,7 @@ /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml /opt/freeswitch/conf/autoload_configs/console.conf.xml -/opt/freeswitch/conf/jingle_profiles /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml -/opt/freeswitch/conf/mrcp_profiles /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml /opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Jan 28 07:27:28 2008 @@ -37,8 +37,6 @@ opt/freeswitch/mod/mod_sndfile.so* opt/freeswitch/mod/mod_local_stream.so* opt/freeswitch/mod/mod_xml_*.so* -opt/freeswitch/conf -opt/freeswitch/conf/dialplan opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/extensions @@ -46,18 +44,12 @@ opt/freeswitch/conf/mime.types opt/freeswitch/conf/web-vm.tpl opt/freeswitch/conf/tetris.ttml -opt/freeswitch/conf/sip_profiles opt/freeswitch/conf/sip_profiles/outbound.xml opt/freeswitch/conf/sip_profiles/nat.xml -opt/freeswitch/conf/sip_profiles/nat opt/freeswitch/conf/sip_profiles/nat/example.xml -opt/freeswitch/conf/sip_profiles/default opt/freeswitch/conf/sip_profiles/default/example.xml opt/freeswitch/conf/sip_profiles/default.xml -opt/freeswitch/conf/sip_profiles/outbound opt/freeswitch/conf/sip_profiles/outbound/example.xml -opt/freeswitch/conf/directory -opt/freeswitch/conf/directory/default opt/freeswitch/conf/directory/default/1007.xml opt/freeswitch/conf/directory/default/1001.xml opt/freeswitch/conf/directory/default/1008.xml @@ -85,7 +77,6 @@ opt/freeswitch/conf/voicemail.tpl opt/freeswitch/conf/freeswitch.xml opt/freeswitch/conf/extensions.conf -opt/freeswitch/conf/autoload_configs opt/freeswitch/conf/autoload_configs/ivr.conf.xml opt/freeswitch/conf/autoload_configs/voicemail.conf.xml opt/freeswitch/conf/autoload_configs/switch.conf.xml @@ -116,9 +107,7 @@ opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml opt/freeswitch/conf/autoload_configs/console.conf.xml -opt/freeswitch/conf/jingle_profiles opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml -opt/freeswitch/conf/mrcp_profiles opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml

1 0

[commit] r7404 - in freeswitch/trunk/src: include mod/applications/mod_conference mod/applications/mod_fifo
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: mikej Date: Mon Jan 28 04:27:01 2008 New Revision: 7404 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: code analysis for hash functions. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Jan 28 04:27:01 2008 @@ -895,7 +895,7 @@ \return SWITCH_STATUS_SUCCESS if the data is added \note the string key must be a constant or a dynamic string */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(switch_hash_t * hash, const char *key, const void *data, switch_mutex_t *mutex); +SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(_In_ switch_hash_t * hash, _In_z_ const char *key, _In_opt_ const void *data, _In_ switch_mutex_t *mutex); /*! \brief Delete data from a hash based on desired key @@ -903,7 +903,7 @@ \param key the key from which to delete the data \return SWITCH_STATUS_SUCCESS if the data is deleted */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_delete(switch_hash_t * hash, const char *key); +SWITCH_DECLARE(switch_status_t) switch_core_hash_delete(_In_ switch_hash_t * hash, _In_z_ const char *key); /*! \brief Delete data from a hash based on desired key @@ -912,7 +912,7 @@ \param mutex optional mutex to lock \return SWITCH_STATUS_SUCCESS if the data is deleted */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t * hash, const char *key, switch_mutex_t *mutex); +SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(_In_ switch_hash_t * hash, _In_z_ const char *key, _In_ switch_mutex_t *mutex); /*! \brief Retrieve data from a given hash @@ -920,7 +920,7 @@ \param key the key to retrieve \return a pointer to the data held in the key */ -SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t * hash, const char *key); +SWITCH_DECLARE(void *) switch_core_hash_find(_In_ switch_hash_t * hash, _In_z_ const char *key); /*! @@ -930,11 +930,11 @@ \param mutex optional mutex to lock \return a pointer to the data held in the key */ -SWITCH_DECLARE(void *) switch_core_hash_find_locked(switch_hash_t * hash, const char *key, switch_mutex_t *mutex); +SWITCH_DECLARE(void *) switch_core_hash_find_locked(_In_ switch_hash_t * hash, _In_z_ const char *key, _In_ switch_mutex_t *mutex); -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *depricate_me, switch_hash_t *hash); -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *hi); -SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val); +SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *depricate_me, _In_ switch_hash_t *hash); +SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(_In_ switch_hash_index_t *hi); +SWITCH_DECLARE(void) switch_hash_this(_In_ switch_hash_index_t *hi, _Out_opt_ptrdiff_cap_(klen) const void **key, _Out_opt_ switch_ssize_t *klen, _Out_ void **val); ///\} Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Jan 28 04:27:01 2008 @@ -319,6 +319,8 @@ #define _Post_z_ #define _Out_cap_(x) #define _Out_z_cap_(x) +#define _Out_ptrdiff_cap_(x) +#define _Out_opt_ptrdiff_cap_(x) #endif 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 Mon Jan 28 04:27:01 2008 @@ -3578,7 +3578,7 @@ argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); /* try to find a command to execute */ - if (argc) { + if (argc && argv[0]) { conference_obj_t *conference = NULL; if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) { Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Jan 28 04:27:01 2008 @@ -208,7 +208,7 @@ mydata = switch_core_session_strdup(session, data); switch_assert(mydata); - if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2 || !argv[0]) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); return; }

1 0

[commit] r7403 - in freeswitch/trunk/src: . include mod/applications/mod_voicemail mod/endpoints/mod_portaudio mod/endpoints/mod_woomera
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: mikej Date: Mon Jan 28 03:47:55 2008 New Revision: 7403 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_utils.c Log: code analysis, bounds checks, buffer overrun fixes. Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Jan 28 03:47:55 2008 @@ -125,11 +125,11 @@ * @{ */ -SWITCH_DECLARE(int) switch_snprintf(char *buf, switch_size_t len, const char *format, ...); +SWITCH_DECLARE(int) switch_snprintf(_Out_z_cap_(len) char *buf, _In_ switch_size_t len, _In_z_ _Printf_format_string_ const char *format, ...); -SWITCH_DECLARE(int) switch_vasprintf(char **buf, const char *format, va_list ap); +SWITCH_DECLARE(int) switch_vasprintf(_Out_opt_ char **buf, _In_z_ _Printf_format_string_ const char *format, _In_ va_list ap); -SWITCH_DECLARE(char *) switch_copy_string(char *dst, const char *src, switch_size_t dst_size); +SWITCH_DECLARE(char *) switch_copy_string(_Out_z_cap_(dst_size) char *dst, _In_z_ const char *src, _In_ switch_size_t dst_size); /** @} */ Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Mon Jan 28 03:47:55 2008 @@ -58,7 +58,7 @@ * \param max_len length required by the buffer * \return status */ -SWITCH_DECLARE(switch_status_t) switch_buffer_create(switch_memory_pool_t *pool, switch_buffer_t **buffer, switch_size_t max_len); +SWITCH_DECLARE(switch_status_t) switch_buffer_create(_In_ switch_memory_pool_t *pool, _Out_ switch_buffer_t **buffer, _In_ switch_size_t max_len); /*! \brief Allocate a new dynamic switch_buffer * \param buffer returned pointer to the new buffer @@ -67,8 +67,8 @@ * \param max_len length the buffer is allowed to grow to * \return status */ -SWITCH_DECLARE(switch_status_t) switch_buffer_create_dynamic(switch_buffer_t **buffer, switch_size_t blocksize, switch_size_t start_len, - switch_size_t max_len); +SWITCH_DECLARE(switch_status_t) switch_buffer_create_dynamic(_Out_ switch_buffer_t **buffer, _In_ switch_size_t blocksize, _In_ switch_size_t start_len, + _In_ switch_size_t max_len); SWITCH_DECLARE(void) switch_buffer_add_mutex(_In_ switch_buffer_t *buffer, _In_ switch_mutex_t *mutex); SWITCH_DECLARE(void) switch_buffer_lock(_In_ switch_buffer_t *buffer); Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Jan 28 03:47:55 2008 @@ -867,14 +867,14 @@ \param pool the pool to use for the new hash \return SWITCH_STATUS_SUCCESS if the hash is created */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_init(switch_hash_t ** hash, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_core_hash_init(_Out_ switch_hash_t ** hash, _In_ switch_memory_pool_t *pool); /*! \brief Destroy an existing hash table \param hash the hash to destroy \return SWITCH_STATUS_SUCCESS if the hash is destroyed */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_destroy(switch_hash_t **hash); +SWITCH_DECLARE(switch_status_t) switch_core_hash_destroy(_Inout_ switch_hash_t **hash); /*! \brief Insert data into a hash @@ -884,7 +884,7 @@ \return SWITCH_STATUS_SUCCESS if the data is added \note the string key must be a constant or a dynamic string */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_insert(switch_hash_t * hash, const char *key, const void *data); +SWITCH_DECLARE(switch_status_t) switch_core_hash_insert(_In_ switch_hash_t * hash, _In_z_ const char *key, _In_opt_ const void *data); /*! \brief Insert data into a hash Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Jan 28 03:47:55 2008 @@ -314,7 +314,11 @@ #define _Inout_opt_ #define _In_bytecount_(x) #define _Out_opt_bytecapcount_(x) +#define _Out_bytecapcount_(x) #define _Ret_ +#define _Post_z_ +#define _Out_cap_(x) +#define _Out_z_cap_(x) #endif Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Jan 28 03:47:55 2008 @@ -92,7 +92,7 @@ \param family the address family to return (AF_INET or AF_INET6) \return SWITCH_STATUS_SUCCESSS for success, otherwise failure */ -SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family); +SWITCH_DECLARE(switch_status_t) switch_find_local_ip(_Out_opt_bytecapcount_(len) char *buf, _In_ int len, _In_ int family); /*! \brief find the char representation of an ip adress 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 Mon Jan 28 03:47:55 2008 @@ -437,7 +437,7 @@ callback_dialplan = val; } else if (!strcasecmp(var, "callback-context") && !switch_strlen_zero(val)) { callback_context = val; - } else if (!strcasecmp(var, "file-extension")) { + } else if (!strcasecmp(var, "file-extension") && !switch_strlen_zero(val)) { file_ext = val; } else if (!strcasecmp(var, "record-title") && !switch_strlen_zero(val)) { record_title = val; 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 Mon Jan 28 03:47:55 2008 @@ -331,7 +331,7 @@ switch_mutex_lock(globals.pvt_lock); - if (switch_strlen_zero(tech_pvt->call_id)) { + if (*tech_pvt->call_id == '\0') { switch_snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", ++globals.call_id); switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt); switch_core_session_set_read_codec(tech_pvt->session, &globals.read_codec); Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Mon Jan 28 03:47:55 2008 @@ -98,8 +98,8 @@ int mval; char command[WOOMERA_STRLEN]; char command_args[WOOMERA_STRLEN]; - char names[WOOMERA_STRLEN][WOOMERA_ARRAY_LEN]; - char values[WOOMERA_STRLEN][WOOMERA_ARRAY_LEN]; + char names[WOOMERA_ARRAY_LEN][WOOMERA_STRLEN]; + char values[WOOMERA_ARRAY_LEN][WOOMERA_STRLEN]; char body[WOOMERA_BODYLEN]; unsigned int flags; int last; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 28 03:47:55 2008 @@ -589,7 +589,9 @@ if ((argc = switch_separate_string(ext_list, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { for (x = 0; x < argc; x++) { - switch_core_hash_insert(runtime.mime_types, argv[x], ptype); + if (argv[x] && ptype) { + switch_core_hash_insert(runtime.mime_types, argv[x], ptype); + } } status = SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Jan 28 03:47:55 2008 @@ -999,7 +999,7 @@ *parser = (switch_ivr_digit_stream_parser_t *) switch_core_alloc(pool, sizeof(switch_ivr_digit_stream_parser_t)); } // if we have parser object, initialize it for the caller - if (*parser != NULL) { + if (pool && *parser != NULL) { memset(*parser, 0, sizeof(switch_ivr_digit_stream_parser_t)); (*parser)->pool_auto_created = pool_auto_created; (*parser)->pool = pool; Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Jan 28 03:47:55 2008 @@ -549,6 +549,10 @@ char abuf[25] = ""; #endif + if (len < 16) { + return status; + } + switch_copy_string(buf, "127.0.0.1", len); switch (family) {

1 0