December 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3560 - freeswitch/trunk/src/mod/applications/mod_bridgecall
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: anthm Date: Wed Dec 6 16:37:29 2006 New Revision: 3560 Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Log: let calls live on when nobody answers in mod_bridgecall Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Wed Dec 6 16:37:29 2006 @@ -66,9 +66,12 @@ } if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); - /* Hangup the channel with the cause code from the failed originate.*/ - switch_channel_hangup(caller_channel, cause); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Originate Failed. Cause: %s\n", switch_channel_cause2str(cause)); + if (cause != SWITCH_CAUSE_NO_ANSWER) { + /* All Causes besides NO_ANSWER terminate the originating session. We will pass that cause on when we hangup.*/ + switch_channel_hangup(caller_channel, cause); + } + /* Otherwise.. nobody answered. Go back to the dialplan instructions in case there was more to do. */ return; } else { if (no_media_bridge) {

1 0

[commit] r3559 - freeswitch/trunk/src
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: anthm Date: Wed Dec 6 12:24:14 2006 New Revision: 3559 Modified: freeswitch/trunk/src/switch_ivr.c Log: change & to , in forked dial Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Dec 6 12:24:14 2006 @@ -2382,7 +2382,7 @@ var = NULL; to = 0; - and_argc = switch_separate_string(pipe_names[r], '&', peer_names, (sizeof(peer_names) / sizeof(peer_names[0]))); + and_argc = switch_separate_string(pipe_names[r], ',', peer_names, (sizeof(peer_names) / sizeof(peer_names[0]))); if (caller_channel && !sent_ring && and_argc > 1 && !ringback_data) { switch_channel_ringback(caller_channel);

1 0

[commit] r3558 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: anthm Date: Wed Dec 6 12:19:07 2006 New Revision: 3558 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 6 12:19:07 2006 @@ -1214,7 +1214,7 @@ case SWITCH_CAUSE_ORIGINATOR_CANCEL: return 487; default: - return 500; + return 480; } } @@ -3938,6 +3938,7 @@ char *req_user, *req_host, *req_port; char *contact_user, *contact_host, *contact_port; char *via_rport, *via_host, *via_port; + char *from_port; char uri[1024]; if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { @@ -4017,10 +4018,16 @@ switch_channel_set_variable(channel, "sip_from_user_stripped", (char *)from->a_url->url_user); } switch_channel_set_variable(channel, "sip_from_host", (char *) from->a_url->url_host); - switch_channel_set_variable(channel, "sip_from_port", (char *) from->a_url->url_port); + + if (!(from_port = (char *) from->a_url->url_port)) { + from_port = "5060"; + } - snprintf(uri, sizeof(uri), "%s@%s:%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host, (char *) from->a_url->url_port); + switch_channel_set_variable(channel, "sip_from_port", from_port); + + + snprintf(uri, sizeof(uri), "%s@%s:%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host, from_port); switch_channel_set_variable(channel, "sip_from_uri", uri); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Dec 6 12:19:07 2006 @@ -1114,7 +1114,7 @@ size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; char *sub_val = NULL, *func_val = NULL; - if (!strchr(in, '$') && !strchr(in, '^')) { + if (!strchr(in, '$')) { return in; } @@ -1130,7 +1130,7 @@ if (*p == '$') { vtype = 1; } - if (*p == '^') { + if (*(p+1) != '{') { vtype = 2; } @@ -1219,7 +1219,7 @@ len++; } - if (*p == '$' || *p == '^') { + if (*p == '$') { p--; } else { *c++ = *p; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Dec 6 12:19:07 2006 @@ -2651,7 +2651,7 @@ return; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, Aborting\n"); - switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } } }

1 0

[commit] r3557 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: anthm Date: Wed Dec 6 11:38:41 2006 New Revision: 3557 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: avoiding nulls Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 6 11:38:41 2006 @@ -4034,7 +4034,9 @@ req_user = (char *) sip->sip_request->rq_url->url_user; req_host = (char *) sip->sip_request->rq_url->url_host; - req_port = (char *) sip->sip_request->rq_url->url_port; + if (!(req_port = (char *) sip->sip_request->rq_url->url_port)) { + req_port = "5060"; + } switch_channel_set_variable(channel, "sip_req_user", req_user); switch_channel_set_variable(channel, "sip_req_host", req_host); @@ -4042,15 +4044,21 @@ contact_user = (char *) sip->sip_contact->m_url->url_user; contact_host = (char *) sip->sip_contact->m_url->url_host; - contact_port = (char *) sip->sip_contact->m_url->url_port; + if (!(contact_port = (char *) sip->sip_contact->m_url->url_port)) { + contact_port = "5060"; + } switch_channel_set_variable(channel, "sip_contact_user", contact_user); switch_channel_set_variable(channel, "sip_contact_host", contact_host); switch_channel_set_variable(channel, "sip_contact_port", contact_port); via_host = (char *) sip->sip_via->v_host; - via_port = (char *) sip->sip_via->v_port; - via_rport = (char *) sip->sip_via->v_rport; + if (!(via_port = (char *) sip->sip_via->v_port)) { + via_port = "5060"; + } + if (!(via_rport = (char *) sip->sip_via->v_rport)) { + via_rport = "5060"; + } switch_channel_set_variable(channel, "sip_via_host", via_host); switch_channel_set_variable(channel, "sip_via_port", via_port);

1 0

[commit] r3556 - freeswitch/trunk/src/mod/applications/mod_ivrtest
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: mikej Date: Wed Dec 6 10:17:16 2006 New Revision: 3556 Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Log: change function name switch_ivr_menu_stack_free Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Wed Dec 6 10:17:16 2006 @@ -132,7 +132,7 @@ status = switch_ivr_menu_execute(session, menu, "main", NULL); // cleaup the menu - //switch_ivr_menu_free_stack(menu); + switch_ivr_menu_stack_free(menu); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build menu %s\n",params); }

1 0

[commit] r3555 - freeswitch/trunk/src/mod/applications/mod_ivrtest
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: mikej Date: Wed Dec 6 09:16:09 2006 New Revision: 3555 Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Log: make build again Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Wed Dec 6 09:16:09 2006 @@ -98,10 +98,11 @@ "main", "please enter some numbers so i can figure out if I have any bugs or not", "enter some numbers", + NULL, "I have no idea what that is", "cepstral", "david", - 15000, 10, NULL); + 15000, 10, NULL, NULL); status = switch_ivr_menu_init(&sub_menu, @@ -109,10 +110,11 @@ "sub", "/ram/congrats.wav", "/ram/extension.wav", + NULL, "/ram/invalid.wav", NULL, NULL, - 15000, 10, NULL); + 15000, 10, NULL, NULL); if (status == SWITCH_STATUS_SUCCESS) { // build the menu @@ -130,7 +132,7 @@ status = switch_ivr_menu_execute(session, menu, "main", NULL); // cleaup the menu - switch_ivr_menu_free_stack(menu); + //switch_ivr_menu_free_stack(menu); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build menu %s\n",params); }

1 0

[commit] r3554 - freeswitch/branches/mman
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: sphere Date: Wed Dec 6 07:33:32 2006 New Revision: 3554 Added: freeswitch/branches/mman/ Log: Creating empty folder for mman

1 0

[commit] r3553 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: mikej Date: Wed Dec 6 02:21:12 2006 New Revision: 3553 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: Fixes/tweaks to conference from Neal Horman 1. 3 retries for pin entry 2. don't require pin entry for outbound calls 3. allow outbound calls to enter the conference when locked 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 Dec 6 02:21:12 2006 @@ -2771,36 +2771,54 @@ launch_conference_thread(conference); } - if (conference->pin) { - char term = '\0'; - char pin[80] = ""; - char *buf; + /* if this is not an outbound call, deal with conference pins */ + if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin) { + char pin_buf[80] = ""; + int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ + int pin_valid = 0; + switch_status_t status = SWITCH_STATUS_SUCCESS; /* Answer the channel */ switch_channel_answer(channel); - if (conference->pin_sound) { - conference_local_play_file(session, conference->pin_sound, 20, pin, sizeof(pin)); - } + while(!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { - if (strlen(pin) < strlen(conference->pin)) { - buf = pin + strlen(pin); - switch_ivr_collect_digits_count(session, + /* be friendly */ + if (conference->pin_sound) { + conference_local_play_file(session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + } + /* wait for them if neccessary */ + if (strlen(pin_buf) < strlen(conference->pin)) { + char *buf = pin_buf + strlen(pin_buf); + char term = '\0'; + + status = switch_ivr_collect_digits_count(session, buf, - sizeof(pin) - (unsigned int)strlen(pin), - (unsigned int)strlen(conference->pin) - (unsigned int)strlen(pin), + sizeof(pin_buf) - (unsigned int)strlen(pin_buf), + (unsigned int)strlen(conference->pin) - (unsigned int)strlen(pin_buf), "#", &term, 10000); - } + } - if (strcmp(pin, conference->pin)) { - if (conference->bad_pin_sound) { - conference_local_play_file(session, conference->bad_pin_sound, 20, NULL, 0); + pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0); + if (!pin_valid) { + /* zero the collected pin */ + memset(pin_buf,0,sizeof(pin_buf)); + + /* more friendliness */ + if (conference->bad_pin_sound) { + conference_local_play_file(session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf)); + } } + pin_retries --; + } + + if (!pin_valid) { goto done; } } - if (switch_test_flag(conference, CFLAG_LOCKED)) { + /* don't allow more callers if the conference is locked, unless we invited them */ + if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name); if (conference->locked_sound) { /* Answer the channel */

1 0

[commit] r3552 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 06 Dec '06

06 Dec '06

Author: mishehu Date: Wed Dec 6 01:00:05 2006 New Revision: 3552 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Log: Fixed a minor issue of not memsetting a char array CsvCDR. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README Wed Dec 6 01:00:05 2006 @@ -48,6 +48,11 @@ <param name="path" value=""/> value is the path where you want the output files (required) <param name="chanvars" value=""/> value is a comma separated list of channel variables to log. It can accept a wildcard (*) (optional) <param name="timezone" value=""/> value is utc for utc time, local for localtime. If not specified or incorrectly specified, localtime is assumed. + +Class: XmlCDR +Description: This works very similar to the PddCDR class, only that the output is formatted as xml. +Configuration: Section name: <xmlcdr> + The configuration options are identical to PddCDR. Class: MysqlCDR, located in mysqlcdr.h and mysqlcdr.cpp Description: This class logs the call detail record to a MySQL 4.1.x or greater database using prepared Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Wed Dec 6 01:00:05 2006 @@ -51,6 +51,7 @@ { memset(formattedcallstartdate,0,100); memset(formattedcallanswerdate,0,100); + memset(formattedcalltransferdate,0,100); memset(formattedcallenddate,0,100); if(newchannel != 0)

1 0

[commit] r3551 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 05 Dec '06

05 Dec '06

Author: mishehu Date: Tue Dec 5 18:26:06 2006 New Revision: 3551 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Log: Fixed a minor reversal of order on the call times in MysqlCDR::process_record() Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Tue Dec 5 18:26:06 2006 @@ -336,10 +336,11 @@ set_mysql_time(tm3,my_calltransferdate); set_mysql_time(tm4,my_calltransferdate); + // Why is this out of order? I don't know, it doesn't make sense. add_parameter(my_callstartdate,MYSQL_TYPE_DATETIME); add_parameter(my_callanswerdate,MYSQL_TYPE_DATETIME); - add_parameter(my_calltransferdate,MYSQL_TYPE_DATETIME); add_parameter(my_callenddate,MYSQL_TYPE_DATETIME); + add_parameter(my_calltransferdate,MYSQL_TYPE_DATETIME); add_parameter(originated,MYSQL_TYPE_TINY); add_string_parameter(clid,clid_length,MYSQL_TYPE_VAR_STRING,0);

1 0