April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

29 Apr '09

Author: anthm Date: Wed Apr 29 17:00:34 2009 New Revision: 13197 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:00:34 2009 @@ -883,33 +883,44 @@ } if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { - - 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); - } - - if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || - !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { - if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(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(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;fs_nat=yes>", display, contact->m_url->url_user, url_ip, - network_port, received_data); + if (!strcasecmp(v_contact_str, "NDLB-connectile-dysfunction-2.0")) { + char *path_encoded; + size_t path_encoded_len = (strlen(contact_str) * 3) + 1; + + 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); + reg_desc = "Registered(AUTO-NAT-2.0)"; + exptime = 20; + } 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); } - if (strstr(v_contact_str, "tls")) { - reg_desc = "Registered(TLSHACK)"; + + + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || + !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { + if (contact->m_url->url_params) { + switch_snprintf(contact_str, sizeof(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(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;fs_nat=yes>", display, contact->m_url->url_user, url_ip, + network_port, received_data); + } + if (strstr(v_contact_str, "tls")) { + reg_desc = "Registered(TLSHACK)"; + } else { + reg_desc = "Registered(AUTO-NAT)"; + exptime = 20; + } + nat_hack = 1; } else { - reg_desc = "Registered(AUTO-NAT)"; - exptime = 20; - } - nat_hack = 1; - } else { - char *p; - switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); - for (p = contact_str; p && *p; p++) { - if (*p == '\'' || *p == '[' || *p == ']') { - *p = '"'; + char *p; + switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); + for (p = contact_str; p && *p; p++) { + if (*p == '\'' || *p == '[' || *p == ']') { + *p = '"'; + } } } }

1 0

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

29 Apr '09

Author: anthm Date: Wed Apr 29 14:15:42 2009 New Revision: 13196 Log: doh 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 Wed Apr 29 14:15:42 2009 @@ -262,7 +262,8 @@ end: - if (sub_state == nua_substate_terminated && sofia_private != &mod_sofia_globals.destroy_private) { + if (sub_state == nua_substate_terminated && sofia_private && sofia_private != &mod_sofia_globals.destroy_private && + sofia_private != &mod_sofia_globals.keep_private) { sofia_private->destroy_nh = 1; sofia_private->destroy_me = 1; }

1 0

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

29 Apr '09

Author: anthm Date: Wed Apr 29 14:05:51 2009 New Revision: 13195 Log: prevent double free 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 Wed Apr 29 14:05:51 2009 @@ -262,10 +262,9 @@ end: - if (sub_state == nua_substate_terminated) { - sofia_private_free(sofia_private); - nua_handle_bind(nh, NULL); - nua_handle_destroy(nh); + if (sub_state == nua_substate_terminated && sofia_private != &mod_sofia_globals.destroy_private) { + sofia_private->destroy_nh = 1; + sofia_private->destroy_me = 1; } }

1 0

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

29 Apr '09

Author: rupa Date: Wed Apr 29 13:49:59 2009 New Revision: 13194 Log: add transfer action to caller-controls 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 13:49:59 2009 @@ -95,7 +95,8 @@ CALLER_CONTROL_MENU, CALLER_CONTROL_DIAL, CALLER_CONTROL_EVENT, - CALLER_CONTROL_LOCK + CALLER_CONTROL_LOCK, + CALLER_CONTROL_TRANSFER } caller_control_t; /* forward declaration for conference_obj and caller_control */ @@ -1580,6 +1581,54 @@ } } +static void conference_loop_fn_transfer(conference_member_t *member, caller_control_action_t *action) +{ + char *exten = NULL; + char *dialplan = "XML"; + char *context = "default"; + + char *argv[3] = { 0 }; + int argc; + char *mydata = NULL; + switch_event_t *event; + + if (test_eflag(member->conference, EFLAG_DTMF) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Dialplan", action->data); + switch_event_fire(&event); + } + switch_clear_flag_locked(member, MFLAG_RUNNING); + + if ((mydata = switch_core_session_strdup(member->session, action->data))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (argc > 0) { + exten = argv[0]; + } + if (argc > 1) { + dialplan = argv[1]; + } + if (argc > 2) { + context = argv[2]; + } + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Empty transfer string [%s]\n", (char *) action->data); + goto done; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate transfer data.\n"); + goto done; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfering to: %s, %s, %s\n", exten, dialplan, context); + + switch_ivr_session_transfer(member->session, + exten, dialplan, context); + +done: + return; +} + static void conference_loop_fn_hangup(conference_member_t *member, caller_control_action_t *action) { switch_clear_flag_locked(member, MFLAG_RUNNING); @@ -1817,7 +1866,8 @@ {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn}, {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup}, {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event}, - {"lock", NULL, CALLER_CONTROL_LOCK, conference_loop_fn_lock_toggle} + {"lock", NULL, CALLER_CONTROL_LOCK, conference_loop_fn_lock_toggle}, + {"transfer", NULL, CALLER_CONTROL_TRANSFER, conference_loop_fn_transfer} }; #define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0]))

1 0