- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10536 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Nov '08

25 Nov '08

Author: anthm Date: Tue Nov 25 14:35:20 2008 New Revision: 10536 Log: update 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 Tue Nov 25 14:35:20 2008 @@ -1673,6 +1673,10 @@ } switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); + if (bytes) { + rtp_flush_read_buffer(rtp_session); + } + return bytes; }

1 0

[commit] r10535 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Nov '08

25 Nov '08

Author: anthm Date: Tue Nov 25 14:05:00 2008 New Revision: 10535 Log: fix race Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Nov 25 14:05:00 2008 @@ -166,7 +166,7 @@ } } - if (!session->read_codec) { + if (!SWITCH_READ_ACCEPTABLE(status) || !session->read_codec || !session->read_codec->mutex) { *frame = NULL; return SWITCH_STATUS_FALSE; }

1 0

[commit] r10534 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Nov '08

25 Nov '08

Author: mikej Date: Tue Nov 25 13:21:44 2008 New Revision: 10534 Log: use switch_set_flag in a few places we were doing it manually before Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_menu.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Nov 25 13:21:44 2008 @@ -973,7 +973,7 @@ runtime.dummy_cng_frame.data = runtime.dummy_data; runtime.dummy_cng_frame.datalen = sizeof(runtime.dummy_data); runtime.dummy_cng_frame.buflen = sizeof(runtime.dummy_data); - runtime.dummy_cng_frame.flags = SFF_CNG; + switch_set_flag(&runtime.dummy_cng_frame, SFF_CNG); switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); runtime.hard_log_level = SWITCH_LOG_DEBUG; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Nov 25 13:21:44 2008 @@ -50,7 +50,7 @@ cng_frame.data = data; cng_frame.datalen = 2; cng_frame.buflen = 2; - cng_frame.flags = SFF_CNG; + switch_set_flag(&cng_frame, SFF_CNG); for (;;) { now = switch_timestamp_now(); Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Tue Nov 25 13:21:44 2008 @@ -178,7 +178,7 @@ menu->actions = NULL; if (newpool) { - menu->flags |= SWITCH_IVR_MENU_FLAG_FREEPOOL; + switch_set_flag(menu, SWITCH_IVR_MENU_FLAG_FREEPOOL); } if (menu->timeout <= 0) { @@ -188,7 +188,7 @@ if (main) { switch_ivr_menu_stack_add(&main, menu); } else { - menu->flags |= SWITCH_IVR_MENU_FLAG_STACK; + switch_set_flag(menu, SWITCH_IVR_MENU_FLAG_STACK); } *new_menu = menu; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Nov 25 13:21:44 2008 @@ -1769,9 +1769,9 @@ frame->packet = &rtp_session->recv_msg; frame->packetlen = bytes; frame->source = __FILE__; - frame->flags |= SFF_RAW_RTP; + switch_set_flag(frame, SFF_RAW_RTP); if (frame->payload == rtp_session->te) { - frame->flags |= SFF_RFC2833; + switch_set_flag(frame, SFF_RFC2833); } frame->timestamp = ntohl(rtp_session->recv_msg.header.ts); frame->seq = (uint16_t) ntohs((u_short) rtp_session->recv_msg.header.seq);

1 0

[commit] r10533 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Nov '08

25 Nov '08

Author: anthm Date: Tue Nov 25 12:53:35 2008 New Revision: 10533 Log: update Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Nov 25 12:53:35 2008 @@ -351,6 +351,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, switch_io_flag_t io_flags); +SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session); + /*! \brief Enable VAD on an RTP Session \param rtp_session the RTP session Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Nov 25 12:53:35 2008 @@ -568,6 +568,7 @@ SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ, SWITCH_MESSAGE_INDICATE_DISPLAY, SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY, + SWITCH_MESSAGE_INDICATE_AUDIO_SYNC, SWITCH_MESSAGE_INVALID } switch_core_session_message_types_t; @@ -742,7 +743,7 @@ CF_PROXY_MODE = (1 << 13) - Channel has no media CF_SUSPEND = (1 << 14) - Suspend i/o CF_EVENT_PARSE = (1 << 15) - Suspend control events -CF_REPEAT_STATE = (1 << 16) - Tell the state machine to repeat a state +CF_USE_ME = (1 << 16) - use me CF_GEN_RINGBACK = (1 << 17) - Channel is generating it's own ringback CF_RING_READY = (1 << 18) - Channel is ready to send ringback CF_BREAK = (1 << 19) - Channel should stop what it's doing @@ -773,7 +774,7 @@ CF_PROXY_MODE = (1 << 13), CF_SUSPEND = (1 << 14), CF_EVENT_PARSE = (1 << 15), - CF_REPEAT_STATE = (1 << 16), + CF_USE_ME = (1 << 16), CF_GEN_RINGBACK = (1 << 17), CF_RING_READY = (1 << 18), CF_BREAK = (1 << 19), Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Nov 25 12:53:35 2008 @@ -1127,8 +1127,8 @@ } else if (!strcasecmp(arg, "both")) { if (uuid && (other_session = switch_core_session_locate(uuid))) { switch_channel_t *other_channel = switch_core_session_get_channel(other_session); - switch_channel_set_flag(other_channel, CF_TRANSFER); - switch_channel_set_flag(channel, CF_TRANSFER); + switch_channel_set_flag(other_channel, CF_REDIRECT); + switch_channel_set_flag(channel, CF_REDIRECT); switch_ivr_session_transfer(other_session, dest, dp, context); switch_core_session_rwunlock(other_session); } 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 Nov 25 12:53:35 2008 @@ -936,21 +936,11 @@ goto end; case SWITCH_MESSAGE_INDICATE_BRIDGE: - /* - if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_TIMER)) { - switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "De-activate timed RTP!\n"); - } - */ - goto end; - case SWITCH_MESSAGE_INDICATE_UNBRIDGE: - /* - if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_TIMER)) { - switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-activate timed RTP!\n"); - } - */ + case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: + if (switch_rtp_ready(tech_pvt->rtp_session)) { + rtp_flush_read_buffer(tech_pvt->rtp_session); + } goto end; case SWITCH_MESSAGE_INDICATE_ANSWER: Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Nov 25 12:53:35 2008 @@ -360,19 +360,15 @@ switch_mutex_lock(session->mutex); while ((state = switch_channel_get_state(session->channel)) != CS_DONE) { - uint8_t exception = 0; midstate = state; - if (switch_channel_test_flag(session->channel, CF_REPEAT_STATE)) { - switch_channel_clear_flag(session->channel, CF_REPEAT_STATE); - exception = 1; - } - if (state != switch_channel_get_running_state(session->channel) || state == CS_HANGUP || exception) { + if (state != switch_channel_get_running_state(session->channel) || state == CS_HANGUP) { int index = 0; int proceed = 1; int do_extra_handlers = 1; switch_channel_set_running_state(session->channel, state); switch_channel_clear_flag(session->channel, CF_TRANSFER); + switch_channel_clear_flag(session->channel, CF_REDIRECT); switch (state) { case CS_NEW: /* Just created, Waiting for first instructions */ Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Nov 25 12:53:35 2008 @@ -209,11 +209,11 @@ goto end_of_bridge_loop; } - if (switch_channel_test_flag(chan_a, CF_TRANSFER) || switch_channel_test_flag(chan_a, CF_REDIRECT)) { + if (switch_channel_test_flag(chan_a, CF_TRANSFER)) { data->clean_exit = 1; } - if (data->clean_exit || switch_channel_test_flag(chan_b, CF_TRANSFER) || switch_channel_test_flag(chan_b, CF_REDIRECT)) { + if (data->clean_exit || switch_channel_test_flag(chan_b, CF_TRANSFER)) { switch_channel_clear_flag(chan_a, CF_HOLD); switch_channel_clear_flag(chan_a, CF_SUSPEND); goto end_of_bridge_loop; @@ -461,15 +461,16 @@ switch_channel_clear_state_handler(channel, &audio_bridge_peer_state_handlers); state = switch_channel_get_state(channel); - + if (state < CS_HANGUP && switch_true(switch_channel_get_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { switch_ivr_park_session(session); } else { - if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && bd && !bd->clean_exit && state != CS_PARK && - state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { + if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && bd && !bd->clean_exit + && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - } + } } + if (switch_true(switch_channel_get_variable(channel, SWITCH_COPY_XML_CDR_VARIABLE))) { switch_xml_t cdr; @@ -528,8 +529,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM RESET\n", switch_channel_get_name(channel)); - switch_channel_clear_flag(channel, CF_REDIRECT); - switch_channel_clear_flag(channel, CF_ORIGINATING); if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { @@ -621,9 +620,11 @@ } switch_ivr_multi_threaded_bridge(session, other_session, NULL, NULL, NULL); - + state = switch_channel_get_state(channel); - if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { + if (!switch_channel_test_flag(channel, CF_TRANSFER) && + !switch_channel_test_flag(channel, CF_REDIRECT) && state < CS_HANGUP + && state != CS_ROUTING && state != CS_PARK) { switch_channel_set_state(channel, CS_EXECUTE); } switch_core_session_rwunlock(other_session); @@ -956,10 +957,12 @@ } if (switch_channel_test_flag(caller_channel, CF_REDIRECT)) { - switch_channel_set_state(caller_channel, CS_RESET); + state = switch_channel_get_state(caller_channel); + if (!(state == CS_RESET || state == CS_PARK || state == CS_ROUTING)) { + switch_channel_set_state(caller_channel, CS_RESET); + } } - - + return status; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Nov 25 12:53:35 2008 @@ -1263,6 +1263,40 @@ } } +SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session) +{ + int was_blocking = 0; + switch_size_t bytes; + switch_status_t status; + + if (!switch_rtp_ready(rtp_session)) { + return; + } + + READ_INC(rtp_session); + + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { + was_blocking = 1; + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE); + } + + do { + bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + } while(bytes); + + if (was_blocking) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, FALSE); + } + + READ_DEC(rtp_session); + + + +} + #define return_cng_frame() do_cng = 1; goto timer_check static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_type, switch_frame_flag_t *flags, switch_io_flag_t io_flags) @@ -1315,6 +1349,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); do_2833(rtp_session); + rtp_flush_read_buffer(rtp_session); bytes = 0; return_cng_frame(); } @@ -1323,6 +1358,10 @@ continue; } + if (bytes && rtp_session->recv_msg.header.m) { + rtp_flush_read_buffer(rtp_session); + } + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { if (++rtp_session->autoadj_tally >= 10) { const char *tx_host;

1 0

[commit] r10532 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Nov '08

25 Nov '08

Author: mikej Date: Tue Nov 25 12:08:27 2008 New Revision: 10532 Log: avoid seg. Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Nov 25 12:08:27 2008 @@ -346,7 +346,7 @@ profile = switch_channel_get_caller_profile(channel); - if (read_codec) { + if (read_codec && read_codec->implementation) { char tmp[80]; switch_codec2str(read_codec, tmp, sizeof(tmp)); switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_CODEC_VARIABLE, tmp);

1 0

[commit] r10531 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 24 Nov '08

24 Nov '08

Author: anthm Date: Mon Nov 24 18:17:03 2008 New Revision: 10531 Log: fix LBDING-7 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 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 Mon Nov 24 18:17:03 2008 @@ -536,7 +536,7 @@ *p = '\0'; } } - ldl_handle_send_msg(profile->handle, from, to, NULL, body); + ldl_handle_send_msg(profile->handle, from, to, NULL, switch_str_nil(body)); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile %s\n", f_host ? f_host : "NULL"); return SWITCH_STATUS_FALSE; @@ -1713,7 +1713,7 @@ if ((ptr = strchr(them, '/'))) { *ptr = '\0'; } - ldl_handle_send_msg(mdl_profile->handle, tech_pvt->us, them, "", cid_msg); + ldl_handle_send_msg(mdl_profile->handle, tech_pvt->us, them, "", switch_str_nil(cid_msg)); } switch_safe_free(them); } @@ -2464,7 +2464,7 @@ if (profile->auto_reply) { ldl_handle_send_msg(handle, (profile->user_flags & LDL_FLAG_COMPONENT) ? to : ldl_handle_get_login(profile->handle), from, "", - profile->auto_reply); + switch_str_nil(profile->auto_reply)); } #endif @@ -2487,7 +2487,7 @@ } if ((ci = switch_loadable_module_get_chat_interface(proto))) { - ci->chat_send(MDL_CHAT_PROTO, from, to, subject, msg, hint); + ci->chat_send(MDL_CHAT_PROTO, from, to, subject, switch_str_nil(msg), hint); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto); }

1 0

[commit] r10530 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 24 Nov '08

24 Nov '08

Author: anthm Date: Mon Nov 24 18:12:36 2008 New Revision: 10530 Log: fix LBDING-7 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Nov 24 18:12:36 2008 @@ -1792,39 +1792,44 @@ void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, const char *subject, const char *body) { iks *msg; - char *t, *e; + const char *t; + char *e; char *bdup = NULL; int on = 0; int len = 0; - char *my_body = strdup(body); + assert(handle != NULL); - assert(body != NULL); - - if (strchr(my_body, '<')) { - len = (int) strlen(my_body); - if (!(bdup = malloc(len))) { - return; - } - memset(bdup, 0, len); - - e = bdup; - for(t = my_body; *t; t++) { - if (*t == '<') { - on = 1; - } else if (*t == '>') { - t++; - on = 0; + if (body) { + if (strchr(body, '<')) { + len = (int) strlen(body); + if (!(bdup = malloc(len))) { + abort(); } + + memset(bdup, 0, len); + + e = bdup; + for(t = body; t && *t; t++) { + if (*t == '<') { + on = 1; + } else if (*t == '>') { + t++; + on = 0; + } - if (!on) { - *e++ = *t; + if (!on) { + *e++ = *t; + } } + body = bdup; } - my_body = bdup; + } else { + body = ""; } + + msg = iks_make_msg(IKS_TYPE_NONE, to, body); - msg = iks_make_msg(IKS_TYPE_NONE, to, my_body); iks_insert_attrib(msg, "type", "chat"); if (!from) { @@ -1840,9 +1845,7 @@ if (bdup) { free(bdup); } - - free(my_body); - + apr_queue_push(handle->queue, msg); msg = NULL; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon Nov 24 18:12:36 2008 @@ -1186,7 +1186,11 @@ or did he just suggest it to make our lives miserable? */ use_from_str = from_str; - from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); + if ((val = switch_channel_get_variable(tech_pvt->channel, "suppress_from_cidname")) && switch_true(val)) { + from_str = switch_core_session_sprintf(session, "<%s>", use_from_str); + } else { + from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); + } if (!(call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"))) { if (tech_pvt->profile->pflags & PFLAG_UUID_AS_CALLID) {

1 0

[commit] r10529 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 24 Nov '08

24 Nov '08

Author: anthm Date: Mon Nov 24 12:21:56 2008 New Revision: 10529 Log: reduce severity of error 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 Mon Nov 24 12:21:56 2008 @@ -190,7 +190,7 @@ } if (!sofia_private || !sofia_private->gateway) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Gateway information missing\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Gateway information missing Subscription Event: %s\n", sip->sip_event->o_type); goto error; }

1 0

[commit] r10528 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 24 Nov '08

24 Nov '08

Author: anthm Date: Mon Nov 24 11:56:21 2008 New Revision: 10528 Log: improve gateway resilience Modified: 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 freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.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 Mon Nov 24 11:56:21 2008 @@ -1368,6 +1368,7 @@ "REGED", "UNREGISTER", "FAILED", + "FAIL_WAIT", "EXPIRED", "NOREG", NULL 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 Mon Nov 24 11:56:21 2008 @@ -257,6 +257,7 @@ REG_STATE_REGED, REG_STATE_UNREGISTER, REG_STATE_FAILED, + REG_STATE_FAIL_WAIT, REG_STATE_EXPIRED, REG_STATE_NOREG, REG_STATE_LAST @@ -333,6 +334,7 @@ int deleted; switch_event_t *vars; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + int failures; struct sofia_gateway *next; sofia_gateway_subscription_t *subscriptions; }; 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 Mon Nov 24 11:56:21 2008 @@ -1001,7 +1001,7 @@ for (param = switch_xml_child(gateway_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - + if (!strcmp(var, "register")) { register_str = val; } else if (!strcmp(var, "scheme")) { @@ -1028,6 +1028,8 @@ expire_seconds = val; } else if (!strcmp(var, "retry-seconds")) { retry_seconds = val; + } else if (!strcmp(var, "retry_seconds")) { // support typo for back compat + retry_seconds = val; } else if (!strcmp(var, "from-user")) { from_user = val; } else if (!strcmp(var, "from-domain")) { @@ -1089,6 +1091,7 @@ if (!switch_true(register_str)) { gateway->state = REG_STATE_NOREG; + gateway->status = SOFIA_GATEWAY_UP; } if (switch_strlen_zero(from_domain)) { @@ -1108,7 +1111,7 @@ } gateway->retry_seconds = atoi(retry_seconds); - if (gateway->retry_seconds < 10) { + if (gateway->retry_seconds < 5) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid retry-seconds of %d on gateway %s, using the value of 30 instead.\n", gateway->retry_seconds, name); gateway->retry_seconds = 30; @@ -2217,7 +2220,6 @@ if (status == 200 || status == 404 || status == 501) { if (gateway->state == REG_STATE_FAILED) { gateway->state = REG_STATE_UNREGED; - gateway->retry = 0; } gateway->status = SOFIA_GATEWAY_UP; } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Nov 24 11:56:21 2008 @@ -228,13 +228,18 @@ switch (ostate) { case REG_STATE_NOREG: - gateway_ptr->status = SOFIA_GATEWAY_UP; + if (!gateway_ptr->ping && !gateway_ptr->pinging) { + gateway_ptr->status = SOFIA_GATEWAY_UP; + } break; case REG_STATE_REGISTER: if (profile->debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registered %s\n", gateway_ptr->name); } - if (gateway_ptr->expires > 60) { + + gateway_ptr->failures = 0; + + if (gateway_ptr->freq > 60) { gateway_ptr->expires = now + (gateway_ptr->freq - 15); } else { gateway_ptr->expires = now + (gateway_ptr->freq - 2); @@ -251,7 +256,7 @@ case REG_STATE_UNREGED: gateway_ptr->status = SOFIA_GATEWAY_DOWN; sofia_reg_kill_reg(gateway_ptr, 0); - + if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), NUTAG_URL(gateway_ptr->register_proxy), @@ -289,22 +294,31 @@ NUTAG_REGISTRAR(gateway_ptr->register_proxy), NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); } - + gateway_ptr->retry = now + gateway_ptr->retry_seconds; gateway_ptr->state = REG_STATE_TRYING; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error registering %s\n", gateway_ptr->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error registering %s failure #%d\n", gateway_ptr->name, ++gateway_ptr->failures); gateway_ptr->state = REG_STATE_FAILED; } break; case REG_STATE_FAILED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Failed Registration, setting retry to %d seconds.\n", + gateway_ptr->name, gateway_ptr->retry_seconds * (gateway_ptr->failures + 1)); + gateway_ptr->retry = now + (gateway_ptr->retry_seconds * (gateway_ptr->failures + 1)); sofia_reg_kill_reg(gateway_ptr, 0); gateway_ptr->status = SOFIA_GATEWAY_DOWN; - case REG_STATE_TRYING: - if (gateway_ptr->retry && now >= gateway_ptr->retry) { + gateway_ptr->state = REG_STATE_FAIL_WAIT; + break; + case REG_STATE_FAIL_WAIT: + if (!gateway_ptr->retry || now >= gateway_ptr->retry) { gateway_ptr->state = REG_STATE_UNREGED; - gateway_ptr->retry = 0; + } + break; + case REG_STATE_TRYING: + if (!gateway_ptr->retry || now >= gateway_ptr->retry) { + gateway_ptr->state = REG_STATE_FAILED; } break; default: @@ -1196,7 +1210,8 @@ break; default: sofia_private->gateway->state = REG_STATE_FAILED; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Registration Failed with status %d\n", status); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Registration Failed with status %d. failure #%d\n", + sofia_private->gateway->name, status, ++sofia_private->gateway->failures); break; } if (ostate != sofia_private->gateway->state) {

1 0

[commit] r10527 - in freeswitch/trunk/conf: directory/default sip_profiles/external sip_profiles/internal
by FreeSWITCH SVN 24 Nov '08

24 Nov '08

Author: brian Date: Mon Nov 24 11:30:46 2008 New Revision: 10527 Log: doh.. its retry-seconds since its a param Modified: freeswitch/trunk/conf/directory/default/brian.xml freeswitch/trunk/conf/sip_profiles/external/example.xml freeswitch/trunk/conf/sip_profiles/internal/example.xml Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Nov 24 11:30:46 2008 @@ -30,7 +30,7 @@    -  +     Modified: freeswitch/trunk/conf/sip_profiles/external/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external/example.xml Mon Nov 24 11:30:46 2008 @@ -23,7 +23,7 @@    -  +     Modified: freeswitch/trunk/conf/sip_profiles/internal/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal/example.xml Mon Nov 24 11:30:46 2008 @@ -23,7 +23,7 @@    -  +

1 0