- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13258 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 08 May '09

08 May '09

Author: mrene Date: Thu May 7 23:00:14 2009 New Revision: 13258 Log: Fix an error in fs_cli's usage Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Thu May 7 23:00:14 2009 @@ -187,7 +187,7 @@ printf(" -?,-h --help Usage Information\n"); printf(" -H, --host=hostname Host to connect\n"); printf(" -P, --port=port Port to connect (1 - 65535)\n"); - printf(" -p, --password=FILENAME Password\n"); + printf(" -p, --password=password Password\n"); printf(" -x, --execute=command Execute Command and Exit\n"); printf(" -l, --loglevel=command Log Level\n"); printf(" -q, --quiet Disable logging\n");

1 0

[commit] r13257 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 08 May '09

08 May '09

Author: moy Date: Thu May 7 20:25:39 2009 New Revision: 13257 Log: set mod_dahdi_codec dahdi transcoding device sockets to non-blocking to avoid hanging when there is no data and just return 0 bytes frame Jira: MODCODEC-8 Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Thu May 7 20:25:39 2009 @@ -32,8 +32,12 @@ #include <switch.h> #include <g711.h> +#include <poll.h> #include <linux/types.h> /* __u32 */ #include <sys/ioctl.h> +#include <unistd.h> +#include <fcntl.h> +#include <errno.h> /*#define DEBUG_DAHDI_CODEC 1*/ @@ -91,6 +95,7 @@ static int32_t switch_dahdi_get_transcoder(struct dahdi_transcoder_formats *fmts) { + int32_t fdflags; int32_t fd = open(transcoding_device, O_RDWR); if (fd < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -105,6 +110,21 @@ close(fd); return -1; } + fdflags = fcntl(fd, F_GETFL); + if (fdflags > -1) { + fdflags |= O_NONBLOCK; + if (fcntl(fd, F_SETFL, fdflags)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not set non-block mode in %s transcoder FD: %s\n", + transcoder_name, strerror(errno)); + /* should we abort? this may cause channels to hangup when overruning the device + * see jira dahdi codec issue MODCODEC-8 (Hung Calls and Codec DAHDI G.729A 8.0k decoder error!) + * */ + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not get flags from %s transcoder FD: %s\n", + transcoder_name, strerror(errno)); + } + if (fmts->srcfmt & DAHDI_FORMAT_ULAW) { switch_mutex_lock(transcoder_counter_mutex); total_encoders_usage++; @@ -114,6 +134,7 @@ total_decoders_usage++; switch_mutex_unlock(transcoder_counter_mutex); } + return fd; } @@ -194,13 +215,28 @@ context->encoding_fd = -1; context->decoding_fd = -1; - /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ + /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? + * this can be used to calculate the target buffer when encoding and decoding + * */ context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) ? 8 : 12; return SWITCH_STATUS_SUCCESS; } +static int wait_for_transcoder(int fd) +{ + /* let's wait a bit for the transcoder, if in 20msthe driver does not notify us that its ready to accept more works + then just bail out with 0 bytes encoded/decoded as result, I'd expect the card to hold that buffer and return it later */ + int res = 0; + struct pollfd readpoll; + memset(&readpoll, 0, sizeof(readpoll)); + readpoll.fd = fd; + readpoll.events = POLLOUT; + res = poll(&readpoll, 1, 50); + return res; +} + static switch_status_t switch_dahdi_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, @@ -244,12 +280,26 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s encoder device, but only wrote %d bytes.\n", i, transcoder_name, res); return SWITCH_STATUS_FALSE; } + res = wait_for_transcoder(context->encoding_fd); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to poll on %s encoder device: %s.\n", transcoder_name, strerror(errno)); + return SWITCH_STATUS_FALSE; + } + if (0 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s encoder device.\n", transcoder_name); + *encoded_data_len = 0; + return SWITCH_STATUS_SUCCESS; + } #ifdef DEBUG_DAHDI_CODEC - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrote %d bytes of decoded ulaw data.\n", res); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read %d bytes of encoded data.\n", i/context->codec_r); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read %d bytes of encoded data.\n", *encoded_data_len); #endif - res = read(context->encoding_fd, encoded_data, i/context->codec_r); + res = read(context->encoding_fd, encoded_data, *encoded_data_len); if (-1 == res) { + if (EAGAIN == errno || EWOULDBLOCK == errno) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s encoder device (%s).\n", transcoder_name, strerror(errno)); + *encoded_data_len = 0; + return SWITCH_STATUS_SUCCESS; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno)); return SWITCH_STATUS_FALSE; } @@ -269,7 +319,8 @@ { int32_t res; short *dbuf_linear; - unsigned char dbuf_ulaw[encoded_data_len * ((struct dahdi_context*)codec->private_info)->codec_r]; + // we only can decode up to half ulaw bytes of whatever their destiny linear buffer is + unsigned char dbuf_ulaw[*decoded_data_len/2]; unsigned char *ebuf_g729; uint32_t i; struct dahdi_context *context; @@ -302,7 +353,7 @@ #endif res = write(context->decoding_fd, ebuf_g729, encoded_data_len); if (-1 == res) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s decoder device.\n", transcoder_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s decoder device: %s.\n", transcoder_name, strerror(errno)); return SWITCH_STATUS_FALSE; } if (encoded_data_len != res) { @@ -310,13 +361,27 @@ return SWITCH_STATUS_FALSE; } #ifdef DEBUG_DAHDI_CODEC - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrote %d bytes to decode.\n", res); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read from device %d bytes of decoded ulaw data.\n", - encoded_data_len*context->codec_r); + sizeof(dbuf_ulaw)); #endif - res = read(context->decoding_fd, dbuf_ulaw, encoded_data_len*context->codec_r); + res = wait_for_transcoder(context->decoding_fd); if (-1 == res) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to poll on %s decoder device: %s.\n", transcoder_name, strerror(errno)); + return SWITCH_STATUS_FALSE; + } + if (0 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s decoder device.\n", transcoder_name); + *decoded_data_len = 0; + return SWITCH_STATUS_SUCCESS; + } + res = read(context->decoding_fd, dbuf_ulaw, sizeof(dbuf_ulaw)); + if (-1 == res) { + if (EAGAIN == errno || EWOULDBLOCK == errno) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s decoder device (%s).\n", transcoder_name, strerror(errno)); + *decoded_data_len = 0; + return SWITCH_STATUS_SUCCESS; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s decoder device: %s.\n", transcoder_name, strerror(errno)); return SWITCH_STATUS_FALSE; } for (i = 0; i < res; i++) {

