- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5682 - freeswitch/trunk/src
by Freeswitch SVN 30 Aug '07

30 Aug '07

Author: anthm Date: Thu Aug 30 11:38:21 2007 New Revision: 5682 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: try to pass cause code on calls ended during early media Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Aug 30 11:38:21 2007 @@ -84,12 +84,14 @@ switch_event_t *event; loop_count++; - /* if you really want to make sure it's not ready, test it twice because it might be just a break */ - if (!switch_channel_ready(chan_a) && !switch_channel_ready(chan_a)) { + if (!switch_channel_ready(chan_a)) { break; } if ((b_state = switch_channel_get_state(chan_b)) >= CS_HANGUP) { + if (originator && !ans_a && !ans_b) { + switch_channel_hangup(chan_a, switch_channel_get_cause(chan_b)); + } break; } @@ -163,8 +165,7 @@ continue; } } - - + /* read audio from 1 channel and write it to the other */ status = switch_core_session_read_frame(session_a, &read_frame, -1, stream_id);

1 0

[commit] r5681 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 30 Aug '07

30 Aug '07

Author: anthm Date: Thu Aug 30 11:28:32 2007 New Revision: 5681 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: fix warning Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Thu Aug 30 11:28:32 2007 @@ -156,7 +156,8 @@ { switch_channel_t *channel; int in; - int x = 0, places[9] = { 0 }; + uint32_t x = 0; + int places[9] = { 0 }; char sbuf[13] = ""; switch_status_t status;

1 0

[commit] r5680 - freeswitch/trunk/src
by Freeswitch SVN 30 Aug '07

30 Aug '07

Author: mikej Date: Wed Aug 29 21:52:05 2007 New Revision: 5680 Modified: freeswitch/trunk/src/switch_odbc.c Log: silence picky compiler. Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Aug 29 21:52:05 2007 @@ -415,14 +415,14 @@ SWITCH_DECLARE(char *) switch_odbc_handle_get_error(switch_odbc_handle_t *handle, SQLHSTMT stmt) { - char buffer[SQL_MAX_MESSAGE_LENGTH + 1]; - char sqlstate[SQL_SQLSTATE_SIZE + 1]; + char buffer[SQL_MAX_MESSAGE_LENGTH + 1] = ""; + char sqlstate[SQL_SQLSTATE_SIZE + 1] = ""; SQLINTEGER sqlcode; SQLSMALLINT length; char *ret = NULL; if (SQLError(handle->env, handle->con, stmt, (SQLCHAR *)sqlstate, &sqlcode, (SQLCHAR *)buffer, sizeof(buffer), &length) == SQL_SUCCESS) { - ret = switch_mprintf("STATE: %s CODE %ld ERROR: %s\n", switch_str_nil(sqlstate), sqlcode, switch_str_nil(buffer)); + ret = switch_mprintf("STATE: %s CODE %ld ERROR: %s\n", sqlstate, sqlcode, buffer); }; return ret;

1 0

[commit] r5679 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Aug '07

30 Aug '07

Author: anthm Date: Wed Aug 29 20:25:06 2007 New Revision: 5679 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: cleanup 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 Aug 29 20:25:06 2007 @@ -610,10 +610,7 @@ cur = fnode; fnode = fnode->next; - if (cur->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(&cur->sh, &flags); - } else { + if (cur->type != NODE_TYPE_SPEECH) { switch_core_file_close(&cur->fh); } @@ -624,7 +621,7 @@ if (member->sh) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(member->sh, &flags); + switch_core_speech_close(&member->lsh, &flags); member->sh = NULL; } @@ -906,10 +903,7 @@ conference_file_node_t *fnode; switch_memory_pool_t *pool; - if (conference->fnode->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(conference->fnode->sh, &flags); - } else { + if (conference->fnode->type != NODE_TYPE_SPEECH) { switch_core_file_close(&conference->fnode->fh); } @@ -952,10 +946,7 @@ cur = fnode; fnode = fnode->next; - if (cur->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(&cur->sh, &flags); - } else { + if (cur->type != NODE_TYPE_SPEECH) { switch_core_file_close(&cur->fh); } @@ -1003,7 +994,7 @@ if (conference->sh) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(conference->sh, &flags); + switch_core_speech_close(&conference->lsh, &flags); conference->sh = NULL; } @@ -1673,10 +1664,7 @@ conference_file_node_t *fnode; switch_memory_pool_t *pool; - if (member->fnode->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(&member->fnode->sh, &flags); - } else { + if (member->fnode->type != NODE_TYPE_SPEECH) { switch_core_file_close(&member->fnode->fh); }

1 0

[commit] r5678 - freeswitch/trunk/src
by Freeswitch SVN 29 Aug '07

29 Aug '07

Author: mikej Date: Wed Aug 29 16:38:00 2007 New Revision: 5678 Modified: freeswitch/trunk/src/switch_console.c Log: silence picky compiler. Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Wed Aug 29 16:38:00 2007 @@ -183,7 +183,7 @@ static char prompt_str[512] = ""; char * prompt(EditLine *e) { - if (switch_strlen_zero(prompt_str)) { + if (*prompt_str == '\0') { gethostname(hostname, sizeof(hostname)); snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", hostname); }

1 0

[commit] r5677 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 29 Aug '07

29 Aug '07

Author: anthm Date: Wed Aug 29 15:33:27 2007 New Revision: 5677 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: c'mon wtf Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Wed Aug 29 15:33:27 2007 @@ -88,7 +88,8 @@ if(!switch_strlen_zero(logdir)) { if ((path = switch_mprintf("%s/xml_cdr/%s.cdr.xml", logdir, switch_core_session_get_uuid(session)))) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - write(fd, xml_text, (unsigned) strlen(xml_text)); + int wrote; + wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); close(fd); fd = -1; } else { @@ -160,7 +161,8 @@ if ((path = switch_mprintf("%s/%s.cdr.xml", globals.errLogDir, switch_core_session_get_uuid(session)))) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - write(fd, xml_text, (unsigned) strlen(xml_text)); + int wrote; + wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); close(fd); fd = -1; } else {

1 0

[commit] r5676 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 29 Aug '07

29 Aug '07

Author: anthm Date: Wed Aug 29 14:56:04 2007 New Revision: 5676 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: silly Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Aug 29 14:56:04 2007 @@ -53,8 +53,8 @@ { register unsigned int realsize = (unsigned int) (size * nmemb); struct config_data *config_data = data; - - write(config_data->fd, ptr, realsize); + int x; + x = write(config_data->fd, ptr, realsize); return realsize; }

1 0

[commit] r5675 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 29 Aug '07

29 Aug '07

Author: trixter Date: Wed Aug 29 10:37:54 2007 New Revision: 5675 Added: freeswitch/trunk/scripts/contrib/trixter/softphone.pl (contents, props changed) Log: initial softphone commit, works for outbound Added: freeswitch/trunk/scripts/contrib/trixter/softphone.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/softphone.pl Wed Aug 29 10:37:54 2007 @@ -0,0 +1,179 @@ +#!/usr/bin/perl +# -*- mode:cperl; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- +# +# FreeSWITCH Softphone +# Copyright (C) 2007, Bret McDanel <trixter AT 0xdecafbad.com> +# +# Version: MPL 1.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is FreeSWITCH Softphone +# +# The Initial Developer of the Original Code is +# Bret McDanel <trixter AT 0xdecafbad.com> +# Portions created by the Initial Developer are Copyright (C) +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Bret McDanel <trixter AT 0xdecafbad.com> +# +# softphone.pl -- FreeSWITCH softphone in perl +# +# + +##### +## +## This is the start of a GUI for FreeSWITCH[tm] using port audio as the channel endpoint. +## Right now there are a few things that do not work right: +## * events are not properly read +## * if remote party hangs up the client doesnt realize it +## * registration status is not displayed +## * no redial ability +## * no transfer, hold, etc +## * incoming calls cannot be detected, or answered +## +## It works for a single channel, and you can type anything into the dial window, if that matches some regexp +## in your dialplan the call will proceed. +## +##### + +use FreeSWITCH::Client; +use Data::Dumper; # used to print out myhash debug info +use Tk; +use strict; + + +# configure these +my $password = "ClueCon"; # the password for event socket +my $host = "localhost"; # the hostname to connect to +my $port = 8021; # the port to connect to + + +# random variables that we are going to use +my $window; +my $phonenumber; +my $callInProgress=0; +my $fs; +my $errorString = undef; + + +makeWindow(); +MainLoop; +$fs->sendmsg({'command' => "api pa hangup"}) unless !defined($fs); +print "We should hang up the calls, and any other cleanup here\n"; + + + +sub getEvent() { + if(defined $fs) { + my $reply = $fs->readhash(0); + if ($reply->{socketerror}) { + $errorString = "Got error: ".$reply->{socketerror}; + es_connect(); + } + + if ($reply->{body}) { + my $myhash = $reply->{event}; + print Dumper $myhash; + } + } else { + $errorString = "Connecting"; + es_connect(); + } +} + + +# this connects to the event socket +sub es_connect() +{ + $errorString = "Connecting to $host:$port"; + eval { + $fs = init FreeSWITCH::Client {-password => $password, -host => $host, -port => $port}; + if(defined $fs) { + $fs->sendmsg({'command' => 'event plain myevents'}); + } + } or do { + $errorString = "Error connecting - waiting for retry"; + sleep 5; + } + +} + + +sub makeWindow { + $window = MainWindow->new(); + $window->title("FreeSWITCH[tm] GUI"); + my $mainframe = $window->Frame()->pack(qw/-side top -padx 10 -expand true -fill both/); + + $mainframe->Entry(-textvariable => \$phonenumber)->pack(qw/-side top/); + my $dialpadframe = $mainframe->Frame()->pack(qw/-anchor s -pady 3/); + my $dialpadcol1 = $dialpadframe->Frame()->pack(qw/-side left -pady 3/); + my $dialpadcol2 = $dialpadframe->Frame()->pack(qw/-side left -pady 3/); + my $dialpadcol3 = $dialpadframe->Frame()->pack(qw/-side left -pady 3/); + my $errorMsgs = $mainframe->Label(-textvariable => \$errorString)->pack(qw/-side bottom/); + my $buttonframe = $mainframe->Frame()->pack(qw/-side bottom/); + + # I really dont like this method, but I dont know Tk that well + # basically we have a timer that will call getEvent() 1ms after its finished running + # to see about getting more events - threads dont work because you cant share the FreeSWITCH::Client class + # forking doesnt work because $fs is always undefined from the GUI side + # or maybe you can, I dont know perl all that well either. + my $timerid = $window->repeat(100,\&getEvent); + +# set up the keys + my $phonebutton1 = $dialpadcol1->Button(-text => '1', -command => sub{sendDTMF("1")})->pack(qw/-side top/); + my $phonebutton2 = $dialpadcol2->Button(-text => '2', -command => sub{sendDTMF("2")})->pack(qw/-side top/); + my $phonebutton3 = $dialpadcol3->Button(-text => '3', -command => sub{sendDTMF("3")})->pack(qw/-side top/); + my $phonebutton4 = $dialpadcol1->Button(-text => '4', -command => sub{sendDTMF("4")})->pack(qw/-side top/); + my $phonebutton5 = $dialpadcol2->Button(-text => '5', -command => sub{sendDTMF("5")})->pack(qw/-side top/); + my $phonebutton6 = $dialpadcol3->Button(-text => '6', -command => sub{sendDTMF("6")})->pack(qw/-side top/); + my $phonebutton7 = $dialpadcol1->Button(-text => '7', -command => sub{sendDTMF("7")})->pack(qw/-side top/); + my $phonebutton8 = $dialpadcol2->Button(-text => '8', -command => sub{sendDTMF("8")})->pack(qw/-side top/); + my $phonebutton9 = $dialpadcol3->Button(-text => '9', -command => sub{sendDTMF("9")})->pack(qw/-side top/); + my $phonebuttonstar = $dialpadcol1->Button(-text => '*', -command => sub{sendDTMF("*")})->pack(qw/-side top/); + my $phonebutton0 = $dialpadcol2->Button(-text => '0', -command => sub{sendDTMF("0")})->pack(qw/-side top/); + my $phonebuttonpound = $dialpadcol3->Button(-text => '#', -command => sub{sendDTMF("#")})->pack(qw/-side top/); + + + my $dialbutton = $buttonframe->Button(-text => 'Dial/Answer', -command => \&dialAnswer)->pack(qw/-side left/); + my $hangupbutton = $buttonframe->Button(-text => 'Hangup', -command => \&hangup)->pack(qw/-side right/); +} + +sub dialAnswer { + $callInProgress=1; + if(defined($fs)) { + $fs->sendmsg({'command' => "api pa call $phonenumber"}); + } else { + $errorString = "Not connected!!!"; + } +} + +sub hangup { + $callInProgress=0; + $errorString = "hangup"; + $phonenumber = ""; + $fs->sendmsg({'command' => "api pa hangup"}) unless !defined($fs); +} + +sub sendDTMF{ + my $dtmf=shift; + if($callInProgress==1) { + if(defined($fs)) { + $fs->sendmsg({'command' => "api pa dtmf $dtmf"}) unless !defined($dtmf); + } else { + $errorString = "Not connected!"; + } + } else { + $phonenumber .= $dtmf unless !defined($dtmf); + } +}

1 0

[commit] r5674 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/endpoints/mod_woomera mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 18:44:02 2007 New Revision: 5674 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr_originate.c Log: little cleanup, remove unnecessary (char *) cast. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Aug 28 18:44:02 2007 @@ -2650,12 +2650,11 @@ cid_name, cid_num, ldl_session_get_ip(dlsession), - ldl_session_get_value(dlsession, - "ani"), - ldl_session_get_value(dlsession, - "aniii"), - ldl_session_get_value(dlsession, - "rdnis"), (char *) modname, context, + ldl_session_get_value(dlsession, "ani"), + ldl_session_get_value(dlsession, "aniii"), + ldl_session_get_value(dlsession, "rdnis"), + modname, + context, exten)) != 0) { char name[128]; snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Aug 28 18:44:02 2007 @@ -1107,8 +1107,9 @@ iaxevent->ies.calling_ani, NULL, NULL, - (char *) modname, - iaxevent->ies.called_context, iaxevent->ies.called_number)) != 0) { + modname, + iaxevent->ies.called_context, + iaxevent->ies.called_number)) != 0) { char name[128]; snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Aug 28 18:44:02 2007 @@ -1600,8 +1600,8 @@ } if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - NULL, - dialplan, cid_name, cid_num, NULL, NULL, NULL, NULL, (char *) modname, NULL, + NULL, dialplan, cid_name, cid_num, + NULL, NULL, NULL, NULL, modname, NULL, dest)) != 0) { char name[128]; snprintf(name, sizeof(name), "PortAudio/%s", 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 Tue Aug 28 18:44:02 2007 @@ -1935,7 +1935,10 @@ tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, profile->dialplan, - displayname, from_user, network_ip, NULL, NULL, NULL, MODNAME, context, destination_number); + displayname, + from_user, + network_ip, + NULL, NULL, NULL, MODNAME, context, destination_number); if (tech_pvt->caller_profile) { Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Tue Aug 28 18:44:02 2007 @@ -1059,7 +1059,15 @@ if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, tech_pvt->profile->dialplan, - cid_name, cid_num, ip, NULL, NULL, NULL, (char *) modname, NULL, exten)) != 0) { + cid_name, + cid_num, + ip, + NULL, + NULL, + NULL, + modname, + NULL, + exten)) != 0) { char name[128]; snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); 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 Tue Aug 28 18:44:02 2007 @@ -2430,9 +2430,8 @@ return JS_FALSE; } - caller_profile = switch_caller_profile_new(pool, - username, dialplan, cid_name, cid_num, network_addr, ani, aniii, rdnis, (char *) modname, context, - dest); + caller_profile = switch_caller_profile_new(pool,username, dialplan, cid_name, cid_num, network_addr, + ani, aniii, rdnis, modname, context, dest); if (switch_ivr_originate(session, &peer_session, &jss->cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 28 18:44:02 2007 @@ -500,10 +500,12 @@ } new_profile = switch_caller_profile_new(pool, - NULL, - NULL, - cid_name_override, cid_num_override, NULL, NULL, NULL, NULL, __FILE__, NULL, - chan_data); + NULL, + NULL, + cid_name_override, + cid_num_override, + NULL, NULL, NULL, NULL, __FILE__, NULL, + chan_data); } }

