- Freeswitch-svn - FreeSWITCH Mailing Lists

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

26 Nov '08

Author: mikej Date: Wed Nov 26 14:52:38 2008 New Revision: 10546 Log: more pres transport handling Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.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 Wed Nov 26 14:52:38 2008 @@ -2072,8 +2072,6 @@ } profile->tcp_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->url); - profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->url); - if (profile->bind_params) { char *bindurl = profile->bindurl; @@ -2130,6 +2128,7 @@ if (!profile->tls_cert_dir) { profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir); } + profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_url); } } if (profile) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Nov 26 14:52:38 2008 @@ -1540,7 +1540,7 @@ if (status < 200) { char *sticky = NULL; - char *contact_str = profile->url; + char *contactstr = profile->url; if (is_nat) { char params[128] = ""; @@ -1558,9 +1558,9 @@ } if (switch_stristr("port=tcp", contact->m_url->url_params)) { - contact_str = profile->tcp_contact; + contactstr = profile->tcp_contact; } else if (switch_stristr("port=tls", contact->m_url->url_params)) { - contact_str = profile->tls_contact; + contactstr = profile->tls_contact; }

1 0

[commit] r10545 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 26 Nov '08

26 Nov '08

Author: anthm Date: Wed Nov 26 14:48:36 2008 New Revision: 10545 Log: make break all stop broadcast too Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 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 Wed Nov 26 14:48:36 2008 @@ -1766,7 +1766,8 @@ { switch_core_session_t *psession = NULL; char *mycmd, *flag; - + switch_channel_t *channel = NULL; + if (session) { return SWITCH_STATUS_FALSE; } @@ -1792,7 +1793,12 @@ switch_core_session_flush_private_events(psession); } - switch_channel_set_flag(switch_core_session_get_channel(psession), CF_BREAK); + channel = switch_core_session_get_channel(psession); + if (switch_channel_test_flag(channel, CF_BROADCAST)) { + switch_channel_stop_broadcast(channel); + } else { + switch_channel_set_flag(channel, CF_BREAK); + } switch_core_session_rwunlock(psession); return SWITCH_STATUS_SUCCESS;

1 0

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

26 Nov '08

Author: anthm Date: Wed Nov 26 14:30:40 2008 New Revision: 10544 Log: patch for SFSIP-104 Modified: 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_presence.c 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 Wed Nov 26 14:30:40 2008 @@ -367,6 +367,8 @@ char *bindurl; char *tls_url; char *tls_bindurl; + char *tcp_contact; + char *tls_contact; char *sipdomain; char *timer_name; char *hold_music; 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 Wed Nov 26 14:30:40 2008 @@ -2071,11 +2071,15 @@ profile->bindurl = profile->url; } + profile->tcp_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->url); + profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->url); + + if (profile->bind_params) { char *bindurl = profile->bindurl; profile->bindurl = switch_core_sprintf(profile->pool, "%s;%s", bindurl, profile->bind_params); } - + /* * handle TLS params #2 */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Nov 26 14:30:40 2008 @@ -1540,7 +1540,8 @@ if (status < 200) { char *sticky = NULL; - + char *contact_str = profile->url; + if (is_nat) { char params[128] = ""; if (contact->m_url->url_params) { @@ -1555,9 +1556,16 @@ network_port, params); } + + if (switch_stristr("port=tcp", contact->m_url->url_params)) { + contact_str = profile->tcp_contact; + } else if (switch_stristr("port=tls", contact->m_url->url_params)) { + contact_str = profile->tls_contact; + } + - nua_respond(nh, SIP_202_ACCEPTED, NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), TAG_IF(sticky, NUTAG_PROXY(sticky)), - TAG_END()); + nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contact_str), NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), + TAG_IF(sticky, NUTAG_PROXY(sticky)), TAG_END()); switch_safe_free(sticky);

1 0

[commit] r10543 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Nov '08

26 Nov '08

