- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4239 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 15:31:23 2007 New Revision: 4239 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Log: use switch_log_printf instead of switch_console printf so it will hit other logger services. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Tue Feb 13 15:31:23 2007 @@ -111,12 +111,12 @@ switch_xml_t xml_root; if ((xml_root = switch_xml_open_root(1, &err))) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Reloading the XML file...\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Reloading the XML file...\n"); switch_xml_free(xml_root); } if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) - switch_console_printf(SWITCH_CHANNEL_LOG,"open of %s failed\n", configfile); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open of %s failed\n", configfile); else { BaseRegistry& registry(BaseRegistry::get()); @@ -144,7 +144,7 @@ switch_xml_free(xml); switch_queue_unblockpop(cdrqueue); - switch_console_printf(SWITCH_CHANNEL_LOG,"mod_cdr configuration reloaded."); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_cdr configuration reloaded."); } void CDRContainer::queue_pause(switch_stream_handle_t *stream)

1 0

[commit] r4238 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 14:46:10 2007 New Revision: 4238 Modified: freeswitch/trunk/src/switch_rtp.c Log: ssrc is a 32 bit value, not 16. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Feb 13 14:46:10 2007 @@ -138,7 +138,7 @@ uint32_t ts; uint32_t last_write_ts; uint16_t last_write_seq; - uint16_t last_write_ssrc; + uint32_t last_write_ssrc; uint32_t flags; switch_memory_pool_t *pool; switch_sockaddr_t *from_addr; @@ -1058,7 +1058,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags) { switch_size_t bytes; - uint8_t fwd = (!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); + uint8_t fwd = (uint8_t)(!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); rtp_msg_t *send_msg; uint8_t send = 1;

1 0

[commit] r4237 - freeswitch/trunk/libs/win32/js
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 14:45:32 2007 New Revision: 4237 Modified: freeswitch/trunk/libs/win32/js/js.vcproj Log: turn off warnings for now until they can get resolved in tree. Modified: freeswitch/trunk/libs/win32/js/js.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/js/js.vcproj (original) +++ freeswitch/trunk/libs/win32/js/js.vcproj Tue Feb 13 14:45:32 2007 @@ -58,7 +58,7 @@ AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> <Tool @@ -156,7 +156,7 @@ AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3" />

1 0

[commit] r4236 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Tue Feb 13 12:39:44 2007 New Revision: 4236 Modified: freeswitch/trunk/src/switch_ivr.c Log: my preacious... Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 13 12:39:44 2007 @@ -2345,7 +2345,8 @@ uint32_t *hups, char *file, char *key, - uint8_t early_ok) + uint8_t early_ok, + uint8_t *ring_ready) { uint32_t i; @@ -2356,6 +2357,9 @@ if (!peer_channels[i]) { continue; } + if (!*ring_ready && switch_channel_test_flag(peer_channels[i], CF_RING_READY)) { + *ring_ready = 1; + } if (switch_channel_get_state(peer_channels[i]) >= CS_HANGUP) { (*hups)++; } else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || @@ -2459,7 +2463,7 @@ switch_core_session_message_t *message = NULL; switch_event_t *var_event = NULL; uint8_t fail_on_single_reject = 0; - + uint8_t ring_ready = 0; write_frame.data = fdata; *bleg = NULL; @@ -2853,7 +2857,7 @@ } while ((!caller_channel || switch_channel_ready(caller_channel)) && - check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok)) { + check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok, &ring_ready)) { // When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec)) || (fail_on_single_reject && hups)) { @@ -2881,9 +2885,8 @@ if (!SWITCH_READ_ACCEPTABLE(status)) { break; } - - if (switch_channel_test_flag(caller_channel, CF_RING_READY) && - read_frame && !pass && !switch_test_flag(read_frame, SFF_CNG) && read_frame->datalen > 1) { + + if (ring_ready && read_frame && !pass && !switch_test_flag(read_frame, SFF_CNG) && read_frame->datalen > 1) { if (ringback.fh) { uint8_t abuf[1024]; switch_size_t mlen, olen;

1 0

[commit] r4235 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Tue Feb 13 12:27:57 2007 New Revision: 4235 Modified: freeswitch/trunk/src/switch_rtp.c Log: doh Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Feb 13 12:27:57 2007 @@ -1062,7 +1062,6 @@ rtp_msg_t *send_msg; uint8_t send = 1; - assert(fwd); if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data;

1 0

[commit] r4234 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mmurdock Date: Tue Feb 13 12:15:42 2007 New Revision: 4234 Modified: freeswitch/trunk/src/switch_ivr.c Log: Fix ivr_menu, no entry is considered invalid, keying digits during audio is not an error Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 13 12:15:42 2007 @@ -4158,7 +4158,9 @@ uint32_t len; char *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - switch_input_args_t args= {0}; + switch_input_args_t args= {0}; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play_or_say sound=[%s]\n",sound); if (session != NULL && menu != NULL && !switch_strlen_zero(sound)) { memset(menu->buf, 0, menu->inlen); @@ -4171,8 +4173,8 @@ len = menu->inlen; ptr = menu->ptr; } - args.buf = ptr; - args.buflen = len; + args.buf = ptr; + args.buflen = len; if (*sound == '/' || *sound == '\\') { status = switch_ivr_play_file(session, NULL, sound, &args); @@ -4180,6 +4182,9 @@ if (menu->tts_engine && menu->tts_voice) { status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound, &args); } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine to play sound\n"); + } } if (need) { @@ -4191,6 +4196,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "digits '%s'\n",menu->buf); } } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play_or_say returning [%d]\n",status); return status; } @@ -4262,6 +4268,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR action on menu '%s' matched '%s' param '%s'\n", menu->name, menu->buf,aptr); } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_ivr_menu_execute todo=[%d]\n", todo); switch(todo) { case SWITCH_IVR_ACTION_DIE: @@ -4292,7 +4299,7 @@ *app_arg = '\0'; app_arg++; } - + if (app_name && app_arg) { if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { @@ -4331,23 +4338,30 @@ } } } - if (*menu->buf && !match) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); - + if (!match) { + if (*menu->buf) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name); + } if (menu->invalid_sound) { play_or_say(session, menu, menu->invalid_sound, 0); } errs++; - if (status == SWITCH_STATUS_SUCCESS) { status = switch_ivr_sleep(session, 1000); } + /* breaks are ok too */ + if (SWITCH_STATUS_IS_BREAK(status)) { + status = SWITCH_STATUS_SUCCESS; + } } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exit-sound '%s'\n",menu->exit_sound); if (!switch_strlen_zero(menu->exit_sound)) { - status = switch_ivr_play_file(session, NULL, menu->exit_sound, NULL); + play_or_say(session, menu, menu->exit_sound, 0); } switch_safe_free(menu->buf);