1 0

[commit] r13256 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 07 May '09

07 May '09

Author: andrew Date: Thu May 7 17:13:05 2009 New Revision: 13256 Log: Use switch_xml_parse_str_dynamic so we don't leak (thanks Math) Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu May 7 17:13:05 2009 @@ -434,7 +434,7 @@ if (switch_strlen_zero(xmlstr)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Result\n"); - } else if (!(xml = switch_xml_parse_str(xmlstr, strlen(xmlstr)))) { + } else if (!(xml = switch_xml_parse_str_dynamic(xmlstr, strlen(xmlstr)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing XML Result!\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XML parsed OK!\n"); @@ -444,7 +444,6 @@ switch_core_hash_delete(ptr->listener->fetch_reply_hash, uuid_str); switch_safe_free(rep->buff); switch_safe_free(rep); - switch_safe_free(xmlstr); return xml; }

1 0

[commit] r13255 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 07 May '09

07 May '09

Author: mrene Date: Thu May 7 16:40:21 2009 New Revision: 13255 Log: Add switch_xml_parse_str_dynamic and switch_xml_parse_str_dup Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu May 7 16:40:21 2009 @@ -98,6 +98,21 @@ uint32_t flags; }; +/*! + * \brief Parses a string into a switch_xml_t, ensuring the memory will be freed with switch_xml_free + * \param s The string to parse + * \param dup true if you want the string to be strdup()'d automatically + * \return the switch_xml_t or NULL if an error occured + */ +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str_dynamic(char *s, switch_bool_t dup); + +/*! + * \brief Parses a string into a switch_xml_t + * \param s The string to parse + * \return the switch_xml_t or NULL if an error occured + */ +#define switch_xml_parse_str_dup(x) switch_xml_parse_str_dynamic(x, SWITCH_TRUE) + ///\brief Given a string of xml data and its length, parses it and creates an switch_xml ///\ structure. For efficiency, modifies the data by adding null terminators ///\ and decoding ampersand sequences. If you don't want this, copy the data and Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu May 7 16:40:21 2009 @@ -902,6 +902,19 @@ free(attr); } +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str_dynamic(char *s, switch_bool_t dup) +{ + switch_xml_root_t root; + char *data = dup ? strdup(s) : s; + + if ((root = (switch_xml_root_t) switch_xml_parse_str(data, strlen(data)))) { + root->dynamic = 1; /* Make sure we free the memory is switch_xml_free() */ + return &root->xml; + } else { + return NULL; + } +} + /* parse the given xml string and return an switch_xml structure */ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str(char *s, switch_size_t len) { @@ -1552,14 +1565,9 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { - char *x; - switch_xml_root_t xmlroot = NULL; - x = switch_xml_toxml(tag, SWITCH_FALSE); + char *x = switch_xml_toxml(tag, SWITCH_FALSE); switch_assert(x); - xmlroot = (switch_xml_root_t)switch_xml_parse_str(x, strlen(x)); - xmlroot->dynamic = 1; /* free the memory in switch_xml_free */ - *root = (switch_xml_t)xmlroot; - *node = *root; + *node = *root = switch_xml_parse_str_dynamic(x, SWITCH_FALSE); /* x will be free()'d in switch_xml_free() */ switch_xml_free(xml); } else { *node = tag;

