- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8859 - in freeswitch/trunk/src/mod: applications/mod_dptools endpoints/mod_sofia
by Freeswitch SVN 27 Jun '08

27 Jun '08

Author: anthm Date: Fri Jun 27 13:46:04 2008 New Revision: 8859 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: add some more warning msgs Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Jun 27 13:46:04 2008 @@ -1080,8 +1080,11 @@ switch_chat_interface_t *ci; if ((ci = switch_loadable_module_get_chat_interface(argv[0]))) { - ci->chat_send("dp", argv[1], argv[2], "", argv[3], ""); - stream->write_function(stream, "Sent"); + if (ci->chat_send("dp", argv[1], argv[2], "", argv[3], "") == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "Sent"); + } else { + stream->write_function(stream, "Error! Message Not Sent"); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", argv[0]); } 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 Fri Jun 27 13:46:04 2008 @@ -52,14 +52,16 @@ switch_status_t sofia_presence_chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) { char buf[256]; - char *user, *host; + char *user = NULL, *host = NULL; sofia_profile_t *profile = NULL; char *ffrom = NULL; nua_handle_t *msg_nh; char *contact; + switch_status_t status = SWITCH_STATUS_FALSE; if (!to) { - return SWITCH_STATUS_SUCCESS; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To: header.\n"); + goto end; } user = strdup(to); @@ -73,21 +75,22 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Chat proto [%s]\nfrom [%s]\nto [%s]\n%s\nInvalid Profile %s\n", proto, from, to, body ? body : "[no body]", host ? host : "NULL"); - return SWITCH_STATUS_FALSE; + goto end; } if (!sofia_reg_find_reg_url(profile, user, host, buf, sizeof(buf))) { - return SWITCH_STATUS_FALSE; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find user. [%s][%s]\n", user, host); + goto end; } - if (!strcmp(proto, SOFIA_CHAT_PROTO)) { + if (!strcasecmp(proto, SOFIA_CHAT_PROTO)) { from = hint; } else { char *fp, *p, *fu = NULL; fp = strdup(from); if (!fp) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - return SWITCH_STATUS_FALSE; + goto end; } if ((p = strchr(fp, '@'))) { @@ -96,27 +99,33 @@ *p = '+'; } - ffrom = switch_mprintf("\"%s\" <sip:%s+%s@%s>", fu, proto, fp, profile->name); + ffrom = switch_mprintf("\"%s\" <sip:%s+%s@%s>", fu, proto, fp, profile->domain_name); from = ffrom; switch_safe_free(fu); switch_safe_free(fp); } + status = SWITCH_STATUS_SUCCESS; contact = sofia_glue_get_url_from_contact(buf, 1); - msg_nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(from), NUTAG_URL(contact), SIPTAG_TO_STR(buf), // if this cries, add contact here too, change the 1 to 0 and omit the safe_free + // if this cries, add contact here too, change the 1 to 0 and omit the safe_free + msg_nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(from), NUTAG_URL(contact), SIPTAG_TO_STR(buf), SIPTAG_CONTACT_STR(profile->url), TAG_END()); switch_safe_free(contact); nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR("text/html"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + + end: + switch_safe_free(ffrom); - free(user); + switch_safe_free(user); + if (profile) { switch_thread_rwlock_unlock(profile->rwlock); } - return SWITCH_STATUS_SUCCESS; + return status; } void sofia_presence_cancel(void)

1 0

[commit] r8858 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jun '08

27 Jun '08

Author: mikej Date: Fri Jun 27 12:36:09 2008 New Revision: 8858 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: keep sofia from re-setting __func__ 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 Fri Jun 27 12:36:09 2008 @@ -47,6 +47,11 @@ #endif #define SOFIA_NAT_SESSION_TIMEOUT 20 #define SOFIA_MAX_ACL 100 +#ifdef _MSC_VER +#define HAVE_FUNCTION 1 +#else +#define HAVE_FUNC 1 +#endif #define MODNAME "mod_sofia" static const switch_state_handler_table_t noop_state_handler = { 0 };

1 0

