<!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][16195] </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=16195">16195</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-07 00:43:51 -0600 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ok, we persist sofia configs. Code is there but not effective since we break accounts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconfsofiaconfxml">freeswitch/trunk/fscomm/conf/sofia.conf.xml</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowh">freeswitch/trunk/fscomm/mainwindow.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogcpp">freeswitch/trunk/fscomm/preferences/prefdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogh">freeswitch/trunk/fscomm/preferences/prefdialog.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogui">freeswitch/trunk/fscomm/preferences/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefsofiacpp">freeswitch/trunk/fscomm/preferences/prefsofia.cpp</a></li>
<li><a href="#freeswitchtrunkfscommresourcesqrc">freeswitch/trunk/fscomm/resources.qrc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconfsofiaconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/sofia.conf.xml (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/sofia.conf.xml 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/conf/sofia.conf.xml 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -10,117 +10,33 @@
</span><span class="cx"> <profiles>
</span><span class="cx"> <profile name="softphone">
</span><span class="cx"> <settings>
</span><del>- <param name="debug" value="${debug}" />
- <param name="shutdown-on-fail" value="${shutdown-on-fail}" />
- <param name="sip-trace" value="${sip-trace}" />
- <param name="odbc-dsn" value="${odbc-dsn}" />
- <param name="user-agent-string" value="${user-agent-string}" />
- <param name="auto-restart" value="${auto-restart}" />
- <param name="log-auth-failures" value="${log-auth-failures}" />
- <param name="dtmf-type" value="${dtmf-type}" />
- <param name="NDLB-force-rport" value="${NDLB-force-rport}" />
- <param name="auto-rtp-bugs" value="${auto-rtp-bugs}" />
- <param name="dbname" value="${dbname}" />
- <param name="presence-hosts" value="${presence-hosts}" />
- <param name="caller-id-type" value="${caller-id-type}" />
- <param name="record-template" value="${record-template}" />
- <param name="record-path" value="${record-path}" />
- <param name="inbound-bypass-media" value="${inbound-bypass-media}" />
- <param name="inbound-late-negotiation" value="${inbound-late-negotiation}" />
- <param name="rtp-autoflush-during-bridge" value="${rtp-autoflush-during-bridge}" />
- <param name="manual-redirect" value="${manual-redirect}" />
- <param name="inbound-proxy-media" value="${inbound-proxy-media}" />
- <param name="force-subscription-expires" value="${force-subscription-expires}" />
- <param name="send-message-query-on-register" value="${send-message-query-on-register}" />
- <param name="inbound-use-callid-as-uuid" value="${inbound-use-callid-as-uuid}" />
- <param name="outbound-use-uuid-as-callid" value="${outbound-use-uuid-as-callid}" />
- <param name="NDLB-received-in-nat-reg-contact" value="${NDLB-received-in-nat-reg-contact}" />
- <param name="aggressive-nat-detection" value="${aggressive-nat-detection}" />
- <param name="disable-rtp-auto-adjust" value="${disable-rtp-auto-adjust}" />
- <param name="NDLB-support-asterisk-missing-srtp-auth" value="${NDLB-support-asterisk-missing-srtp-auth}" />
- <param name="NDLB-funny-stun" value="${NDLB-funny-stun}" />
- <param name="stun-enabled" value="${stun-enabled}" />
- <param name="stun-auto-disable" value="${stun-auto-disable}" />
- <param name="rfc2833-pt" value="${rfc2833-pt}" />
- <param name="cng-pt" value="${cng-pt}" />
- <param name="sip-port" value="${sip-port}" />
- <param name="vad" value="${vad}" />
- <param name="ext-rtp-ip" value="${ext-rtp-ip}" />
- <param name="rtp-ip" value="${rtp-ip}" />
- <param name="ext-sip-ip" value="${ext-sip-ip}" />
- <param name="local-network-acl" value="${local-network-acl}" />
- <param name="force-register-domain" value="${force-register-domain}" />
- <param name="force-register-db-domain" value="${force-register-db-domain}" />
- <param name="bind-params" value="${bind-params}" />
- <param name="sip-domain" value="${sip-domain}" />
- <param name="rtp-timer-name" value="${rtp-timer-name}" />
- <param name="hold-music" value="${hold-music}" />
- <param name="outbound-proxy" value="${outbound-proxy}" />
- <param name="session-timeout" value="${session-timeout}" />
- <param name="max-proceeding" value="${max-proceeding}" />
- <param name="rtp-timeout-sec" value="${rtp-timeout-sec}" />
- <param name="rtp-hold-timeout-sec" value="${rtp-hold-timeout-sec}" />
- <param name="disable-transfer" value="${disable-transfer}" />
- <param name="disable-register" value="${disable-register}" />
- <param name="media-option" value="${media-option}" />
- <param name="manage-presence" value="${manage-presence}" />
- <param name="manage-shared-appearance" value="${manage-shared-appearance}" />
- <param name="disable-srv" value="${disable-srv}" />
- <param name="disable-naptr" value="${disable-naptr}" />
- <param name="unregister-on-options-fail" value="${unregister-on-options-fail}" />
- <param name="require-secure-rtp" value="${require-secure-rtp}" />
- <param name="multiple-registrations" value="${multiple-registrations}" />
- <param name="suppress-cng" value="${suppress-cng}" />
- <param name="NDLB-broken-auth-hash" value="${NDLB-broken-auth-hash}" />
- <param name="NDLB-sendrecv-in-session" value="${NDLB-sendrecv-in-session}" />
- <param name="NDLB-allow-bad-iananame" value="${NDLB-allow-bad-iananame}" />
- <param name="pass-rfc2833" value="${pass-rfc2833}" />
- <param name="rtp-autoflush" value="${rtp-autoflush}" />
- <param name="rtp-autofix-timing" value="${rtp-autofix-timing}" />
- <param name="contact-user" value="${contact-user}" />
- <param name="nat-options-ping" value="${nat-options-ping}" />
- <param name="inbound-codec-negotiation" value="${inbound-codec-negotiation}" />
- <param name="disable-transcoding" value="${disable-transcoding}" />
- <param name="rtp-rewrite-timestamps" value="${rtp-rewrite-timestamps}" />
- <param name="auth-calls" value="${auth-calls}" />
- <param name="nonce-ttl" value="${nonce-ttl}" />
- <param name="accept-blind-reg" value="${accept-blind-reg}" />
- <param name="enable-3pcc" value="${enable-3pcc}" />
- <param name="accept-blind-auth" value="${accept-blind-auth}" />
- <param name="auth-all-packets" value="${auth-all-packets}" />
- <param name="full-id-in-dialplan" value="${full-id-in-dialplan}" />
- <param name="inbound-reg-force-matching-username" value="${inbound-reg-force-matching-username}" />
- <param name="enable-timer" value="${enable-timer}" />
- <param name="minimum-session-expires" value="${minimum-session-expires}" />
- <param name="enable-100rel" value="${enable-100rel}" />
- <param name="enable-compact-headers" value="${enable-compact-headers}" />
- <param name="pass-callee-id" value="${pass-callee-id}" />
- <param name="sql-in-transactions" value="${sql-in-transactions}" />
- <param name="enable-soa" value="${enable-soa}" />
- <param name="bitpacking" value="${bitpacking}" />
- <param name="username" value="${username}" />
- <param name="context" value="${context}" />
- <param name="apply-nat-acl" value="${apply-nat-acl}" />
- <param name="apply-inbound-acl" value="${apply-inbound-acl}" />
- <param name="apply-proxy-acl" value="${apply-proxy-acl}" />
- <param name="apply-register-acl" value="${apply-register-acl}" />
- <param name="alias" value="${alias}" />
- <param name="dialplan" value="${dialplan}" />
- <param name="max-calls" value="${max-calls}" />
- <param name="codec-prefs" value="${codec-prefs}" />
- <param name="inbound-codec-prefs" value="${inbound-codec-prefs}" />
- <param name="outbound-codec-prefs" value="${outbound-codec-prefs}" />
- <param name="challenge-realm" value="${challenge-realm}" />
- <param name="dtmf-duration" value="${dtmf-duration}" />
- <param name="tls" value="${tls}" />
- <param name="tls-bind-params" value="${tls-bind-params}" />
- <param name="tls-sip-port" value="${tls-sip-port}" />
- <param name="tls-cert-dir" value="${tls-cert-dir}" />
- <param name="tls-version" value="${tls-version}" />
- <param name="timer-T1" value="${timer-T1}" />
- <param name="timer-T1X64" value="${timer-T1X64}" />
- <param name="timer-T2" value="${timer-T2}" />
- <param name="timer-T4" value="${timer-T4}" />
</del><ins>+ <param name="user-agent-string" value="${user-agent-string)"/>
+ <param name="debug" value="${debug}"/>
+ <param name="sip-trace" value="${sip-trace}"/>
+ <param name="context" value="${context}"/>
+ <param name="rfc2833-pt" value="${rfc2833-pt}"/>
+ <param name="sip-port" value="${sip-port}"/>
+ <param name="dialplan" value="${dialplan}"/>
+ <param name="dtmf-duration" value="${dtmf-duration}"/>
+ <param name="codec-prefs" value="${codec_prefs}"/>
+ <param name="use-rtp-timer" value="${use-rtp-timer}"/>
+ <param name="rtp-timer-name" value="${rtp-timer-name}"/>
+ <param name="rtp-ip" value="${rtp-ip}"/>
+ <param name="sip-ip" value="${sip-ip}"/>
+ <param name="hold-music" value="${hold-music}"/>
+ <param name="apply-nat-acl" value="${apply-nat-acl}"/>
+ <param name="manage-presence" value="${manage-presence}"/>
+ <param name="max-proceeding" value="${max-proceeding}"/>
+ <param name="inbound-codec-negotiation" value="${inbound-codec-negotiation}"/>
+ <param name="nonce-ttl" value="${nonce-ttl}"/>
+ <param name="auth-calls" value="${auth-calls}"/>
+ <param name="auth-all-packets" value="${auth-all-packets}"/>
+ <param name="ext-rtp-ip" value="${ext-rtp-ip}"/>
+ <param name="ext-sip-ip" value="${ext-sip-ip}"/>
+ <param name="rtp-timeout-sec" value="${rtp-timeout-sec}"/>
+ <param name="rtp-hold-timeout-sec" value="${rtp-hold-timeout-sec}"/>
+ <param name="disable-register" value="${disable-register}"/>
+ <param name="challenge-realm" value="${challenge-realm}"/>
</ins><span class="cx"> </settings>
</span><span class="cx"> </profile>
</span><span class="cx"> </profiles>
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <switch.h>
</span><span class="cx"> #include <fshost.h>
</span><span class="cx"> #include <call.h>
</span><del>-#include <prefdialog.h>
</del><ins>+#include "preferences/prefdialog.h"
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class MainWindow;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.cpp (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> #include "prefdialog.h"
</span><span class="cx"> #include "ui_prefdialog.h"
</span><span class="cx"> #include "prefportaudio.h"
</span><ins>+#include "prefsofia.h"
</ins><span class="cx">
</span><span class="cx"> PrefDialog::PrefDialog(QWidget *parent) :
</span><span class="cx"> QDialog(parent),
</span><span class="lines">@@ -12,6 +13,7 @@
</span><span class="cx"> connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
</span><span class="cx">
</span><span class="cx"> _mod_portaudio = new PrefPortaudio(ui, this);
</span><ins>+ _mod_sofia = new PrefSofia(ui, this);
</ins><span class="cx"> readConfig();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -23,6 +25,7 @@
</span><span class="cx"> void PrefDialog::writeConfig()
</span><span class="cx"> {
</span><span class="cx"> _mod_portaudio->writeConfig();
</span><ins>+ /*_mod_sofia->writeConfig();*/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefDialog::changeEvent(QEvent *e)
</span><span class="lines">@@ -40,4 +43,5 @@
</span><span class="cx"> void PrefDialog::readConfig()
</span><span class="cx"> {
</span><span class="cx"> _mod_portaudio->readConfig();
</span><ins>+ /*_mod_sofia->readConfig();*/
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.h (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.h 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.h 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> #include <fshost.h>
</span><span class="cx">
</span><span class="cx"> class PrefPortaudio;
</span><ins>+class PrefSofia;
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class PrefDialog;
</span><span class="lines">@@ -29,6 +30,7 @@
</span><span class="cx"> QSettings *_settings;
</span><span class="cx"> Ui::PrefDialog *ui;
</span><span class="cx"> PrefPortaudio *_mod_portaudio;
</span><ins>+ PrefSofia *_mod_sofia;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.ui (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <string>General</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset resource="resources.qrc">
</del><ins>+ <iconset resource="../resources.qrc">
</ins><span class="cx"> <normaloff>:/images/pref_general.jpg</normaloff>:/images/pref_general.jpg</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> </item>
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> <string>Sofia</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset resource="resources.qrc">
</del><ins>+ <iconset resource="../resources.qrc">
</ins><span class="cx"> <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> </item>
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> <string>PortAudio</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset resource="resources.qrc">
</del><ins>+ <iconset resource="../resources.qrc">
</ins><span class="cx"> <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> </item>
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="3" column="1">
</span><del>- <widget class="QLineEdit" name="lineEdit">
</del><ins>+ <widget class="QLineEdit" name="sofiaDialplanEdit">
</ins><span class="cx"> <property name="text">
</span><span class="cx"> <string>XML</string>
</span><span class="cx"> </property>
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> <item row="2" column="1">
</span><span class="cx"> <widget class="QLineEdit" name="sofiaRtpIpEdit">
</span><span class="cx"> <property name="text">
</span><del>- <string>$${local_ip_v4}</string>
</del><ins>+ <string>auto</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> <item row="3" column="1">
</span><span class="cx"> <widget class="QLineEdit" name="sofiaSipIpEdit">
</span><span class="cx"> <property name="text">
</span><del>- <string>$${local_ip_v4}</string>
</del><ins>+ <string>auto</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="3" column="1">
</span><del>- <widget class="QSpinBox" name="spinBox">
</del><ins>+ <widget class="QSpinBox" name="sofiaDtmfDurationSpin">
</ins><span class="cx"> <property name="maximum">
</span><span class="cx"> <number>1000</number>
</span><span class="cx"> </property>
</span><span class="lines">@@ -887,7 +887,7 @@
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> <resources>
</span><del>- <include location="resources.qrc"/>
</del><ins>+ <include location="../resources.qrc"/>
</ins><span class="cx"> </resources>
</span><span class="cx"> <connections>
</span><span class="cx"> <connection>
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefsofiacpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefsofia.cpp (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefsofia.cpp 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/preferences/prefsofia.cpp 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -11,6 +11,11 @@
</span><span class="cx">
</span><span class="cx"> void PrefSofia::readConfig()
</span><span class="cx"> {
</span><ins>+ int guess_mask;
+ char guess_ip[80];
+ switch_find_local_ip(guess_ip, sizeof(guess_ip), &guess_mask, AF_INET);
+ _ui->sofiaRtpIpEdit->setText(QString(guess_ip));
+ _ui->sofiaSipIpEdit->setText(QString(guess_ip));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefSofia::writeConfig()
</span><span class="lines">@@ -18,8 +23,42 @@
</span><span class="cx"> _settings->beginGroup("FreeSWITCH/conf");
</span><span class="cx"> _settings->beginGroup("sofia.conf");
</span><span class="cx">
</span><ins>+ /* General Settings */
+ _settings->setValue("log-level", _ui->sofiaLogLevelSpin->value());
+ _settings->setValue("auto-restart", _ui->sofiaAutoRestartCombo->currentText());
+ _settings->setValue("debug-presence", _ui->sofiaDebugPresenceSpin->value());
+ _settings->setValue("rewrite-multicasted-fs-path", _ui->sofiaRewriteMulticastedFsPathCombo->currentText());
</ins><span class="cx">
</span><ins>+ /* Profile settings */
+ _settings->setValue("user-agent-string", _ui->sofiaUserAgentStringEdit->text());
+ _settings->setValue("debug", _ui->sofiaDebugSpin->value());
+ _settings->setValue("sip-trace", _ui->sofiaSipTraceCombo->currentText());
+ _settings->setValue("context", _ui->sofiaContextEdit->text());
+ _settings->setValue("rfc2833-pt", _ui->sofiaRfc2833PtEdit->text());
+ _settings->setValue("sip-port", _ui->sofiaSipPortSpin->value());
+ _settings->setValue("dialplan", _ui->sofiaDialplanEdit->text());
+ _settings->setValue("dtmf-duration", _ui->sofiaDtmfDurationSpin->value());
+ _settings->setValue("codec-prefs", _ui->sofiaCodecPrefsEdit->text());
+ _settings->setValue("use-rtp-timer", _ui->sofiaUseRtpTimerCombo->currentText());
+ _settings->setValue("rtp-timer-name", _ui->sofiaRtpTimerNameEdit->text());
+ _settings->setValue("rtp-ip", _ui->sofiaRtpIpEdit->text());
+ _settings->setValue("sip-ip", _ui->sofiaSipIpEdit->text());
+ _settings->setValue("hold-music", _ui->sofiaHoldMusicEdit->text());
+ _settings->setValue("apply-nat-acl", _ui->sofiaApplyNatAclEdit->text());
+ _settings->setValue("manage-presence", _ui->sofiaManagePresenceCombo->currentText());
+ _settings->setValue("max-proceeding", _ui->sofiaMaxProceedingEdit->text());
+ _settings->setValue("inbound-codec-negotiation", _ui->sofiaInboundCodecNegotiationCombo->currentText());
+ _settings->setValue("nonce-ttl", _ui->sofiaNonceTtlSpin->value());
+ _settings->setValue("auth-calls", _ui->sofiaAuthCallsCombo->currentText());
+ _settings->setValue("auth-all-packets", _ui->sofiaAuthAllPacketsCombo->currentText());
+ _settings->setValue("ext-rtp-ip", _ui->sofiaExtRtpIpEdit->text());
+ _settings->setValue("ext-sip-ip", _ui->sofiaExtSipIpEdit->text());
+ _settings->setValue("rtp-timeout-sec", _ui->sofiaRtpTimeoutSecSpin->value());
+ _settings->setValue("rtp-hold-timeout-sec", _ui->sofiaRtpHoldTimeoutSecSpin->value());
+ _settings->setValue("disable-register", _ui->sofiaDisableRegisterCombo->currentText());
+ _settings->setValue("challenge-realm", _ui->sofiaChallengeRealmCombo->currentText());
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> _settings->endGroup();
</span><span class="cx"> _settings->endGroup();
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommresourcesqrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/resources.qrc (16194 => 16195)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/resources.qrc 2010-01-07 06:09:35 UTC (rev 16194)
+++ freeswitch/trunk/fscomm/resources.qrc 2010-01-07 06:43:51 UTC (rev 16195)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> <file alias="example.xml">conf/accounts/example.xml</file>
</span><span class="cx"> <file alias="event_socket.conf.xml">conf/event_socket.conf.xml</file>
</span><span class="cx"> <file alias="portaudio.conf.xml">conf/portaudio.conf.xml</file>
</span><ins>+ <file alias="sofia.conf.xml">conf/sofia.conf.xml</file>
</ins><span class="cx"> </qresource>
</span><span class="cx"> <qresource prefix="/sounds">
</span><span class="cx"> <file alias="test.wav">resources/test.wav</file>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>