1 0

[commit] r13254 - freeswitch/trunk/docs
by FreeSWITCH SVN 07 May '09

07 May '09

Author: mcollins Date: Thu May 7 16:10:30 2009 New Revision: 13254 Log: Update Changelog through 5/6/2009 (r13248) Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Thu May 7 16:10:30 2009 @@ -134,6 +134,15 @@ core: Add Q850 hangup cause variable (FSCORE-356/r:13163) core: keep presence up to date (r:13166) core: fix failed_xml_cdr_prefix is processed before all variables for the b-leg have been generated (FSCORE-357/r:13167,13176) + core: failed_xml_cdr_prefix doesn't work for list of destinations separated by pipe (FSCORE-359/r:13209) + core: add support for gcc 4.4.0 (FSCORE-355/r:13210) + core: add resume command to event socket and socket_resume variable (r:13212) + core: prevent buffer destroy race (r:13219) + core: move originate retry related vars to only be in {} not in channel variable list (r:13225) + core: Make { } vars take precedence over channel variables (r:13228) + core: fix memory issue in core file resampling code (r:13233) + core: fix play and get digits when using phrase macros (r:13244) + core: Don't set the caller name to origination_uuid's value (r:13248) docs: Fix filename references in phrase_en.xml (r:12976) docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041) docs: Updates to phrase_es.xml (r:13067) @@ -169,6 +178,8 @@ libesl: adding sendevent example for esl perl (r:13079) libesl: send content len with body in esl sendevent (r:13168) libesl: add arbitrary notify (r:13188) + libesl: fix Phantom events when doing several bgapi calls without interleaving them with recvEvent (ESL-12/r:13217) + libesl: add Ruby example for ESL (ESL-15/r:13235) libiksemel: let return 0 be a failure on read in iks to avoid cpu race (r:13123,13124,13133) libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134/r:12535) libsofiasip: Fix compile time out-of-bounds error in su_uniqueid.c (SFSIP-136/r:12914) @@ -205,6 +216,7 @@ mod_conference: dist-dtmf flag in conference (r:13191) mod_conference: add transfer action to caller-controls (r:13194) mod_conference: fix dtmf queue issue in dist-dtmf feature (MODAPP-268/r:13206) + mod_conference: add execute_application to custom controls (r:13216) mod_console: Fix mod_console (missing FD_ZERO before FD_SET) (r:13126) mod_dahdi_codec: delay init of resources until the first time they are actually used to avoid unnecessary waste of resources in hardware codec (r:12962) mod_dingaling: fix crash when unloading/reload mod_dingaling (LBDING-13/r:12612) @@ -218,6 +230,8 @@ mod_dptools: Custom events fired from event application bypass filtering mechanism (MODAPP-249/r:12894) mod_dptools: change inline limit from 4 to 128 apps (MODAPP-253/r:12957) mod_dptools: improvements to presence function (r:13164) + mod_dptools: add group_recurse_variables and user_recurse_variables to {} vars (default is true, set to false to not pass vars down to user or group channels) (r:13241,13246) + mod_dptools: add param dial-timeout to directory (MODAPP-271/r:13247) mod_enum: fix enum_auto_route (MODAPP220/r:12243) mod_erlang_event: Bind to 0.0.0.0 instead of 127.0.0.1 by default; like most erlang nodes do. (r:12249) mod_erlang_event: Reply appropriately to net_adm:ping() (r:13066) @@ -231,6 +245,8 @@ mod_fifo: fix uuid_transfer into mod_conference audio issue (MODAPP-259/r:13030) mod_fifo: add fifo_orbit_dialplan and fifo_orbit_context vars (MODAPP-189/r:13038) mod_fifo: don't do wrapup when agent is in nowait mode or call has ended (r:13094) + mod_fifo: don't call all members on on-hook mode and round robin based on next_avail (MODAPP-272/r:13240,13242) + mod_fifo: abandon outbound calls when they are not needed, place queue name in the caller id (r:13240) mod_file_string: add new module, allows for playing ! delimited lists of sound files (r:13182) mod_flite: three new voices - rms, awb (male), slt (female) (r:12166) mod_iax: make mod_iax async (r:13021) @@ -242,6 +258,7 @@ mod_limit: prevent multiple bindings of the same event_hooks to make code simpler in mod_limit (MODAPP-264/r:13113) mod_local_stream: Add show_local_stream [stream name] (MODFORM-27/r:13165) mod_local_stream: fail over to default if desired stream is not found (r:13184,13185,13186) + mod_local_stream: refactor resampling in mod_local_stream (r:13222) mod_loopback: mod_lopback: other_loopback _leg_uuid variables are sometimes unset while executing the dialplan (MODENDP-210/r:12905) mod_loopback: destroy codec (r:12936) mod_loopback: fix loopback channels that stay alive (FSCORE-349/r:12944,12953) @@ -251,6 +268,7 @@ mod_loopback: make mod_loopback render silence to prevent livelock (r:13147) mod_loopback: drop excess frames on loopback channel (r:13156,13157,13158) mod_loopback: add loopback_bowout variable (set to false to skip auto-bowout) (r:13162) + mod_loopback: mod_loopback plays noise instead of silence (MODENDP-216/r:13214) mod_lua: windows build changes to support externally built modules. (MODLANG-101/r:12237) mod_lua: fix visibility support (FSCORE-302/r:12239-12240) mod_lua: fix windows build (FSBUILD-149/r:12919) @@ -270,6 +288,7 @@ mod_opal: prevent endless loop (r:13034) mod_opal: Fixed ability to send a string as user indications (DTMF) (r:13049) mod_opal: try to flag CNG frames (MODOPAL-6/r:13098) + mod_opal: Fixed incorrect include path (r:13239) mod_perl: Libtool build fix for mod_perl: use LIBTOOL_LIB_EXTEN to make libtool-2.2 happy and CXXLINK since we are linking a C++ lib (r:13080) mod_pocketsphinx: Revamp mod_pocketsphinx to use jsgf format (r:12224) mod_portaudio: fix audio issue in portaudio (r:12669) @@ -286,6 +305,7 @@ mod_say_ru: change dollars and cents to rubles and kopecks (r:13025) mod_say_ru: add ru_ip (r:13026) mod_say_ru: Update phrase_ru.xml to include v1.0.8 sound prompts (r:13044,13045) + mod_shout: Fix race conditions; fix stutter when first 64k is drained from shoutcast stream (r:13218) mod_skel: add more example code and info (r:12459) mod_skypiax: move to trunk (r:12167) mod_skypiax: fix hang on invalid mod_skypiax.conf.xml (MODSKYPIAX-21/r:12320-12322,12343) @@ -336,6 +356,11 @@ mod_sofia: parse out alert-info and call-info from infos (r:13173) mod_sofia: add arbitrary notify (r:13187,13189) mod_sofia: add experimental NDLB-connectile-dysfunction-2.0 (r:13197~13203) + mod_sofia: allow register-transport (MODENDP-217/r:13226) + mod_sofia: fix mem corruption on failed register (r:13229,13230) + mod_sofia: Ignore ptime when missing instead of using @0i (MODENDP-206/r:13231) + mod_sofia: fix evil send myself a refer bug (FSCORE-350/r:13237) + mod_sofia: Add sofia profile params to fine-tune timers (r:13245) mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036) mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852) mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the