1 0

[commit] r5673 - freeswitch/trunk/src
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 17:55:30 2007 New Revision: 5673 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: simplify by using switch_caller_profile_clone and switch_caller_profile_dup. Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 28 17:55:30 2007 @@ -470,38 +470,18 @@ } caller_caller_profile = caller_profile_override ? caller_profile_override : switch_channel_get_caller_profile(caller_channel); + new_profile = switch_caller_profile_clone(session, caller_caller_profile); + new_profile->destination_number = chan_data; - if (!cid_name_override) { - cid_name_override = caller_caller_profile->caller_id_name; + if (cid_name_override) { + new_profile->caller_id_name = cid_name_override; } - if (!cid_num_override) { - cid_num_override = caller_caller_profile->caller_id_number; + if (cid_num_override) { + new_profile->caller_id_number = cid_num_override; } - new_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - caller_caller_profile->username, - caller_caller_profile->dialplan, - cid_name_override, - cid_num_override, - caller_caller_profile->network_addr, - NULL, - NULL, - caller_caller_profile->rdnis, - caller_caller_profile->source, caller_caller_profile->context, chan_data); - new_profile->flags = caller_caller_profile->flags; - new_profile->caller_ton = caller_caller_profile->caller_ton; - new_profile->caller_numplan = caller_caller_profile->caller_numplan; - new_profile->destination_number_ton = caller_caller_profile->destination_number_ton; - new_profile->destination_number_numplan = caller_caller_profile->destination_number_numplan; pool = NULL; } else { - if (!cid_name_override) { - cid_name_override = "FreeSWITCH"; - } - if (!cid_num_override) { - cid_num_override = "0000000000"; - } - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); status = SWITCH_STATUS_TERM; @@ -509,21 +489,16 @@ } if (caller_profile_override) { - new_profile = switch_caller_profile_new(pool, - caller_profile_override->username, - caller_profile_override->dialplan, - caller_profile_override->caller_id_name, - caller_profile_override->caller_id_number, - caller_profile_override->network_addr, - caller_profile_override->ani, - caller_profile_override->aniii, - caller_profile_override->rdnis, - caller_profile_override->source, caller_profile_override->context, chan_data); - new_profile->caller_ton = caller_profile_override->caller_ton; - new_profile->caller_numplan = caller_profile_override->caller_numplan; - new_profile->destination_number_ton = caller_profile_override->destination_number_ton; - new_profile->destination_number_numplan = caller_profile_override->destination_number_numplan; + new_profile = switch_caller_profile_dup(pool, caller_profile_override); + new_profile->destination_number = chan_data; } else { + if (!cid_name_override) { + cid_name_override = "FreeSWITCH"; + } + if (!cid_num_override) { + cid_num_override = "0000000000"; + } + new_profile = switch_caller_profile_new(pool, NULL, NULL,

1 0