- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10059 - freeswitch/branches/jkr888/CDRLogger/trunk
by Freeswitch SVN 18 Oct '08

18 Oct '08

Author: jkr888 Date: Fri Oct 17 20:22:04 2008 New Revision: 10059 Added: freeswitch/branches/jkr888/CDRLogger/trunk/ Log:

1 0

[commit] r10058 - freeswitch/branches/jkr888/CDRLogger
by Freeswitch SVN 18 Oct '08

18 Oct '08

Author: jkr888 Date: Fri Oct 17 20:21:38 2008 New Revision: 10058 Added: freeswitch/branches/jkr888/CDRLogger/ Log:

1 0

[commit] r10057 - freeswitch/branches/jkr888/trunk
by Freeswitch SVN 18 Oct '08

18 Oct '08

Author: jkr888 Date: Fri Oct 17 20:20:34 2008 New Revision: 10057 Removed: freeswitch/branches/jkr888/trunk/ Log:

1 0

[commit] r10056 - freeswitch/trunk/src
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: anthm Date: Fri Oct 17 19:00:23 2008 New Revision: 10056 Modified: freeswitch/trunk/src/switch_core_io.c Log: fix FSCORE-206 Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Oct 17 19:00:23 2008 @@ -496,7 +496,7 @@ even_more_done: - if (!*frame) { + if (!*frame || !(*frame)->codec || !(*frame)->codec->implementation) { *frame = &runtime.dummy_cng_frame; } @@ -559,6 +559,7 @@ } switch_assert(frame->codec != NULL); + switch_assert(frame->codec->implementation != NULL); if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { need_codec = TRUE;

1 0

[commit] r10055 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: anthm Date: Fri Oct 17 15:25:00 2008 New Revision: 10055 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix ip change detction code for proxy mode 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 Fri Oct 17 15:25:00 2008 @@ -870,12 +870,18 @@ } } - if (tech_pvt->remote_sdp_audio_ip && !strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", - tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); - return SWITCH_STATUS_SUCCESS; - } + if (rip && rp && switch_rtp_ready(tech_pvt->rtp_session)) { + char *remote_host = switch_rtp_get_remote_host(tech_pvt->rtp_session); + switch_port_t remote_port = switch_rtp_get_remote_port(tech_pvt->rtp_session), rpi = (switch_port_t) atoi(rp); + if (remote_host && remote_port && !strcmp(remote_host, rip) && remote_port == rpi) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", + tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); + return SWITCH_STATUS_SUCCESS; + } + + } + if (switch_rtp_ready(tech_pvt->rtp_session)) { if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r10054 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: anthm Date: Fri Oct 17 14:55:17 2008 New Revision: 10054 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: make event socket wait for hangup on outbound mode and send disconnect message Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Oct 17 14:55:17 2008 @@ -47,7 +47,7 @@ LFLAG_FULL = (1 << 4), LFLAG_MYEVENTS = (1 << 5), LFLAG_SESSION = (1 << 6), - LFLAG_ASYNC = (1 << 7), + LFLAG_ASYNC = (1 << 7) } event_flag_t; typedef enum {

1 0

[commit] r10053 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: anthm Date: Fri Oct 17 14:44:26 2008 New Revision: 10053 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: make event socket wait for hangup on outbound mode and send disconnect message Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Oct 17 14:44:26 2008 @@ -47,7 +47,7 @@ LFLAG_FULL = (1 << 4), LFLAG_MYEVENTS = (1 << 5), LFLAG_SESSION = (1 << 6), - LFLAG_ASYNC = (1 << 7) + LFLAG_ASYNC = (1 << 7), } event_flag_t; typedef enum { @@ -71,6 +71,7 @@ switch_core_session_t *session; int lost_events; int lost_logs; + int hup; switch_sockaddr_t *sa; char remote_ip[50]; switch_port_t remote_port; @@ -171,7 +172,7 @@ send = 1; } } - + if (send && switch_test_flag(l, LFLAG_MYEVENTS)) { char *uuid = switch_event_get_header(event, "unique-id"); if (!uuid || strcmp(uuid, switch_core_session_get_uuid(l->session))) { @@ -428,9 +429,15 @@ return SWITCH_STATUS_FALSE; } - if (channel && !switch_channel_ready(channel)) { + if (switch_test_flag(listener, LFLAG_MYEVENTS) && !listener->hup && channel && !switch_channel_ready(channel)) { + listener->hup = 1; + } + + if (listener->hup == 2 || + ((!switch_test_flag(listener, LFLAG_MYEVENTS) && !switch_test_flag(listener, LFLAG_EVENTS)) && + channel && !switch_channel_ready(channel)) ) { status = SWITCH_STATUS_FALSE; - break; + break; } if (mlen) { @@ -595,6 +602,14 @@ switch_safe_free(listener->ebuf); endloop: + + if (listener->hup == 1 && pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { + char *uuid = switch_event_get_header(pevent, "unique-id"); + if (!strcmp(uuid, switch_core_session_get_uuid(listener->session))) { + listener->hup = 2; + } + } + switch_event_destroy(&pevent); } } @@ -604,7 +619,17 @@ } } - + if (listener->sock) { + char buf[512] = ""; + const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; + int mlen = strlen(message); + + switch_snprintf(buf, sizeof(buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", mlen); + len = strlen(buf); + switch_socket_send(listener->sock, buf, &len); + len = mlen; + switch_socket_send(listener->sock, message, &len); + } return status; @@ -1137,7 +1162,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", listener->remote_ip, prefs.acl[x]); - switch_snprintf(buf, sizeof(buf), "Content-Type: rude/rejection\nContent-Length %d\n\n", mlen); + switch_snprintf(buf, sizeof(buf), "Content-Type: text/rude-rejection\nContent-Length %d\n\n", mlen); len = strlen(buf); switch_socket_send(listener->sock, buf, &len); len = mlen;

1 0

[commit] r10052 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: brian Date: Fri Oct 17 04:38:30 2008 New Revision: 10052 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: tweak so this doesn't have to eval every call Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 17 04:38:30 2008 @@ -83,7 +83,7 @@ <condition field="${numbering_plan}" expression="^$" break="never"> <action application="set_user" data="default@${domain_name}"/> </condition> - <condition field="${call_debug}" expression="^true$" break="never"> + <condition field="$${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Oct 17 04:38:30 2008 @@ -31,7 +31,7 @@ </extension> <extension name="call_debug" continue="true"> - <condition field="${call_debug}" expression="^true$" break="never"> + <condition field="$${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> </extension>

1 0

[commit] r10051 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: brian Date: Fri Oct 17 04:26:55 2008 New Revision: 10051 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: this bug found by Travis Cross and reported via mailing list. Thank you Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 17 04:26:55 2008 @@ -15,7 +15,7 @@ <context name="default"> <extension name="unloop"> - <condition field="${unroll_loops}" expression="^true$"/> + <condition field="$${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Oct 17 04:26:55 2008 @@ -14,7 +14,7 @@ <context name="public"> <extension name="unloop"> - <condition field="${unroll_loops}" expression="^true$"/> + <condition field="$${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition>

1 0

[commit] r10048 - in freeswitch/trunk/src: . include
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: anthm Date: Thu Oct 16 20:10:49 2008 New Revision: 10048 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_session.c Log: doh Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Oct 16 20:10:49 2008 @@ -522,7 +522,7 @@ */ SWITCH_DECLARE(uint32_t) switch_core_session_count(void); -SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session); +SWITCH_DECLARE(switch_size_t) switch_core_session_get_id(switch_core_session_t *session); /*! \brief Provide the current session_id Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Oct 16 20:10:49 2008 @@ -964,7 +964,7 @@ return session_manager.session_count; } -SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session) +SWITCH_DECLARE(switch_size_t) switch_core_session_get_id(switch_core_session_t *session) { return session->id; }

1 0