<!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][16478] </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=16478">16478</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-23 10:15:59 -0600 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly reload gateway after it has been edited.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#freeswitchtrunkfscommpreferencesaccountdialogcpp">freeswitch/trunk/fscomm/preferences/accountdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountscpp">freeswitch/trunk/fscomm/preferences/prefaccounts.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16477 => 16478)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-23 06:53:30 UTC (rev 16477)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-23 16:15:59 UTC (rev 16478)
</span><span class="lines">@@ -385,6 +385,7 @@
</span><span class="cx"> }
</span><span class="cx"> else if (strcmp(event->subclass_name, "sofia::gateway_del") == 0)
</span><span class="cx"> {
</span><ins>+ qDebug() << "We are deleted...";
</ins><span class="cx"> QSharedPointer<Account> acc = _accounts.take(switch_event_get_header_nil(event, "Gateway"));
</span><span class="cx"> if (!acc.isNull())
</span><span class="cx"> emit delAccount(acc);
</span><span class="lines">@@ -400,6 +401,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FSHost::accountReloadCmd(QSharedPointer<Account> acc)
+{
+ QString res;
+ QString arg = QString("profile softphone killgw %1").arg(acc.data()->getName());
+
+ connect(this, SIGNAL(delAccount(QSharedPointer<Account>)), this, SLOT(accountReloadSlot(QSharedPointer<Account>)));
+
+ if (g_FSHost.sendCmd("sofia", arg.toAscii().data() , &res) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not killgw %s from profile softphone.\n",
+ acc.data()->getName().toAscii().data());
+ }
+ _reloading_Accounts.append(acc.data()->getName());
+
+ qDebug() << "We are reloading...";
+}
+
+void FSHost::accountReloadSlot(QSharedPointer<Account> acc)
+{
+ if (_reloading_Accounts.contains(acc.data()->getName()))
+ {
+ _reloading_Accounts.takeAt(_reloading_Accounts.indexOf(acc.data()->getName(), 0));
+ QString res;
+ if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
+ return;
+ }
+ if (_reloading_Accounts.isEmpty())
+ disconnect(this, SLOT(accountReloadSlot(QSharedPointer<Account>)));
+ qDebug() << "We are rescanning...";
+ }
+}
+
</ins><span class="cx"> switch_status_t FSHost::sendCmd(const char *cmd, const char *args, QString *res)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16477 => 16478)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h 2010-01-23 06:53:30 UTC (rev 16477)
+++ freeswitch/trunk/fscomm/fshost.h 2010-01-23 16:15:59 UTC (rev 16478)
</span><span class="lines">@@ -47,6 +47,7 @@
</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>+ void accountReloadCmd(QSharedPointer<Account> acc);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void run(void);
</span><span class="lines">@@ -63,6 +64,9 @@
</span><span class="cx"> void newAccount(QSharedPointer<Account>);
</span><span class="cx"> void delAccount(QSharedPointer<Account>);
</span><span class="cx">
</span><ins>+private slots:
+ void accountReloadSlot(QSharedPointer<Account>);
+
</ins><span class="cx"> private:
</span><span class="cx"> switch_status_t processBlegEvent(switch_event_t *, QString);
</span><span class="cx"> switch_status_t processAlegEvent(switch_event_t *, QString);
</span><span class="lines">@@ -71,6 +75,7 @@
</span><span class="cx"> QHash<QString, QSharedPointer<Call> > _active_calls;
</span><span class="cx"> QHash<QString, QSharedPointer<Account> > _accounts;
</span><span class="cx"> QHash<QString, QString> _bleg_uuids;
</span><ins>+ QList<QString> _reloading_Accounts;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> extern FSHost g_FSHost;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16477 => 16478)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-23 06:53:30 UTC (rev 16477)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-23 16:15:59 UTC (rev 16478)
</span><span class="lines">@@ -108,21 +108,15 @@
</span><span class="cx">
</span><span class="cx"> void AccountDialog::writeConfig()
</span><span class="cx"> {
</span><ins>+ QSharedPointer<Account> acc = g_FSHost.getAccountByUUID(_accId);
+ if (!acc.isNull())
+ {
+ g_FSHost.accountReloadCmd(acc);
+ }
+
</ins><span class="cx"> _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
</span><span class="cx">
</span><span class="cx"> _settings->beginGroup(_accId);
</span><del>-
- if (!g_FSHost.getAccountByUUID(_accId).isNull())
- {
- QString res;
- QString arg = QString("profile softphone killgw %1").arg(g_FSHost.getAccountByUUID(_accId).data()->getName());
-
- if (g_FSHost.sendCmd("sofia", arg.toAscii().data() , &res) != SWITCH_STATUS_SUCCESS)
- {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not killgw %s from profile softphone.\n",
- g_FSHost.getAccountByUUID(_accId).data()->getName().toAscii().data());
- }
- }
</del><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="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16477 => 16478)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-23 06:53:30 UTC (rev 16477)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-23 16:15:59 UTC (rev 16478)
</span><span class="lines">@@ -149,7 +149,6 @@
</span><span class="cx"> if (reload)
</span><span class="cx"> {
</span><span class="cx"> QString res;
</span><del>- _settings->sync();
</del><span class="cx"> if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>