Author: mikej Date: Wed Nov 26 13:56:37 2008 New Revision: 10543 Log: tweak Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Nov 26 13:56:37 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); - switch_set_flag(&runtime.dummy_cng_frame, 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 Wed Nov 26 13:56:37 2008 @@ -50,7 +50,7 @@ cng_frame.data = data; cng_frame.datalen = 2; cng_frame.buflen = 2; - switch_set_flag(&cng_frame, SFF_CNG); + switch_set_flag((&cng_frame), SFF_CNG); for (;;) { now = switch_timestamp_now();

1 0

[commit] r10542 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 26 Nov '08

26 Nov '08

Author: anthm Date: Wed Nov 26 13:19:59 2008 New Revision: 10542 Log: fix timeout defaults Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Nov 26 13:19:59 2008 @@ -2101,7 +2101,7 @@ switch_channel_t *channel; switch_time_t started; unsigned int elapsed; - int32 timeout = 60; + int32 timeout = 60000; jsrefcount saveDepth; jsval ret = JS_TRUE; @@ -2114,7 +2114,11 @@ if (argc > 0) { JS_ValueToInt32(cx, argv[0], &timeout); + if (timeout < 1000) { + timeout = 1000; + } } + if (check_hangup_hook(jss, NULL) != JS_TRUE) { return JS_FALSE; } @@ -2146,7 +2150,7 @@ switch_channel_t *channel; switch_time_t started; unsigned int elapsed; - int32 timeout = 60; + int32 timeout = 60000; jsrefcount saveDepth; jsval ret = JS_TRUE; @@ -2157,6 +2161,9 @@ if (argc > 0) { JS_ValueToInt32(cx, argv[0], &timeout); + if (timeout < 1000) { + timeout = 1000; + } } if (check_hangup_hook(jss, NULL) != JS_TRUE) {

1 0

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

26 Nov '08

Author: anthm Date: Wed Nov 26 12:59:14 2008 New Revision: 10541 Log: patch for SFSIP-104 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Nov 26 12:59:14 2008 @@ -1542,13 +1542,18 @@ char *sticky = NULL; if (is_nat) { + char params[128] = ""; + if (contact->m_url->url_params) { + switch_snprintf(params, sizeof(params), ";%s", contact->m_url->url_params); + } ipv6 = strchr(network_ip, ':'); - sticky = switch_mprintf("sip:%s@%s%s%s:%d", + sticky = switch_mprintf("sip:%s@%s%s%s:%d%s", contact_user, ipv6 ? "[" : "", network_ip, ipv6 ? "]" : "", - network_port); + network_port, + params); } nua_respond(nh, SIP_202_ACCEPTED, NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), TAG_IF(sticky, NUTAG_PROXY(sticky)),

1 0

[commit] r10540 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 26 Nov '08

26 Nov '08

Author: anthm Date: Wed Nov 26 10:22:26 2008 New Revision: 10540 Log: update Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Wed Nov 26 10:22:26 2008 @@ -1123,6 +1123,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_socket_recvfrom(switch_sockaddr_t *from, switch_socket_t *sock, int32_t flags, char *buf, size_t *len); +SWITCH_DECLARE(switch_status_t) switch_socket_atmark(switch_socket_t *sock, int *atmark); /** * Read data from a network. Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Wed Nov 26 10:22:26 2008 @@ -754,6 +754,11 @@ return sa->family; } +SWITCH_DECLARE(switch_status_t) switch_socket_atmark(switch_socket_t *sock, int *atmark) +{ + return apr_socket_atmark(sock, atmark); +} + SWITCH_DECLARE(switch_status_t) switch_socket_recvfrom(switch_sockaddr_t *from, switch_socket_t *sock, int32_t flags, char *buf, size_t *len) { apr_status_t r; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Nov 26 10:22:26 2008 @@ -1269,32 +1269,35 @@ switch_size_t bytes; switch_status_t status; - if (!switch_rtp_ready(rtp_session)) { + if (!switch_rtp_ready(rtp_session) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { 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); - } + if (switch_rtp_ready(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); + do { + if (switch_rtp_ready(rtp_session)) { + bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + } else { + break; + } + } while(bytes > 0); + + if (was_blocking && switch_rtp_ready(rtp_session)) { + 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

1 0

[commit] r10539 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 26 Nov '08

26 Nov '08

Author: brian Date: Tue Nov 25 22:12:27 2008 New Revision: 10539 Log: set domain_name to the default domain on all calls from mod_openzap Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Nov 25 22:12:27 2008 @@ -35,6 +35,14 @@ </condition> </extension> +  + <extension name="set_domain_openzap" continue="true"> + <condition field="${domain_name}" expression="^$"/> + <condition field="source" expression="mod_openzap"> + <action application="set" data="domain_name=$${domain}"/> + </condition> + </extension> +  <extension name="tod_example" continue="true">

1 0

[commit] r10538 - freeswitch/trunk/src/mod/formats/mod_shout
by FreeSWITCH SVN 25 Nov '08

25 Nov '08

Author: mikej Date: Tue Nov 25 16:23:40 2008 New Revision: 10538 Log: MODFORM-21 add a bit more error checking to mod_shout write function Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Nov 25 16:23:40 2008 @@ -902,12 +902,22 @@ static switch_status_t shout_file_write(switch_file_handle_t *handle, void *data, size_t *len) { - shout_context_t *context = handle->private_info; + shout_context_t *context; unsigned char mp3buf[8192] = ""; int rlen; int16_t *audio = data; int nsamples = *len; + if (!handle) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error no handle\n"); + return SWITCH_STATUS_FALSE; + } + + if (!(context = handle->private_info)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error no context\n"); + return SWITCH_STATUS_FALSE; + } + if (context->shout && !context->shout_init) { context->shout_init++; if (shout_open(context->shout) != SHOUTERR_SUCCESS) { @@ -918,7 +928,7 @@ launch_write_stream_thread(context); } - if (handle->handler) { + if (handle->handler && context->audio_mutex) { switch_mutex_lock(context->audio_mutex); if (context->audio_buffer) { if (!switch_buffer_write(context->audio_buffer, data, (nsamples * sizeof(int16_t) * handle->channels))) { @@ -928,47 +938,50 @@ } else { context->err++; } + switch_mutex_unlock(context->audio_mutex); if (context->err) { return SWITCH_STATUS_FALSE; } - } else { - if (!context->lame_ready) { - lame_init_params(context->gfp); - lame_print_config(context->gfp); - context->lame_ready = 1; - } + handle->sample_count += *len; + return SWITCH_STATUS_SUCCESS; + } - if (handle->channels == 2) { - int16_t l[4096] = { 0 }; - int16_t r[4096] = { 0 }; - int i, j = 0; - - for (i = 0; i < nsamples; i++) { - l[i] = audio[j++]; - r[i] = audio[j++]; - } + if (!context->lame_ready) { + lame_init_params(context->gfp); + lame_print_config(context->gfp); + context->lame_ready = 1; + } - if ((rlen = lame_encode_buffer(context->gfp, l, r, nsamples, mp3buf, sizeof(mp3buf))) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); - return SWITCH_STATUS_FALSE; - } + if (handle->channels == 2) { + int16_t l[4096] = { 0 }; + int16_t r[4096] = { 0 }; + int i, j = 0; - } else if (handle->channels == 1) { - if ((rlen = lame_encode_buffer(context->gfp, audio, NULL, nsamples, mp3buf, sizeof(mp3buf))) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); - return SWITCH_STATUS_FALSE; - } - } else { - rlen = 0; + for (i = 0; i < nsamples; i++) { + l[i] = audio[j++]; + r[i] = audio[j++]; } - if (rlen) { - int ret = fwrite(mp3buf, 1, rlen, context->fp); - if (ret < 0) { - return SWITCH_STATUS_FALSE; - } + if ((rlen = lame_encode_buffer(context->gfp, l, r, nsamples, mp3buf, sizeof(mp3buf))) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); + return SWITCH_STATUS_FALSE; + } + + } else if (handle->channels == 1) { + if ((rlen = lame_encode_buffer(context->gfp, audio, NULL, nsamples, mp3buf, sizeof(mp3buf))) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); + return SWITCH_STATUS_FALSE; + } + } else { + rlen = 0; + } + + if (rlen) { + int ret = fwrite(mp3buf, 1, rlen, context->fp); + if (ret < 0) { + return SWITCH_STATUS_FALSE; } }

1 0

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

25 Nov '08

Author: anthm Date: Tue Nov 25 15:54:58 2008 New Revision: 10537 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Nov 25 15:54:58 2008 @@ -337,32 +337,14 @@ status = NULL; } - if (status && switch_stristr("CS_", status)) { - status = NULL; + if (status && switch_stristr("CS_HANGUP", status)) { + status = "Call Ended"; } if (rpid) { rpid = sofia_presence_translate_rpid(rpid, status); } - - if (!status) { - status = "Available"; - - if (rpid) { - if (!strcasecmp(rpid, "busy")) { - status = "Busy"; - } else if (!strcasecmp(rpid, "unavailable")) { - status = "Idle"; - } else if (!strcasecmp(rpid, "away")) { - status = "Idle"; - } - } - } - - if (!rpid) { - rpid = "unknown"; - } - + if (event->event_id == SWITCH_EVENT_ROSTER) { struct presence_helper helper = { 0 }; @@ -380,7 +362,8 @@ "from sip_subscriptions left join sip_presence on " "(sip_subscriptions.sub_to_user=sip_presence.sip_user and sip_subscriptions.sub_to_host=sip_presence.sip_host and " "sip_subscriptions.profile_name=sip_presence.profile_name) " - "where sip_subscriptions.event='presence' and sip_subscriptions.full_from like '%%%q%%'", status, rpid, from); + "where sip_subscriptions.event='presence' and sip_subscriptions.full_from like '%%%q%%'", + switch_str_nil(status), switch_str_nil(rpid), from); } else { sql = switch_mprintf( "select sip_subscriptions.proto,sip_subscriptions.sip_user,sip_subscriptions.sip_host," @@ -392,7 +375,7 @@ "from sip_subscriptions left join sip_presence on " "(sip_subscriptions.sub_to_user=sip_presence.sip_user and sip_subscriptions.sub_to_host=sip_presence.sip_host and " "sip_subscriptions.profile_name=sip_presence.profile_name) " - "where sip_subscriptions.event='presence'", status, rpid); + "where sip_subscriptions.event='presence'", switch_str_nil(status), switch_str_nil(rpid)); } switch_assert(sql != NULL); @@ -497,7 +480,7 @@ "sip_subscriptions.profile_name=sip_presence.profile_name) " "where (event='%q' or event='%q') and sub_to_user='%q' " "and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - status, rpid, host, event_type, alt_event_type, euser, host, host); + switch_str_nil(status), switch_str_nil(rpid), host, event_type, alt_event_type, euser, host, host); break; case SWITCH_EVENT_PRESENCE_OUT: sql = switch_mprintf( @@ -513,7 +496,7 @@ "sip_subscriptions.profile_name=sip_presence.profile_name) " "where (event='%q' or event='%q') and sub_to_user='%q' " "and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - status, rpid, host, event_type, alt_event_type, euser, host, host); + switch_str_nil(status), switch_str_nil(rpid), host, event_type, alt_event_type, euser, host, host); break; default: break; @@ -705,7 +688,6 @@ char *user = argv[1]; char *host = argv[2]; switch_event_t *event; - char *status = NULL; char *event_name = argv[5]; if (!strcasecmp(event_name, "message-summary")) { @@ -717,14 +699,10 @@ return 0; } - if (switch_strlen_zero(status)) { - status = "Available"; - } if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", user, host); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_subtype", "probe"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event_name); @@ -920,11 +898,21 @@ rpid = argv[19]; } - if (switch_strlen_zero(status)) { - status = "Available"; + if (switch_strlen_zero(rpid)) { + rpid = "unknown"; } - + if (switch_strlen_zero(status)) { + if (!strcasecmp(rpid, "busy")) { + status = "Busy"; + } else if (!strcasecmp(rpid, "unavailable")) { + status = "Idle"; + } else if (!strcasecmp(rpid, "away")) { + status = "Idle"; + } else { + status = "Available"; + } + } if (profile_name && strcasecmp(profile_name, helper->profile->name)) { if ((ext_profile = sofia_glue_find_profile(profile_name))) { @@ -1747,7 +1735,6 @@ from_user, from_host, profile->name, mod_sofia_globals.hostname ))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); - switch_safe_free(sql); } if ((sql = @@ -1755,7 +1742,6 @@ "values ('%q','%q','%q','%q',%ld,'%q','%q','%q')", from_user, from_host, note_txt, rpid, exp, full_agent, profile->name, mod_sofia_globals.hostname))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); - switch_safe_free(sql); } event_type = sip_header_as_string(profile->home, (void *) sip->sip_event); 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 Tue Nov 25 15:54:58 2008 @@ -943,6 +943,8 @@ if (sql) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } + + switch_mutex_unlock(profile->ireg_mutex); if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_REGISTER) == SWITCH_STATUS_SUCCESS) { @@ -953,6 +955,7 @@ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "contact", contact_str); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "call-id", call_id); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "rpid", rpid); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "statusd", reg_desc); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-user", from_user); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-host", from_host);

1 0