1 0

[commit] r13253 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 07 May '09

07 May '09

Author: anthm Date: Thu May 7 12:27:15 2009 New Revision: 13253 Log: wait for cdr to be generated in failed cdr_x Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu May 7 12:27:15 2009 @@ -82,6 +82,7 @@ #define switch_channel_down(_channel) (switch_channel_get_state(_channel) >= CS_HANGUP) SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); +SWITCH_DECLARE(void) switch_channel_wait_for_state_timeout(switch_channel_t *other_channel, switch_channel_state_t want_state, uint32_t timeout); SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, switch_bool_t pres, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu May 7 12:27:15 2009 @@ -771,6 +771,25 @@ } } + +SWITCH_DECLARE(void) switch_channel_wait_for_state_timeout(switch_channel_t *other_channel, switch_channel_state_t want_state, uint32_t timeout) +{ + switch_channel_state_t state; + uint32_t count = 0; + + for (;;) { + state = switch_channel_get_running_state(other_channel); + + if (state >= want_state) { + break; + } + switch_cond_next(); + if (++count >= timeout) { + break; + } + } +} + SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, switch_bool_t pres, Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu May 7 12:27:15 2009 @@ -2052,8 +2052,8 @@ continue; } - switch_channel_wait_for_state(caller_channel, switch_core_session_get_channel(originate_status[i].peer_session), CS_DESTROY); - + switch_channel_wait_for_state_timeout(switch_core_session_get_channel(originate_status[i].peer_session), CS_DESTROY, 5000); + if (switch_ivr_generate_xml_cdr(originate_status[i].peer_session, &cdr) == SWITCH_STATUS_SUCCESS) { if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { switch_snprintf(buf, sizeof(buf), "%s_%d", cdr_var, ++cdr_total);