[commit] r8857 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jun '08

27 Jun '08

Author: anthm Date: Fri Jun 27 12:20:20 2008 New Revision: 8857 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak 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 Jun 27 12:20:20 2008 @@ -1956,7 +1956,7 @@ switch_ivr_hold_uuid(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), NULL, 0); } else { switch_ivr_broadcast(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), stream, SMF_ECHO_ALEG | SMF_LOOP); - switch_channel_wait_for_flag(tech_pvt->channel, CF_BROADCAST, SWITCH_TRUE, 5000); + switch_yield(250000); } } } @@ -1965,6 +1965,8 @@ const char *uuid; switch_core_session_t *b_session; + switch_yield(250000); + if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); }

1 0

[commit] r8856 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jun '08

27 Jun '08

Author: anthm Date: Fri Jun 27 12:01:40 2008 New Revision: 8856 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: strip off our private params 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 Fri Jun 27 12:01:40 2008 @@ -517,15 +517,10 @@ tportlog = 1; } - if (use_100rel && use_timer) { - supported = "100rel, precondition, timer"; - } else if (use_100rel) { - supported = "100rel, precondition"; - } else if (use_timer) { - supported = "timer, precondition"; - } else { - supported = "precondition"; - } + supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path", + use_100rel ? "100rel, " : "", + use_timer ? "timer, " : "" + ); profile->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ 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 Jun 27 12:01:40 2008 @@ -669,8 +669,15 @@ { char *stripped = switch_core_session_strdup(session, uri); char *new_uri = NULL; + char *p; stripped = sofia_glue_get_url_from_contact(stripped, 0); + + /* remove our params so we don't make any whiny moronic device piss it's pants and forget who it is for a half-hour */ + if ((p = (char *)switch_stristr(";fs_", stripped))) { + *p = '\0'; + } + if (transport && transport != SOFIA_TRANSPORT_UDP) { if (switch_stristr("port=", stripped)) { @@ -1066,7 +1073,7 @@ TAG_END()); - if (strstr(tech_pvt->dest, ";nat") || strstr(tech_pvt->dest, ";received") + if (strstr(tech_pvt->dest, ";fs_nat") || strstr(tech_pvt->dest, ";received") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { switch_set_flag(tech_pvt, TFLAG_NAT); tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str); @@ -1165,9 +1172,11 @@ call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"); - if ((route = strstr(tech_pvt->dest, ";path="))) { + if ((route = strstr(tech_pvt->dest, ";fs_path="))) { char *p; - route = switch_core_session_strdup(tech_pvt->session, route + 6); + + route = switch_core_session_strdup(tech_pvt->session, route + 9); + for (p = route; p && *p ; p++) { if (*p == '>' || *p == ';') { *p = '\0'; @@ -1187,8 +1196,6 @@ route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL); } - - nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0), 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 Fri Jun 27 12:01:40 2008 @@ -462,8 +462,8 @@ path_val = sip_header_as_string(nh->nh_home, (void *) sip->sip_path); path_encoded_len = (strlen(path_val) * 3) + 1; switch_zmalloc(path_encoded, path_encoded_len); - switch_copy_string(path_encoded, ";path=", 7); - switch_url_encode(path_val, path_encoded + 6, path_encoded_len - 6); + switch_copy_string(path_encoded, ";fs_path=", 10); + switch_url_encode(path_val, path_encoded + 9, path_encoded_len - 9); } if (port) { @@ -477,10 +477,10 @@ if (contact->m_url->url_params) { switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port, - contact->m_url->url_params, received_data, is_nat ? ";nat=yes" : "", path_encoded ? path_encoded : ""); + contact->m_url->url_params, received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : ""); } else { switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port, - received_data, is_nat ? ";nat=yes" : "", path_encoded ? path_encoded : ""); + received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : ""); } switch_safe_free(path_encoded); @@ -532,10 +532,10 @@ 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;nat=yes>", + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s%s;fs_nat=yes>", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params, received_data); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;nat=yes>", display, contact->m_url->url_user, network_ip, + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;fs_nat=yes>", display, contact->m_url->url_user, network_ip, network_port, received_data); } if (strstr(v_contact_str, "tls")) {

1 0

[commit] r8855 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 27 Jun '08

27 Jun '08

Author: anthm Date: Fri Jun 27 11:07:28 2008 New Revision: 8855 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add url encode/decode api calls 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 Fri Jun 27 11:07:28 2008 @@ -178,6 +178,45 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(url_decode_function) +{ + char *reply = ""; + char *data = NULL; + + if (!switch_strlen_zero(cmd)) { + data = strdup(cmd); + switch_url_decode(data); + reply = data; + } + + stream->write_function(stream, "%s", reply); + + switch_safe_free(data); + return SWITCH_STATUS_SUCCESS; + +} + +SWITCH_STANDARD_API(url_encode_function) +{ + char *reply = ""; + char *data = NULL; + int len = 0 ; + + if (!switch_strlen_zero(cmd)) { + len = (strlen(cmd) * 3) + 1; + switch_zmalloc(data, len); + switch_url_encode(cmd, data, len); + reply = data; + } + + stream->write_function(stream, "%s", reply); + + switch_safe_free(data); + return SWITCH_STATUS_SUCCESS; + +} + + SWITCH_STANDARD_API(user_exists_function) { return _find_user(cmd, session, stream, SWITCH_TRUE); @@ -2390,6 +2429,8 @@ SWITCH_ADD_API(commands_api_interface, "user_exists", "find a user", user_exists_function, "<key> <user> <domain>"); SWITCH_ADD_API(commands_api_interface, "xml_locate", "find some xml", xml_locate_function, "[root | <section> <tag> <tag_attr_name> <tag_attr_val>]"); SWITCH_ADD_API(commands_api_interface, "user_data", "find user data", user_data_function, "<user>@<domain> [var|param] <name>"); + SWITCH_ADD_API(commands_api_interface, "url_encode", "url encode a string", url_encode_function, "<string>"); + SWITCH_ADD_API(commands_api_interface, "url_decode", "url decode a string", url_decode_function, "<string>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD;

1 0

[commit] r8854 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 27 Jun '08

27 Jun '08

Author: anthm Date: Fri Jun 27 11:01:14 2008 New Revision: 8854 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: let voicemail favor effective_caller_id_name/number Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Jun 27 11:01:14 2008 @@ -1272,7 +1272,7 @@ { vm_check_state_t vm_check_state = VM_CHECK_START; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_caller_profile_t *caller_profile; + switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(channel); vm_profile_t *profile; switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; @@ -1291,6 +1291,16 @@ char *vm_email = NULL; char foo[2] = ""; switch_input_args_t args = { 0 }; + const char *caller_id_name = NULL; + const char *caller_id_number = NULL; + + if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) { + caller_id_name = caller_profile->caller_id_name; + } + + if (!(caller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"))) { + caller_id_number = caller_profile->caller_id_number; + } if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); @@ -1607,13 +1617,13 @@ if (!x_user) { switch_event_t *params; int ok = 1; - caller_profile = switch_channel_get_caller_profile(channel); + switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", myid); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_profile->caller_id_number); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_id_number); if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), @@ -1750,6 +1760,17 @@ int send_main = 0; int send_notify = 0; int insert_db = 1; + const char *caller_id_name = NULL; + const char *caller_id_number = NULL; + + + if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) { + caller_id_name = caller_profile->caller_id_name; + } + + if (!(caller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"))) { + caller_id_number = caller_profile->caller_id_number; + } memset(&cbt, 0, sizeof(cbt)); if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { @@ -1922,7 +1943,7 @@ cc.noexit = 1; args.buf = &cc; - dbuf = switch_mprintf("%s (%s)", caller_profile->caller_id_name, caller_profile->caller_id_number); + dbuf = switch_mprintf("%s (%s)", caller_id_name, caller_id_number); switch_channel_set_variable(channel, "RECORD_ARTIST", dbuf); free(dbuf); @@ -1961,7 +1982,7 @@ int total_saved_urgent_messages = 0; usql = switch_mprintf("insert into voicemail_msgs values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','%u','','%q')", (long) switch_timestamp(NULL), - id, domain_name, uuid, caller_profile->caller_id_name, caller_profile->caller_id_number, + id, domain_name, uuid, caller_id_name, caller_id_number, myfolder, file_path, message_len, read_flags); vm_execute_sql(profile, usql, profile->mutex); switch_safe_free(usql); @@ -2019,8 +2040,8 @@ switch_channel_set_variable(channel, "voicemail_urgent_saved_messages", tmp); switch_channel_set_variable(channel, "voicemail_account", id); switch_channel_set_variable(channel, "voicemail_domain", domain_name); - switch_channel_set_variable(channel, "voicemail_caller_id_number", caller_profile->caller_id_number); - switch_channel_set_variable(channel, "voicemail_caller_id_name", caller_profile->caller_id_name); + switch_channel_set_variable(channel, "voicemail_caller_id_number", caller_id_number); + switch_channel_set_variable(channel, "voicemail_caller_id_name", caller_id_name); switch_channel_set_variable(channel, "voicemail_file_path", file_path); switch_channel_set_variable(channel, "voicemail_read_flags", read_flags); switch_channel_set_variable(channel, "voicemail_time", date); @@ -2052,7 +2073,7 @@ headers = switch_mprintf( "From: FreeSWITCH mod_voicemail <%s@%s>\n" "Subject: Voicemail from %s %s\nX-Priority: %d", - id, domain_name, caller_profile->caller_id_name, caller_profile->caller_id_number, priority); + id, domain_name, caller_id_name, caller_id_number, priority); } else { headers = switch_channel_expand_variables(channel, profile->email_headers); } @@ -2077,7 +2098,7 @@ if (profile->email_body) { body = switch_channel_expand_variables(channel, profile->email_body); } else { - body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); + body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_id_name, caller_id_number); } if (email_attach) { @@ -2100,7 +2121,7 @@ headers = switch_mprintf( "From: FreeSWITCH mod_voicemail <%s@%s>\n" "Subject: Voicemail from %s %s\nX-Priority: %d", - id, domain_name, caller_profile->caller_id_name, caller_profile->caller_id_number, priority); + id, domain_name, caller_id_name, caller_id_number, priority); } else { headers = switch_channel_expand_variables(channel, profile->notify_email_headers); } @@ -2125,7 +2146,7 @@ if (profile->notify_email_body) { body = switch_channel_expand_variables(channel, profile->notify_email_body); } else { - body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); + body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_id_name, caller_id_number); } switch_simple_email(vm_notify_email, from, header_string, body, NULL);

1 0

[commit] r8853 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: brian Date: Thu Jun 26 16:58:22 2008 New Revision: 8853 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: fix mod_shoutr record stream 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 Thu Jun 26 16:58:22 2008 @@ -471,6 +471,12 @@ { shout_context_t *context = (shout_context_t *) obj; + if (!context->lame_ready) { + lame_init_params(context->gfp); + lame_print_config(context->gfp); + context->lame_ready = 1; + } + while (!context->err && context->thread_running) { unsigned char mp3buf[8192] = ""; unsigned char audio[8192] = "";

1 0

[commit] r8852 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: anthm Date: Thu Jun 26 16:37:14 2008 New Revision: 8852 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: bigger buffer for regex match Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Thu Jun 26 16:37:14 2008 @@ -147,7 +147,7 @@ } if (field && strchr(expression, '(')) { - len = (uint32_t) (strlen(data) + strlen(field_data) + 10); + len = (uint32_t) (strlen(data) + strlen(field_data) + 10) * proceed; if (!(substituted = malloc(len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); proceed = 0;

1 0

[commit] r8851 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: anthm Date: Thu Jun 26 16:19:09 2008 New Revision: 8851 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add path support to sofia 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 Thu Jun 26 16:19:09 2008 @@ -929,8 +929,9 @@ uint32_t session_timeout = 0; const char *val; const char *rep; - char *sticky = NULL; const char *call_id = NULL; + char *route = NULL; + char *route_uri = NULL; rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); @@ -1056,15 +1057,20 @@ use_from_str = from_str; from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); - tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, - NUTAG_URL(url_str), SIPTAG_TO_STR(to_str), SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), TAG_END()); + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, + NUTAG_URL(url_str), + SIPTAG_TO_STR(to_str), + SIPTAG_FROM_STR(from_str), + SIPTAG_CONTACT_STR(invite_contact), + TAG_END()); + if (strstr(tech_pvt->dest, ";nat") || strstr(tech_pvt->dest, ";received") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { switch_set_flag(tech_pvt, TFLAG_NAT); tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str); - sticky = tech_pvt->record_route; + route_uri = tech_pvt->record_route; session_timeout = SOFIA_NAT_SESSION_TIMEOUT; switch_channel_set_variable(channel, "sip_nat_detected", "true"); } @@ -1159,6 +1165,31 @@ call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"); + if ((route = strstr(tech_pvt->dest, ";path="))) { + char *p; + route = switch_core_session_strdup(tech_pvt->session, route + 6); + for (p = route; p && *p ; p++) { + if (*p == '>' || *p == ';') { + *p = '\0'; + break; + } + } + switch_url_decode(route); + route_uri = switch_core_session_strdup(tech_pvt->session, route); + if ((p = strchr(route_uri, ','))) { + while (*(p-1) == ' ') { + p--; + } + if (*p) { + *p = '\0'; + } + } + + route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL); + } + + + nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), @@ -1166,8 +1197,9 @@ TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), - TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), TAG_IF(call_id, SIPTAG_CALL_ID_STR(call_id)), + TAG_IF(route_uri, NUTAG_PROXY(route_uri)), + TAG_IF(route, SIPTAG_ROUTE_STR(route)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), 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 Thu Jun 26 16:19:09 2008 @@ -409,7 +409,8 @@ const char *call_id = NULL; char *force_user; char received_data[128] = ""; - + char *path_val = NULL; + /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ switch_assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -436,6 +437,9 @@ const char *port = contact->m_url->url_port; char new_port[25] = ""; const char *contact_host = contact->m_url->url_host; + char *path_encoded = NULL; + int path_encoded_len = 0; + display = contact->m_display; if (is_nat) { @@ -454,6 +458,14 @@ } } + if (sip->sip_path) { + path_val = sip_header_as_string(nh->nh_home, (void *) sip->sip_path); + path_encoded_len = (strlen(path_val) * 3) + 1; + switch_zmalloc(path_encoded, path_encoded_len); + switch_copy_string(path_encoded, ";path=", 7); + switch_url_encode(path_val, path_encoded + 6, path_encoded_len - 6); + } + if (port) { switch_snprintf(new_port, sizeof(new_port), ":%s", port); } @@ -463,12 +475,15 @@ } if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s>", - display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, received_data, is_nat ? ";nat=yes" : ""); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s%s>", + display, contact->m_url->url_user, contact_host, new_port, + contact->m_url->url_params, received_data, is_nat ? ";nat=yes" : "", path_encoded ? path_encoded : ""); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port, - received_data, is_nat ? ";nat=yes" : ""); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port, + received_data, is_nat ? ";nat=yes" : "", path_encoded ? path_encoded : ""); } + + switch_safe_free(path_encoded); } if (expires) { @@ -691,7 +706,7 @@ } } - nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), NUTAG_WITH_THIS(nua), TAG_END()); + nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), TAG_IF(path_val, SIPTAG_PATH_STR(path_val)), NUTAG_WITH_THIS(nua), TAG_END()); if (s_event) { switch_event_fire(&s_event);

1 0

[commit] r8850 - freeswitch/trunk/conf/sip_profiles/external
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: brian Date: Thu Jun 26 15:52:41 2008 New Revision: 8850 Modified: freeswitch/trunk/conf/sip_profiles/external/example.xml Log: tweak thx sekil 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 Thu Jun 26 15:52:41 2008 @@ -28,5 +28,7 @@    +  +   </include>

1 0