- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13207 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Wed Apr 29 23:20:22 2009 New Revision: 13207 Log: MODAPP-261 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Apr 29 23:20:22 2009 @@ -155,7 +155,8 @@ CFLAG_ENFORCE_MIN = (1 << 2), CFLAG_DESTRUCT = (1 << 3), CFLAG_LOCKED = (1 << 4), - CFLAG_ANSWERED = (1 << 5) + CFLAG_ANSWERED = (1 << 5), + CFLAG_BRIDGE_TO = (1 << 6), } conf_flag_t; typedef enum { @@ -642,13 +643,17 @@ switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); } else if (conference->count == 1 && !conference->perpetual_sound) { - if (conference->alone_sound) { - conference_stop_file(conference, FILE_STOP_ASYNC); - conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1); - } else { - switch_snprintf(msg, sizeof(msg), "You are currently the only person in this conference."); - conference_member_say(member, msg, CONF_DEFAULT_LEADIN); + /* as long as its not a bridge_to conference, announce if person is alone */ + if (!switch_test_flag(conference, CFLAG_BRIDGE_TO)) { + if (conference->alone_sound) { + conference_stop_file(conference, FILE_STOP_ASYNC); + conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1); + } else { + switch_snprintf(msg, sizeof(msg), "You are currently the only person in this conference."); + conference_member_say(member, msg, CONF_DEFAULT_LEADIN); + } } + } } } @@ -4873,6 +4878,9 @@ /* Indicate the conference is dynamic */ switch_set_flag_locked(conference, CFLAG_DYNAMIC); + /* Indicate the conference has a bridgeto party */ + switch_set_flag_locked(conference, CFLAG_BRIDGE_TO); + /* Start the conference thread for this conference */ launch_conference_thread(conference);

1 0