1 0

[commit] r13252 - freeswitch/trunk/scripts/contrib/swk/php/esl_cdr
by FreeSWITCH SVN 07 May '09

07 May '09

Author: silik0n Date: Thu May 7 11:40:37 2009 New Revision: 13252 Log: ooops Modified: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Modified: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Thu May 7 11:40:37 2009 @@ -58,49 +58,50 @@ } } - $insert = sprintf("INSERT into cdr (uuid, acctcode, ani, e164_ani, dnis, translated_dnis, e164_dnis, src_host, read_codec, write_codec, clid_name, ". - "clid_number, src_sdp, dest_sdp, originate_disposition, bridge_to_uuid, endpoint_disposition, sip_hangup_disposition, term_cause, ". - "hangup_cause, start_stamp, answer_stamp, progress_media_stamp, end_stamp, duration, billsec, progress_mediasec, billmin, ". - "carrier_id, cust_cost, carrier_cost)". - "VALUES". - "('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %s, '%s', '%s',". - "%s, %s, %s, %s, %s, %s, %s)", - $data['Unique-ID'], - $data['acctcode'], - $data['Caller-Caller-ID-Number'], - $data['Caller-Caller-ID-Number'], - urldecode($data['Caller-Destination-Number']), - urldecode($data['Caller-Destination-Number']), - urldecode($data['Caller-Destination-Number']), - $data['Caller-Network-Addr'], - $data['Channel-Read-Codec-Name']."-". $data['Channel-Read-Codec-Rate'], - $data['Channel-Write-Codec-Name']."-". $data['Channel-Write-Codec-Rate'], - urlencode($data['Caller-Caller-ID-Name']), - $data['Caller-Caller-ID-Number'], - $data['variable_switch_r_sdp'], - $data['variable_switch_m_sdp'], - $data['variable_originate_disposition'], - $data['variable_bridge_to'], - $data['variable_endpoint_disposition'], - $data['variable_sip_hangup_disposition'], - $data['variable_sip_term_cause'], - $data['variable_hangup_cause'], - urldecode($data['variable_start_stamp']) . '-05', - isset($data['variable_answer_stamp'])?'\''. urldecode($data['variable_answer_stamp']) . '-05\'':'null', - urldecode($data['variable_progress_media_stamp']) . '-05', - urldecode($data['variable_end_stamp']) . '-05', - $data['variable_duration'], - $data['variable_billsec'], - $data['variable_progress_mediasec'], - $data['variable_billsec'], - "0", - "0", - "0" - ); - - $inserted = $dbh->exec($insert); - if ($inserted < 1){ - die($db->errorInfo()); + $insert = sprintf("INSERT into cdr (uuid, acctcode, ani, e164_ani, dnis, translated_dnis, e164_dnis, src_host, read_codec, write_codec, clid_name, ". + "clid_number, src_sdp, dest_sdp, originate_disposition, bridge_to_uuid, endpoint_disposition, sip_hangup_disposition, term_cause, ". + "hangup_cause, start_stamp, answer_stamp, progress_media_stamp, end_stamp, duration, billsec, progress_mediasec, billmin, ". + "carrier_id, cust_cost, carrier_cost)". + "VALUES". + "('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %s, '%s', '%s',". + "%s, %s, %s, %s, %s, %s, %s)", + $data['Unique-ID'], + $data['acctcode'], + $data['Caller-Caller-ID-Number'], + $data['Caller-Caller-ID-Number'], + urldecode($data['Caller-Destination-Number']), + urldecode($data['Caller-Destination-Number']), + urldecode($data['Caller-Destination-Number']), + $data['Caller-Network-Addr'], + $data['Channel-Read-Codec-Name']."-". $data['Channel-Read-Codec-Rate'], + $data['Channel-Write-Codec-Name']."-". $data['Channel-Write-Codec-Rate'], + urlencode($data['Caller-Caller-ID-Name']), + $data['Caller-Caller-ID-Number'], + $data['variable_switch_r_sdp'], + $data['variable_switch_m_sdp'], + $data['variable_originate_disposition'], + $data['variable_bridge_to'], + $data['variable_endpoint_disposition'], + $data['variable_sip_hangup_disposition'], + $data['variable_sip_term_cause'], + $data['variable_hangup_cause'], + urldecode($data['variable_start_stamp']) . '-05', + isset($data['variable_answer_stamp'])?'\''. urldecode($data['variable_answer_stamp']) . '-05\'':'null', + urldecode($data['variable_progress_media_stamp']) . '-05', + urldecode($data['variable_end_stamp']) . '-05', + $data['variable_duration'], + $data['variable_billsec'], + $data['variable_progress_mediasec'], + $data['variable_billsec'], + "0", + "0", + "0" + ); + + $inserted = $dbh->exec($insert); + if ($inserted < 1){ + die($db->errorInfo()); + } } } ?>

