<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16529] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16529">16529</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-27 21:13:57 -0600 (Wed, 27 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make caller id per account option available. Needs to wipe out the ~/.fscomm/conf/freeswitch.xml file, sorry.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconffreeswitchxml">freeswitch/trunk/fscomm/conf/freeswitch.xml</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommfshosth">freeswitch/trunk/fscomm/fshost.h</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogcpp">freeswitch/trunk/fscomm/preferences/accountdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogui">freeswitch/trunk/fscomm/preferences/accountdialog.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16528 => 16529)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-28 01:12:34 UTC (rev 16528)
+++ freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-28 03:13:57 UTC (rev 16529)
</span><span class="lines">@@ -1,102 +1,102 @@
</span><span class="cx"> <?xml version="1.0"?>
</span><span class="cx"> <document type="freeswitch/xml">
</span><del>- <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
- <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
- <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
- <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
- <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
- <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
- <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
- <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/>
- <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
- <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
</del><ins>+ <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
+ <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
+ <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
+ <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+ <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
+ <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
+ <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
+ <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/>
+ <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
+ <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
</ins><span class="cx">
</span><del>- <section name="configuration" description="Various Configuration">
- <configuration name="cdr_csv.conf" description="CDR CSV Format">
- <settings>
- <param name="default-template" value="example"/>
- <param name="rotate-on-hup" value="true"/>
- <param name="legs" value="a"/>
- </settings>
- <templates>
- <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"</template>
- </templates>
- </configuration>
</del><ins>+ <section name="configuration" description="Various Configuration">
+ <configuration name="cdr_csv.conf" description="CDR CSV Format">
+ <settings>
+ <param name="default-template" value="example"/>
+ <param name="rotate-on-hup" value="true"/>
+ <param name="legs" value="a"/>
+ </settings>
+ <templates>
+ <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"</template>
+ </templates>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="console.conf" description="Console Logger">
- <mappings>
- <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
- </mappings>
- <settings>
- <param name="colorize" value="true"/>
- <param name="loglevel" value="$${console_loglevel}"/>
- </settings>
- </configuration>
</del><ins>+ <configuration name="console.conf" description="Console Logger">
+ <mappings>
+ <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
+ </mappings>
+ <settings>
+ <param name="colorize" value="true"/>
+ <param name="loglevel" value="$${console_loglevel}"/>
+ </settings>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="enum.conf" description="ENUM Module">
- <settings>
- <param name="default-root" value="e164.org"/>
- <param name="default-isn-root" value="freenum.org"/>
- <param name="query-timeout" value="10"/>
- <param name="auto-reload" value="true"/>
- </settings>
- <routes>
- <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/softphone/$1"/>
- </routes>
- </configuration>
</del><ins>+ <configuration name="enum.conf" description="ENUM Module">
+ <settings>
+ <param name="default-root" value="e164.org"/>
+ <param name="default-isn-root" value="freenum.org"/>
+ <param name="query-timeout" value="10"/>
+ <param name="auto-reload" value="true"/>
+ </settings>
+ <routes>
+ <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/softphone/$1"/>
+ </routes>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="qsettings.conf" description="configures our mod_qsettings">
- <bindings value="configuration" />
- </configuration>
</del><ins>+ <configuration name="qsettings.conf" description="configures our mod_qsettings">
+ <bindings value="configuration" />
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="local_stream.conf" description="stream files from local dir">
- <directory name="moh/48000" path="$${base_dir}/sounds/music/48000">
- <param name="rate" value="48000"/>
- <param name="shuffle" value="true"/>
- <param name="channels" value="1"/>
- <param name="interval" value="10"/>
- <param name="timer-name" value="soft"/>
- </directory>
- </configuration>
</del><ins>+ <configuration name="local_stream.conf" description="stream files from local dir">
+ <directory name="moh/48000" path="$${base_dir}/sounds/music/48000">
+ <param name="rate" value="48000"/>
+ <param name="shuffle" value="true"/>
+ <param name="channels" value="1"/>
+ <param name="interval" value="10"/>
+ <param name="timer-name" value="soft"/>
+ </directory>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="logfile.conf" description="File Logging">
- <settings>
- <param name="rotate-on-hup" value="true"/>
- </settings>
- <profiles>
- <profile name="default">
- <settings>
- </settings>
- <mappings>
- <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
- </mappings>
- </profile>
- </profiles>
- </configuration>
</del><ins>+ <configuration name="logfile.conf" description="File Logging">
+ <settings>
+ <param name="rotate-on-hup" value="true"/>
+ </settings>
+ <profiles>
+ <profile name="default">
+ <settings>
+ </settings>
+ <mappings>
+ <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
+ </mappings>
+ </profile>
+ </profiles>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="modules.conf" description="Modules">
- <modules>
- <load module="mod_console"/>
- <load module="mod_logfile"/>
- <load module="mod_enum"/>
- <load module="mod_cdr_csv"/>
- <load module="mod_sofia"/>
- <load module="mod_loopback"/>
- <load module="mod_commands"/>
- <load module="mod_dptools"/>
- <load module="mod_dialplan_xml"/>
- <load module="mod_voipcodecs"/>
- <load module="mod_ilbc"/>
- <load module="mod_speex"/>
- <load module="mod_celt"/>
- <load module="mod_siren"/>
- <load module="mod_sndfile"/>
- <load module="mod_tone_stream"/>
- <load module="mod_local_stream"/>
- <load module="mod_portaudio"/>
- <load module="mod_event_socket"/>
- </modules>
- </configuration>
</del><ins>+ <configuration name="modules.conf" description="Modules">
+ <modules>
+ <load module="mod_console"/>
+ <load module="mod_logfile"/>
+ <load module="mod_enum"/>
+ <load module="mod_cdr_csv"/>
+ <load module="mod_sofia"/>
+ <load module="mod_loopback"/>
+ <load module="mod_commands"/>
+ <load module="mod_dptools"/>
+ <load module="mod_dialplan_xml"/>
+ <load module="mod_voipcodecs"/>
+ <load module="mod_ilbc"/>
+ <load module="mod_speex"/>
+ <load module="mod_celt"/>
+ <load module="mod_siren"/>
+ <load module="mod_sndfile"/>
+ <load module="mod_tone_stream"/>
+ <load module="mod_local_stream"/>
+ <load module="mod_portaudio"/>
+ <load module="mod_event_socket"/>
+ </modules>
+ </configuration>
</ins><span class="cx">
</span><span class="cx"> <configuration name="portaudio.conf" description="Soundcard Endpoint">
</span><span class="cx"> <settings>
</span><span class="lines">@@ -125,166 +125,185 @@
</span><span class="cx"> </settings>
</span><span class="cx"> </configuration>
</span><span class="cx">
</span><del>- <configuration name="post_load_modules.conf" description="Modules">
- <modules>
- </modules>
- </configuration>
</del><ins>+ <configuration name="post_load_modules.conf" description="Modules">
+ <modules>
+ </modules>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="sofia.conf" description="sofia Endpoint">
- <global_settings>
- <param name="log-level" value="0"/>
- <param name="auto-restart" value="true"/>
- <param name="debug-presence" value="0"/>
- </global_settings>
- <profiles>
- <profile name="softphone">
- <settings>
- <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
- <param name="user-agent-string" value="FreeSWITCH/FSComm"/>
- <!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
- <param name="debug" value="0"/>
- <param name="sip-trace" value="no"/>
- <param name="context" value="public"/>
- <param name="rfc2833-pt" value="101"/>
- <!-- port to bind to for sip traffic -->
- <param name="sip-port" value="12345"/>
- <param name="dialplan" value="XML"/>
- <param name="dtmf-duration" value="100"/>
- <param name="codec-prefs" value="$${codec_prefs}"/>
- <param name="use-rtp-timer" value="true"/>
- <param name="rtp-timer-name" value="soft"/>
- <!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
- <param name="rtp-ip" value="$${local_ip_v4}"/>
- <!-- ip address to bind to, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
- <param name="sip-ip" value="$${local_ip_v4}"/>
- <param name="hold-music" value="$${hold_music}"/>
- <param name="apply-nat-acl" value="rfc1918"/>
- <!--<param name="enable-timer" value="false"/>-->
- <!--<param name="enable-100rel" value="true"/>-->
- <!--<param name="minimum-session-expires" value="120"/>-->
- <!--<param name="dtmf-type" value="info"/>-->
- <param name="manage-presence" value="false"/>
- <!--<param name="bitpacking" value="aal2"/> -->
- <param name="max-proceeding" value="3"/>
- <!--<param name="session-timeout" value="120"/>-->
- <!--set to 'greedy' if you want your codec list to take precedence -->
- <param name="inbound-codec-negotiation" value="generous"/>
- <!-- if you want to send any special bind params of your own -->
- <!--<param name="bind-params" value="transport=udp"/>-->
- <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
- <!--<param name="inbound-late-negotiation" value="true"/>-->
- <!--<param name="accept-blind-reg" value="true"/> -->
- <!--<param name="accept-blind-auth" value="true"/> -->
- <!--<param name="suppress-cng" value="true"/> -->
- <param name="nonce-ttl" value="60"/>
- <!--<param name="NDLB-broken-auth-hash" value="true"/>-->
- <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
- <param name="auth-calls" value="false"/>
- <param name="auth-all-packets" value="false"/>
- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
- <param name="ext-sip-ip" value="$${external_sip_ip}"/>
- <!-- rtp inactivity timeout -->
- <param name="rtp-timeout-sec" value="300"/>
- <param name="rtp-hold-timeout-sec" value="1800"/>
- <!-- VAD choose one (out is a good choice); -->
- <!-- <param name="vad" value="in"/> -->
- <!-- <param name="vad" value="out"/> -->
- <!-- <param name="vad" value="both"/> -->
- <param name="disable-register" value="true"/>
- <!--<param name="NDLB-force-rport" value="true"/>-->
- <param name="challenge-realm" value="auto_from"/>
- <!--<param name="disable-rtp-auto-adjust" value="true"/>-->
- <!--<param name="inbound-use-callid-as-uuid" value="true"/>-->
- <!--<param name="outbound-use-uuid-as-callid" value="true"/>-->
- <!--<param name="auto-rtp-bugs" data="clear"/>-->
- </settings>
- </profile>
- </profiles>
- </configuration>
</del><ins>+ <configuration name="sofia.conf" description="sofia Endpoint">
+ <global_settings>
+ <param name="log-level" value="0"/>
+ <param name="auto-restart" value="true"/>
+ <param name="debug-presence" value="0"/>
+ </global_settings>
+ <profiles>
+ <profile name="softphone">
+ <settings>
+ <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
+ <param name="user-agent-string" value="FreeSWITCH/FSComm"/>
+ <!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
+ <param name="debug" value="0"/>
+ <param name="sip-trace" value="no"/>
+ <param name="context" value="public"/>
+ <param name="rfc2833-pt" value="101"/>
+ <!-- port to bind to for sip traffic -->
+ <param name="sip-port" value="12345"/>
+ <param name="dialplan" value="XML"/>
+ <param name="dtmf-duration" value="100"/>
+ <param name="codec-prefs" value="$${codec_prefs}"/>
+ <param name="use-rtp-timer" value="true"/>
+ <param name="rtp-timer-name" value="soft"/>
+ <!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
+ <param name="rtp-ip" value="$${local_ip_v4}"/>
+ <!-- ip address to bind to, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
+ <param name="sip-ip" value="$${local_ip_v4}"/>
+ <param name="hold-music" value="$${hold_music}"/>
+ <param name="apply-nat-acl" value="rfc1918"/>
+ <!--<param name="enable-timer" value="false"/>-->
+ <!--<param name="enable-100rel" value="true"/>-->
+ <!--<param name="minimum-session-expires" value="120"/>-->
+ <!--<param name="dtmf-type" value="info"/>-->
+ <param name="manage-presence" value="false"/>
+ <!--<param name="bitpacking" value="aal2"/> -->
+ <param name="max-proceeding" value="3"/>
+ <!--<param name="session-timeout" value="120"/>-->
+ <!--set to 'greedy' if you want your codec list to take precedence -->
+ <param name="inbound-codec-negotiation" value="generous"/>
+ <!-- if you want to send any special bind params of your own -->
+ <!--<param name="bind-params" value="transport=udp"/>-->
+ <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
+ <!--<param name="inbound-late-negotiation" value="true"/>-->
+ <!--<param name="accept-blind-reg" value="true"/> -->
+ <!--<param name="accept-blind-auth" value="true"/> -->
+ <!--<param name="suppress-cng" value="true"/> -->
+ <param name="nonce-ttl" value="60"/>
+ <!--<param name="NDLB-broken-auth-hash" value="true"/>-->
+ <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
+ <param name="auth-calls" value="false"/>
+ <param name="auth-all-packets" value="false"/>
+ <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
+ <param name="ext-sip-ip" value="$${external_sip_ip}"/>
+ <!-- rtp inactivity timeout -->
+ <param name="rtp-timeout-sec" value="300"/>
+ <param name="rtp-hold-timeout-sec" value="1800"/>
+ <!-- VAD choose one (out is a good choice); -->
+ <!-- <param name="vad" value="in"/> -->
+ <!-- <param name="vad" value="out"/> -->
+ <!-- <param name="vad" value="both"/> -->
+ <param name="disable-register" value="true"/>
+ <!--<param name="NDLB-force-rport" value="true"/>-->
+ <param name="challenge-realm" value="auto_from"/>
+ <!--<param name="disable-rtp-auto-adjust" value="true"/>-->
+ <!--<param name="inbound-use-callid-as-uuid" value="true"/>-->
+ <!--<param name="outbound-use-uuid-as-callid" value="true"/>-->
+ <!--<param name="auto-rtp-bugs" data="clear"/>-->
+ </settings>
+ </profile>
+ </profiles>
+ </configuration>
</ins><span class="cx">
</span><del>- <configuration name="switch.conf" description="Core Configuration">
- <cli-keybindings>
- <key name="1" value="help"/>
- <key name="2" value="status"/>
- <key name="3" value="pa answer"/>
- <key name="4" value="pa hangup"/>
- <key name="5" value="sofia status"/>
- <key name="6" value="reloadxml"/>
- <key name="7" value="console loglevel 0"/>
- <key name="8" value="console loglevel 7"/>
- <key name="9" value="sofia status profile softphone"/>
- <key name="10" value="fsctl pause"/>
- <key name="11" value="fsctl resume"/>
- <key name="12" value="version"/>
- </cli-keybindings>
- <settings>
- <param name="colorize-console" value="true"/>
- <param name="max-sessions" value="20"/>
- <param name="sessions-per-second" value="5"/>
- <param name="loglevel" value="debug"/>
- <param name="crash-protection" value="false"/>
- <param name="dump-cores" value="yes"/>
- <param name="rtp-start-port" value="16384"/>
- <param name="rtp-end-port" value="16484"/>
- </settings>
- </configuration>
- </section>
</del><ins>+ <configuration name="switch.conf" description="Core Configuration">
+ <cli-keybindings>
+ <key name="1" value="help"/>
+ <key name="2" value="status"/>
+ <key name="3" value="pa answer"/>
+ <key name="4" value="pa hangup"/>
+ <key name="5" value="sofia status"/>
+ <key name="6" value="reloadxml"/>
+ <key name="7" value="console loglevel 0"/>
+ <key name="8" value="console loglevel 7"/>
+ <key name="9" value="sofia status profile softphone"/>
+ <key name="10" value="fsctl pause"/>
+ <key name="11" value="fsctl resume"/>
+ <key name="12" value="version"/>
+ </cli-keybindings>
+ <settings>
+ <param name="colorize-console" value="true"/>
+ <param name="max-sessions" value="20"/>
+ <param name="sessions-per-second" value="5"/>
+ <param name="loglevel" value="debug"/>
+ <param name="crash-protection" value="false"/>
+ <param name="dump-cores" value="yes"/>
+ <param name="rtp-start-port" value="16384"/>
+ <param name="rtp-end-port" value="16484"/>
+ </settings>
+ </configuration>
+ </section>
</ins><span class="cx">
</span><del>- <section name="dialplan" description="Regex/XML Dialplan">
- <context name="default">
- <extension name="codec_and_sip_uri">
- <condition field="destination_number" expression="^sip:(.*):(.*)$">
- <action application="bridge" data="{absolute_codec_string=$1}sofia/softphone/$2"/>
- </condition>
- </extension>
- <extension name="sip_uri">
- <condition field="destination_number" expression="^sip:(.*)$">
- <action application="bridge" data="sofia/softphone/$1"/>
- </condition>
- </extension>
- <extension name="codec_and_number">
- <condition field="destination_number" expression="^(.*):(.*)@(.*)$">
- <action application="bridge" data="{absolute_codec_string=$1}sofia/gateway/$3/$2"/>
- </condition>
- </extension>
- <extension name="number">
- <condition field="destination_number" expression="^(.*)@(.*)$">
- <action application="bridge" data="sofia/gateway/$2/$1"/>
- </condition>
- </extension>
- <extension name="number">
- <condition field="destination_number" expression="^(.*)$">
</del><ins>+ <section name="dialplan" description="Regex/XML Dialplan">
+ <context name="default">
+ <extension name="codec_and_sip_uri">
+ <condition field="destination_number" expression="^sip:(.*):(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="{absolute_codec_string=$1}sofia/softphone/$2"/>
+ </condition>
+ </extension>
+ <extension name="sip_uri">
+ <condition field="destination_number" expression="^sip:(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="sofia/softphone/$1"/>
+ </condition>
+ </extension>
+ <extension name="codec_and_number">
+ <condition field="destination_number" expression="^(.*):(.*)@(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="{absolute_codec_string=$1}sofia/gateway/$3/$2"/>
+ </condition>
+ </extension>
+ <extension name="number">
+ <condition field="destination_number" expression="^(.*)@(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="sofia/gateway/$2/$1"/>
+ </condition>
+ </extension>
+ <extension name="number">
+ <condition field="destination_number" expression="^(.*)$">
</ins><span class="cx"> <!-- Default gateway is set by FSComm when default account is selected -->
</span><del>- <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
- </condition>
- </extension>
- </context>
- <context name="public">
- <extension name="public_extensions">
- <condition field="$${auto_answer}" expression="^true$"/>
- <condition field="destination_number" expression="^(.*)$">
- <action application="info"/>
- <action application="bridge" data="portaudio/auto_answer"/>
- </condition>
- </extension>
- <extension name="public_extensions">
- <condition field="${sip_to_params}" expression="intercom=true"/>
- <condition field="${alert_info}" expression="Ring;Answer"/>
- <condition field="destination_number" expression="^(.*)$">
- <action application="info"/>
- <action application="bridge" data="portaudio/auto_answer"/>
- </condition>
- </extension>
- <extension name="public_extensions">
- <condition field="destination_number" expression="^(.*)$">
- <action application="info"/>
- <action application="set" data="ringback=${us-ring}"/>
- <action application="pre_answer"/>
- <action application="bridge" data="portaudio"/>
- </condition>
- </extension>
- </context>
- </section>
</del><ins>+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
+ </condition>
+ </extension>
+ </context>
+ <context name="public">
+ <extension name="public_extensions">
+ <condition field="$${auto_answer}" expression="^true$"/>
+ <condition field="destination_number" expression="^(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="portaudio/auto_answer"/>
+ </condition>
+ </extension>
+ <extension name="public_extensions">
+ <condition field="${sip_to_params}" expression="intercom=true"/>
+ <condition field="${alert_info}" expression="Ring;Answer"/>
+ <condition field="destination_number" expression="^(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="bridge" data="portaudio/auto_answer"/>
+ </condition>
+ </extension>
+ <extension name="public_extensions">
+ <condition field="destination_number" expression="^(.*)$">
+ <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+ <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+ <action application="info"/>
+ <action application="set" data="ringback=${us-ring}"/>
+ <action application="pre_answer"/>
+ <action application="bridge" data="portaudio"/>
+ </condition>
+ </extension>
+ </context>
+ </section>
</ins><span class="cx"> </document>
</span><del>-
-
</del></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16528 => 16529)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-28 01:12:34 UTC (rev 16528)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-28 03:13:57 UTC (rev 16529)
</span><span class="lines">@@ -485,3 +485,22 @@
</span><span class="cx"> }
</span><span class="cx"> qDebug() << "\n\n";
</span><span class="cx"> }
</span><ins>+
+QSharedPointer<Account> FSHost::getAccountByName(QString accStr)
+{
+ foreach(QSharedPointer<Account> acc, _accounts.values())
+ {
+ if (acc.data()->getName() == accStr)
+ return acc;
+ }
+ return QSharedPointer<Account>();
+}
+
+QSharedPointer<Account> FSHost::getCurrentDefaultAccount()
+{
+ QSettings settings;
+ settings.beginGroup("FreeSWITCH/conf/globals");
+ QString accString = settings.value("default_gateway").toString();
+ settings.endGroup();
+ return getAccountByName(accString);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16528 => 16529)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h 2010-01-28 01:12:34 UTC (rev 16528)
+++ freeswitch/trunk/fscomm/fshost.h 2010-01-28 03:13:57 UTC (rev 16529)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> QSharedPointer<Call> getCurrentActiveCall();
</span><span class="cx"> QList<QSharedPointer<Account> > getAccounts() { return _accounts.values(); }
</span><span class="cx"> QSharedPointer<Account> getAccountByUUID(QString uuid);
</span><ins>+ QSharedPointer<Account> getCurrentDefaultAccount();
+ QSharedPointer<Account> getAccountByName(QString accStr);
</ins><span class="cx"> void accountReloadCmd(QSharedPointer<Account> acc);
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16528 => 16529)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-28 01:12:34 UTC (rev 16528)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-28 03:13:57 UTC (rev 16529)
</span><span class="lines">@@ -239,6 +239,36 @@
</span><span class="cx"> QString dialstring = QInputDialog::getText(this, tr("Make new call"),
</span><span class="cx"> tr("Number to dial:"), QLineEdit::Normal, NULL,&ok);
</span><span class="cx">
</span><ins>+ QSharedPointer<Account> acc = g_FSHost.getCurrentDefaultAccount();
+ if (!acc.isNull()) {
+ QSettings settings;
+ settings.beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways/");
+ settings.beginGroup(acc.data()->getUUID());
+ settings.beginGroup("gateway/global_vars");
+ QString cidName = settings.value("caller_id_name").toString();
+ QString cidNum = settings.value("caller_id_num").toString();
+ settings.endGroup();
+ settings.endGroup();
+ settings.endGroup();
+
+ if (cidName.isEmpty()) {
+ settings.beginGroup("FreeSWITCH/conf/portaudio.conf/settings/params");
+ cidName = settings.value("cid-name").toString();
+ settings.endGroup();
+ }
+ if (cidNum.isEmpty()) {
+ settings.beginGroup("FreeSWITCH/conf/portaudio.conf/settings/params");
+ cidNum = settings.value("cid-num").toString();
+ settings.endGroup();
+ }
+
+ /* Set the vars for this call */
+ switch_core_set_variable("fscomm_caller_id_name", cidName.toAscii().data());
+ switch_core_set_variable("fscomm_caller_id_num", cidNum.toAscii().data());
+
+ qDebug() << "Name:" << cidName << "Num:" << cidNum;
+ }
+
</ins><span class="cx"> if (ok && !dialstring.isEmpty())
</span><span class="cx"> {
</span><span class="cx"> paCall(dialstring);
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16528 => 16529)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-28 01:12:34 UTC (rev 16528)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-28 03:13:57 UTC (rev 16529)
</span><span class="lines">@@ -137,6 +137,17 @@
</span><span class="cx"> _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
</span><span class="cx">
</span><span class="cx"> _settings->beginGroup(_accId);
</span><ins>+
+ _settings->beginGroup("gateway/global_vars");
+ if (ui->clidSettingsCombo->currentIndex() == 0)
+ {
+ _settings->remove("caller_id_name");
+ _settings->remove("caller_id_num");
+ } else {
+ _settings->setValue("caller_id_name", ui->sofiaCallerIDName->text());
+ _settings->setValue("caller_id_num", ui->sofiaCallerIDNum->text());
+ }
+ _settings->endGroup();
</ins><span class="cx">
</span><span class="cx"> _settings->beginGroup("gateway/attrs");
</span><span class="cx"> _settings->setValue("name", ui->sofiaGwNameEdit->text());
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.ui (16528 => 16529)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-28 01:12:34 UTC (rev 16528)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-28 03:13:57 UTC (rev 16529)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> <item row="9" column="1">
</span><span class="cx"> <widget class="QComboBox" name="clidSettingsCombo">
</span><span class="cx"> <property name="enabled">
</span><del>- <bool>false</bool>
</del><ins>+ <bool>true</bool>
</ins><span class="cx"> </property>
</span><span class="cx"> <item>
</span><span class="cx"> <property name="text">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>