1 0

[commit] r4233 - freeswitch/trunk/src/include
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Tue Feb 13 12:14:39 2007 New Revision: 4233 Modified: freeswitch/trunk/src/include/switch_rtp.h Log: 2833 bs Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Feb 13 12:14:39 2007 @@ -340,10 +340,19 @@ \param payload the IANA payload number \param ts then number of bytes to increment the timestamp by \param mseq the specific sequence number to use + \param ssrc the ssrc \param flags frame flags \return the number of bytes written */ -SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, void *data, uint16_t datalen, uint8_t m, switch_payload_t payload, uint32_t ts, uint16_t mseq, switch_frame_flag_t *flags); +SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, + void *data, + uint16_t datalen, + uint8_t m, + switch_payload_t payload, + uint32_t ts, + uint16_t mseq, + uint32_t ssrc, + switch_frame_flag_t *flags); /*! \brief Retrieve the SSRC from a given RTP session

1 0

[commit] r4232 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Tue Feb 13 12:13:57 2007 New Revision: 4232 Modified: freeswitch/trunk/src/switch_rtp.c Log: 2833 bs Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Feb 13 12:13:57 2007 @@ -107,6 +107,7 @@ unsigned int out_digit_sofar; unsigned int out_digit_dur; uint16_t out_digit_seq; + uint32_t out_digit_ssrc; int32_t timestamp_dtmf; char last_digit; unsigned int dc; @@ -137,6 +138,7 @@ uint32_t ts; uint32_t last_write_ts; uint16_t last_write_seq; + uint16_t last_write_ssrc; uint32_t flags; switch_memory_pool_t *pool; switch_sockaddr_t *from_addr; @@ -656,8 +658,14 @@ for (x = 0; x < loops; x++) { switch_rtp_write_manual(rtp_session, - rtp_session->dtmf_data.out_digit_packet, 4, 0, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->dtmf_data.out_digit_seq, &flags); + rtp_session->dtmf_data.out_digit_packet, + 4, + 0, + rtp_session->te, + rtp_session->dtmf_data.timestamp_dtmf, + rtp_session->dtmf_data.out_digit_seq, + rtp_session->dtmf_data.out_digit_ssrc, + &flags); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, @@ -689,6 +697,7 @@ rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq; + rtp_session->dtmf_data.out_digit_ssrc = rtp_session->last_write_ssrc; for (x = 0; x < 3; x++) { @@ -699,6 +708,7 @@ rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_seq, + rtp_session->dtmf_data.out_digit_ssrc, &flags); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, @@ -1048,10 +1058,11 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags) { switch_size_t bytes; - uint8_t fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP)) ? 1 : 0; + uint8_t fwd = (!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); rtp_msg_t *send_msg; uint8_t send = 1; + assert(fwd); if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data; @@ -1060,7 +1071,6 @@ send_msg->header.pt = payload; send_msg->header.m = m ? 1 : 0; memcpy(send_msg->body, data, datalen); - bytes = datalen + rtp_header_len; } @@ -1194,6 +1204,7 @@ } rtp_session->last_write_ts = ntohl(send_msg->header.ts); + rtp_session->last_write_ssrc = ntohl(send_msg->header.ssrc); rtp_session->last_write_seq = ntohs((u_short)send_msg->header.seq); if (send) { @@ -1305,17 +1316,32 @@ } -SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, void *data, uint16_t datalen, uint8_t m, switch_payload_t payload, uint32_t ts, uint16_t mseq, switch_frame_flag_t *flags) +SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, + void *data, + uint16_t datalen, + uint8_t m, + switch_payload_t payload, + uint32_t ts, + uint16_t mseq, + uint32_t ssrc, + switch_frame_flag_t *flags) { + rtp_msg_t send_msg = {{0}}; if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } - rtp_session->send_msg.header.seq = htons(mseq); - rtp_session->send_msg.header.ts = htonl(ts); + send_msg = rtp_session->send_msg; + + send_msg.header.seq = htons(mseq); + send_msg.header.ts = htonl(ts); + send_msg.header.ssrc = htonl(ssrc); + send_msg.header.pt = payload; + send_msg.header.m = m ? 1 : 0; + memcpy(send_msg.body, data, datalen); - return rtp_common_write(rtp_session, data, datalen, m, payload, flags); + return rtp_common_write(rtp_session, (void *) &send_msg, rtp_header_len + datalen, m, payload, NULL); } SWITCH_DECLARE(uint32_t) switch_rtp_get_ssrc(switch_rtp_t *rtp_session)

1 0

[commit] r4231 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 11:01:19 2007 New Revision: 4231 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Don't assert when we get 2 copies of the same invite, just ignore it and do nua_client_return(cr, 900, "INVITE already in progress", msg) Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Feb 13 11:01:19 2007 @@ -1 +1 @@ -Mon Feb 12 11:02:32 EST 2007 +Tue Feb 13 11:08:00 EST 2007 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Tue Feb 13 11:01:19 2007 @@ -1831,7 +1831,6 @@ } if (du->du_cr && cr != du->du_cr) { - assert(!nua_client_is_queued(du->du_cr)); if (nua_client_is_queued(du->du_cr)) return -1; if (nua_client_is_reporting(du->du_cr)) {

1 0

[commit] r4230 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe mod/endpoints/mod_woomera
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Tue Feb 13 10:47:15 2007 New Revision: 4230 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/switch_core.c Log: lord of the rings Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Feb 13 10:47:15 2007 @@ -515,6 +515,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_message(switch_core_session_t *session, switch_core_session_message_t *message); /*! + \brief Queue an indication message on a session + \param session the session to queue the message to + \param indication the indication message to queue + \return SWITCH_STATUS_SUCCESS if the message was queued +*/ +SWITCH_DECLARE(switch_status_t) switch_core_session_queue_indication(switch_core_session_t *session, switch_core_session_message_types_t indication); + +/*! \brief DE-Queue an message on a given session \param session the session to de-queue the message on \param message the de-queued message Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Feb 13 10:47:15 2007 @@ -950,6 +950,10 @@ started = switch_time_now(); + /* jingle has no ringing indication so we will just pretend that we got one */ + switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { tech_pvt->next_cand = switch_time_now() + DL_CAND_WAIT; tech_pvt->next_desc = switch_time_now(); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Feb 13 10:47:15 2007 @@ -1043,6 +1043,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Call accepted.\n"); break; case IAX_EVENT_RINGA: + if (channel) { + switch_core_session_queue_indication(tech_pvt->session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Ringing heard.\n"); break; case IAX_EVENT_PONG: 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 Tue Feb 13 10:47:15 2007 @@ -240,6 +240,9 @@ } } + switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); + while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { if (switch_time_now() - last >= waitsec) { char buf[512]; 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 Tue Feb 13 10:47:15 2007 @@ -2823,14 +2823,7 @@ } } else { - switch_core_session_message_t *msg; - if ((msg = malloc(sizeof(*msg)))) { - memset(msg, 0, sizeof(*msg)); - msg->message_id = SWITCH_MESSAGE_INDICATE_RINGING; - msg->from = __FILE__; - switch_core_session_queue_message(session, msg); - switch_set_flag(msg, SCSMF_DYNAMIC); - } + switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Tue Feb 13 10:47:15 2007 @@ -1160,15 +1160,8 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - if ((msg = malloc(sizeof(*msg)))) { - memset(msg, 0, sizeof(*msg)); - msg->message_id = SWITCH_MESSAGE_INDICATE_RINGING; - msg->from = __FILE__; - switch_core_session_queue_message(session, msg); - switch_set_flag(msg, SCSMF_DYNAMIC); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - } + switch_core_session_queue_indication(tech_pvt->session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); switch_core_session_rwunlock(session); } else { 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 Tue Feb 13 10:47:15 2007 @@ -1063,6 +1063,8 @@ } else if (!strcasecmp(wmsg.command, "PROCEED")) { /* This packet has lots of info so well keep it */ tech_pvt->call_info = wmsg; + switch_core_session_queue_indication(tech_pvt->session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); } else if (switch_test_flag(tech_pvt, TFLAG_PARSE_INCOMING) && !strcasecmp(wmsg.command, "INCOMING")) { char *exten; char cid_name[512]; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 13 10:47:15 2007 @@ -1732,6 +1732,22 @@ return status; } +SWITCH_DECLARE(switch_status_t) switch_core_session_queue_indication(switch_core_session_t *session, switch_core_session_message_types_t indication) +{ + switch_core_session_message_t *msg; + + if ((msg = malloc(sizeof(*msg)))) { + memset(msg, 0, sizeof(*msg)); + msg->message_id = indication; + msg->from = __FILE__; + switch_core_session_queue_message(session, msg); + switch_set_flag(msg, SCSMF_DYNAMIC); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_core_session_queue_message(switch_core_session_t *session, switch_core_session_message_t *message) { switch_status_t status = SWITCH_STATUS_FALSE;

1 0