[commit] r13206 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Wed Apr 29 23:18:46 2009 New Revision: 13206 Log: MODAPP-268 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Apr 29 23:18:46 2009 @@ -360,7 +360,7 @@ static void conference_loop_output(conference_member_t *member); static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop); static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async); -static void conference_send_all_dtmf(conference_obj_t *conference, const char *dtmf); +static void conference_send_all_dtmf(conference_member_t *member, conference_obj_t *conference, const char *dtmf); static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim); static conference_obj_t *conference_find(char *name); @@ -2052,7 +2052,7 @@ switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf)); if (switch_test_flag(member, MFLAG_DIST_DTMF)) { - conference_send_all_dtmf(member->conference, dtmf); + conference_send_all_dtmf(member, member->conference, dtmf); } else { if (member->conference->dtmf_parser != NULL) { for (digit = dtmf; *digit && caller_action == NULL; digit++) { @@ -2469,7 +2469,7 @@ return count; } -static void conference_send_all_dtmf(conference_obj_t *conference, const char *dtmf) +static void conference_send_all_dtmf(conference_member_t *member, conference_obj_t *conference, const char *dtmf) { conference_member_t *imember; @@ -2477,11 +2477,18 @@ switch_mutex_lock(conference->member_mutex); for (imember = conference->members; imember; imember = imember->next) { + /* don't send to self */ + if (imember->id == member->id) { + continue; + } if (imember->session) { const char *p; for (p = dtmf; p && *p; p++) { switch_dtmf_t dtmf = { *p, SWITCH_DEFAULT_DTMF_DURATION}; - switch_channel_queue_dtmf(switch_core_session_get_channel(imember->session), &dtmf); + switch_mutex_lock(imember->control_mutex); + switch_core_session_kill_channel(imember->session, SWITCH_SIG_BREAK); + switch_core_session_send_dtmf(imember->session, &dtmf); + switch_mutex_unlock(imember->control_mutex); } } }

1 0

[commit] r13205 - freeswitch/trunk
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Wed Apr 29 21:45:12 2009 New Revision: 13205 Log: doh Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Apr 29 21:45:12 2009 @@ -356,7 +356,7 @@ cd libs/openzap && $(MAKE) clean cd libs/portaudio && $(MAKE) clean cd libs/speex && $(MAKE) clean - cd libs/esl && ${MAKE) clean + cd libs/esl && $(MAKE) clean swigall: @echo reswigging all

1 0

[commit] r13204 - freeswitch/trunk
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Wed Apr 29 21:20:25 2009 New Revision: 13204 Log: clean esl on make current Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Apr 29 21:20:25 2009 @@ -356,6 +356,7 @@ cd libs/openzap && $(MAKE) clean cd libs/portaudio && $(MAKE) clean cd libs/speex && $(MAKE) clean + cd libs/esl && ${MAKE) clean swigall: @echo reswigging all

1 0

[commit] r13203 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Wed Apr 29 19:23:51 2009 New Revision: 13203 Log: add experimental NDLB-connectile-dysfunction-2.0 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Apr 29 19:23:51 2009 @@ -780,7 +780,7 @@ } display = contact->m_display; - + if (is_nat) { if (is_tls) { reg_desc = "Registered(TLS-NAT)"; @@ -826,7 +826,6 @@ switch_copy_string(path_encoded, ";fs_path=", 10); switch_url_encode(my_contact_str, path_encoded + 9, path_encoded_len - 9); exptime = 30; - switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded); } if (port) {

1 0

[commit] r13202 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Wed Apr 29 19:09:41 2009 New Revision: 13202 Log: add experimental NDLB-connectile-dysfunction-2.0 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Apr 29 19:09:41 2009 @@ -701,7 +701,7 @@ uint8_t multi_reg = 0, multi_reg_contact = 0, avoid_multi_reg = 0; uint8_t stale = 0, forbidden = 0; auth_res_t auth_res; - long exptime = 60; + long exptime = 300; switch_event_t *event; const char *rpid = "unknown"; const char *display = "\"user\""; @@ -789,9 +789,9 @@ } else { reg_desc = "Registered(UDP-NAT)"; } - contact_host = url_ip; - switch_snprintf(new_port, sizeof(new_port), ":%d", network_port); - port = NULL; + //contact_host = url_ip; + //switch_snprintf(new_port, sizeof(new_port), ":%d", network_port); + //port = NULL; } else { if (is_tls) { reg_desc = "Registered(TLS)"; @@ -817,6 +817,16 @@ switch_zmalloc(path_encoded, path_encoded_len); switch_copy_string(path_encoded, ";fs_path=", 10); switch_url_encode(path_val, path_encoded + 9, path_encoded_len - 9); + } else if (is_nat) { + char my_contact_str[1024]; + switch_snprintf(my_contact_str, sizeof(my_contact_str), "sip:%s@%s:%d", contact->m_url->url_user, url_ip, network_port); + path_encoded_len = (strlen(my_contact_str) * 3) + 1; + + switch_zmalloc(path_encoded, path_encoded_len); + switch_copy_string(path_encoded, ";fs_path=", 10); + switch_url_encode(my_contact_str, path_encoded + 9, path_encoded_len - 9); + exptime = 30; + switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded); } if (port) { @@ -895,7 +905,7 @@ switch_copy_string(path_encoded, ";fs_nat=yes;fs_path=", 21); switch_url_encode(my_contact_str, path_encoded + 20, path_encoded_len - 20); reg_desc = "Registered(AUTO-NAT-2.0)"; - exptime = 20; + exptime = 30; switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded); free(path_encoded); } else { @@ -917,7 +927,7 @@ reg_desc = "Registered(TLSHACK)"; } else { reg_desc = "Registered(AUTO-NAT)"; - exptime = 20; + exptime = 30; } nat_hack = 1; } else {

1 0

[commit] r13201 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 18:27:24 2009 New Revision: 13201 Log: add experimental NDLB-connectile-dysfunction-2.0 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Apr 29 18:27:24 2009 @@ -885,19 +885,14 @@ if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { if (!strcasecmp(v_contact_str, "NDLB-connectile-dysfunction-2.0")) { char *path_encoded; - size_t path_encoded_len = (strlen(contact_str) * 3) + 1; + size_t path_encoded_len; char my_contact_str[1024]; - if (contact->m_url->url_params) { - switch_snprintf(my_contact_str, sizeof(my_contact_str), "%s <sip:%s@%s:%d;%s%s;fs_nat=yes>", - display, contact->m_url->url_user, url_ip, network_port, contact->m_url->url_params, received_data); - } else { - switch_snprintf(my_contact_str, sizeof(my_contact_str), "%s <sip:%s@%s:%d%s;fs_nat=yes>", display, contact->m_url->url_user, url_ip, - network_port, received_data); - } + switch_snprintf(my_contact_str, sizeof(my_contact_str), "sip:%s@%s:%d", contact->m_url->url_user, url_ip, network_port); + path_encoded_len = (strlen(my_contact_str) * 3) + 1; switch_zmalloc(path_encoded, path_encoded_len); - switch_copy_string(path_encoded, ";fs_nat=yes;fs_path=", 20); + switch_copy_string(path_encoded, ";fs_nat=yes;fs_path=", 21); switch_url_encode(my_contact_str, path_encoded + 20, path_encoded_len - 20); reg_desc = "Registered(AUTO-NAT-2.0)"; exptime = 20;

1 0

[commit] r13200 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 17:56:19 2009 New Revision: 13200 Log: add experimental NDLB-connectile-dysfunction-2.0 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Apr 29 17:56:19 2009 @@ -898,7 +898,7 @@ switch_zmalloc(path_encoded, path_encoded_len); switch_copy_string(path_encoded, ";fs_nat=yes;fs_path=", 20); - switch_url_encode(my_contact_str, path_encoded + 22, path_encoded_len - 20); + switch_url_encode(my_contact_str, path_encoded + 20, path_encoded_len - 20); reg_desc = "Registered(AUTO-NAT-2.0)"; exptime = 20; switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded);

1 0

[commit] r13199 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 17:48:21 2009 New Revision: 13199 Log: add experimental NDLB-connectile-dysfunction-2.0 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Apr 29 17:48:21 2009 @@ -901,6 +901,8 @@ switch_url_encode(my_contact_str, path_encoded + 22, path_encoded_len - 20); reg_desc = "Registered(AUTO-NAT-2.0)"; exptime = 20; + switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded); + free(path_encoded); } else { if (*received_data && sofia_test_pflag(profile, PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) { switch_snprintf(received_data, sizeof(received_data), ";received=%s:%d", url_ip, network_port);

1 0

[commit] r13198 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 17:04:25 2009 New Revision: 13198 Log: add experimental NDLB-connectile-dysfunction-2.0 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Apr 29 17:04:25 2009 @@ -886,10 +886,19 @@ if (!strcasecmp(v_contact_str, "NDLB-connectile-dysfunction-2.0")) { char *path_encoded; size_t path_encoded_len = (strlen(contact_str) * 3) + 1; + char my_contact_str[1024]; + + if (contact->m_url->url_params) { + switch_snprintf(my_contact_str, sizeof(my_contact_str), "%s <sip:%s@%s:%d;%s%s;fs_nat=yes>", + display, contact->m_url->url_user, url_ip, network_port, contact->m_url->url_params, received_data); + } else { + switch_snprintf(my_contact_str, sizeof(my_contact_str), "%s <sip:%s@%s:%d%s;fs_nat=yes>", display, contact->m_url->url_user, url_ip, + network_port, received_data); + } switch_zmalloc(path_encoded, path_encoded_len); switch_copy_string(path_encoded, ";fs_nat=yes;fs_path=", 20); - switch_url_encode(contact_str, path_encoded + 22, path_encoded_len - 20); + switch_url_encode(my_contact_str, path_encoded + 22, path_encoded_len - 20); reg_desc = "Registered(AUTO-NAT-2.0)"; exptime = 20; } else {

1 0