1 0

[commit] r13251 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 May '09

07 May '09

Author: anthm Date: Thu May 7 10:14:28 2009 New Revision: 13251 Log: sleep when loading odbc profiles to prevent connection races in underlying libs Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.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 Thu May 7 10:14:28 2009 @@ -2664,8 +2664,13 @@ } if (profile->sipip) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Started Profile %s [%s]\n", profile->name, url); launch_sofia_profile_thread(profile); + if (profile->odbc_dsn) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Connecting ODBC Profile %s [%s]\n", profile->name, url); + switch_yield(1000000); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Started Profile %s [%s]\n", profile->name, url); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Unable to start Profile %s due to no configured sip-ip\n", profile->name); }

1 0

[commit] r13250 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 May '09

07 May '09

Author: anthm Date: Thu May 7 10:07:48 2009 New Revision: 13250 Log: add rtp-autoflush-during-bridge param Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 May 7 10:07:48 2009 @@ -1062,7 +1062,7 @@ } if (ok) { - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK); } else { rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); }

1 0

[commit] r13249 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 May '09

07 May '09

Author: anthm Date: Thu May 7 10:07:04 2009 New Revision: 13249 Log: add rtp-autoflush-during-bridge param Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu May 7 10:07:04 2009 @@ -92,6 +92,10 @@ <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>  <param name="tls-version" value="$${sip_tls_version}"/> + +  +    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 May 7 10:07:04 2009 @@ -1024,21 +1024,49 @@ case SWITCH_MESSAGE_INDICATE_BRIDGE: if (switch_rtp_ready(tech_pvt->rtp_session)) { + const char *val; + int ok = 0; + if (sofia_test_flag(tech_pvt, TFLAG_PASS_RFC2833) && switch_channel_test_flag_partner(channel, CF_FS_RTP)) { switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s activate passthru 2833 mode.\n", switch_channel_get_name(channel)); } + + if ((val = switch_channel_get_variable(channel, "rtp_autoflush_during_bridge"))) { + ok = switch_true(val); + } else { + ok = sofia_test_pflag(tech_pvt->profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + if (ok) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + } else { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + } } goto end; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: if (switch_rtp_ready(tech_pvt->rtp_session)) { + const char *val; + int ok = 0; + if (switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s deactivate passthru 2833 mode.\n", switch_channel_get_name(channel)); switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); } - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + + if ((val = switch_channel_get_variable(channel, "rtp_autoflush_during_bridge"))) { + ok = switch_true(val); + } else { + ok = sofia_test_pflag(tech_pvt->profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } + + if (ok) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + } else { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + } + } goto end; case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu May 7 10:07:04 2009 @@ -189,6 +189,7 @@ PFLAG_NAT_OPTIONS_PING, PFLAG_AUTOFIX_TIMING, PFLAG_MESSAGE_QUERY_ON_REGISTER, + PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE, /* No new flags below this line */ PFLAG_MAX } PFLAGS; 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 Thu May 7 10:07:04 2009 @@ -1557,6 +1557,12 @@ } else { sofia_clear_pflag(profile, PFLAG_CALLID_AS_UUID); } + } else if (!strcasecmp(var, "rtp-autoflush-during-bridge")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } else { + sofia_clear_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } } else if (!strcasecmp(var, "outbound-use-uuid-as-callid")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_UUID_AS_CALLID); @@ -2059,6 +2065,12 @@ sofia_set_flag(profile, TFLAG_INB_NOMEDIA); } else if (!strcasecmp(var, "inbound-late-negotiation") && switch_true(val)) { sofia_set_flag(profile, TFLAG_LATE_NEGOTIATION); + } else if (!strcasecmp(var, "rtp-autoflush-during-bridge")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } else { + sofia_clear_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } } else if (!strcasecmp(var, "inbound-proxy-media") && switch_true(val)) { sofia_set_flag(profile, TFLAG_PROXY_MEDIA); } else if (!strcasecmp(var, "force-subscription-expires")) {

1 0