<!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][16476] </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=16476">16476</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-23 00:50:13 -0600 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly remove account. Requires http://jira.freeswitch.org/browse/<a href="http://jira.freeswitch.org/browse/MODENDP-284">MODENDP-284</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommaccounth">freeswitch/trunk/fscomm/account.h</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</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>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountsh">freeswitch/trunk/fscomm/preferences/prefaccounts.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommaccounth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/account.h (16475 => 16476)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.h 2010-01-23 06:17:09 UTC (rev 16475)
+++ freeswitch/trunk/fscomm/account.h 2010-01-23 06:50:13 UTC (rev 16476)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> #define FSCOMM_GW_STATE_FAIL_WAIT 6
</span><span class="cx"> #define FSCOMM_GW_STATE_EXPIRED 7
</span><span class="cx"> #define FSCOMM_GW_STATE_NOREG 8
</span><ins>+#define FSCOMM_GW_STATE_NOAVAIL 9
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> static QString fscomm_gw_state_names[] = {
</span><span class="lines">@@ -23,7 +24,8 @@
</span><span class="cx"> QString("Failed"),
</span><span class="cx"> QString("Failed"),
</span><span class="cx"> QString("Expired"),
</span><del>- QString("Not applicable")
</del><ins>+ QString("Not applicable"),
+ QString("Not available")
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Account {
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16475 => 16476)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-23 06:17:09 UTC (rev 16475)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-23 06:50:13 UTC (rev 16476)
</span><span class="lines">@@ -341,16 +341,9 @@
</span><span class="cx"> {
</span><span class="cx"> QString state = switch_event_get_header_nil(event, "State");
</span><span class="cx"> QString gw = switch_event_get_header_nil(event, "Gateway");
</span><del>- QSharedPointer<Account> acc;
- if (!_accounts.contains(gw))
- {
- Account * accPtr = new Account(gw);
- acc = QSharedPointer<Account>(accPtr);
- _accounts.insert(gw, acc);
- emit newAccount(acc);
- }
- else
- acc = _accounts.value(gw);
</del><ins>+ QSharedPointer<Account> acc = _accounts.value(gw);
+ if (acc.isNull())
+ return;
</ins><span class="cx">
</span><span class="cx"> if (state == "TRYING") {
</span><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_TRYING);
</span><span class="lines">@@ -381,11 +374,21 @@
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- else if (strcmp(event->subclass_name, "fscomm::acc_removed") == 0)
</del><ins>+ else if (strcmp(event->subclass_name, "sofia::gateway_add") == 0)
</ins><span class="cx"> {
</span><del>- QSharedPointer<Account> acc = _accounts.take(switch_event_get_header_nil(event, "acc_name"));
- emit delAccount(acc);
</del><ins>+ QString gw = switch_event_get_header_nil(event, "Gateway");
+ Account * accPtr = new Account(gw);
+ QSharedPointer<Account> acc = QSharedPointer<Account>(accPtr);
+ acc.data()->setState(FSCOMM_GW_STATE_NOAVAIL);
+ _accounts.insert(gw, acc);
+ emit newAccount(acc);
</ins><span class="cx"> }
</span><ins>+ else if (strcmp(event->subclass_name, "sofia::gateway_del") == 0)
+ {
+ QSharedPointer<Account> acc = _accounts.take(switch_event_get_header_nil(event, "Gateway"));
+ if (!acc.isNull())
+ emit delAccount(acc);
+ }
</ins><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> printEventHeaders(event);
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16475 => 16476)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-23 06:17:09 UTC (rev 16475)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-23 06:50:13 UTC (rev 16476)
</span><span class="lines">@@ -111,6 +111,18 @@
</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>+
+ 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());
+ }
+ }
</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="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16475 => 16476)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-23 06:17:09 UTC (rev 16475)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-23 06:50:13 UTC (rev 16476)
</span><span class="lines">@@ -13,11 +13,6 @@
</span><span class="cx"> connect(_ui->sofiaGwEditBtn, SIGNAL(clicked()), this, SLOT(editAccountBtnClicked()));
</span><span class="cx">
</span><span class="cx"> _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
</span><del>-
- if (switch_event_reserve_subclass(FSCOMM_EVENT_ACC_REMOVED) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
- }
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefAccounts::addAccountBtnClicked()
</span><span class="lines">@@ -97,9 +92,14 @@
</span><span class="cx"> QSharedPointer<Account> acc = g_FSHost.getAccountByUUID(item->data(Qt::UserRole).toString());
</span><span class="cx"> if (!acc.isNull())
</span><span class="cx"> {
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "acc_name", acc.data()->getName().toAscii().data());
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "acc_uuid", acc.data()->getUUID().toAscii().data());
- switch_event_fire(&event);
</del><ins>+ QString res;
+ QString arg = QString("profile softphone killgw %1").arg(acc.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",
+ acc.data()->getName().toAscii().data());
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> _ui->accountsTable->removeRow(row-offset);
</span><span class="lines">@@ -108,16 +108,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (offset > 0)
</span><del>- {
- QString res;
- _settings->sync();
- 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;
- }
- readConfig();
- }
</del><ins>+ readConfig(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefAccounts::writeConfig()
</span><span class="lines">@@ -125,7 +116,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PrefAccounts::readConfig()
</del><ins>+void PrefAccounts::readConfig(bool reload)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> _ui->accountsTable->clearContents();
</span><span class="lines">@@ -155,12 +146,15 @@
</span><span class="cx">
</span><span class="cx"> _settings->endGroup();
</span><span class="cx">
</span><del>- QString res;
- _settings->sync();
- if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
</del><ins>+ if (reload)
</ins><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
- return;
</del><ins>+ QString res;
+ _settings->sync();
+ 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;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (_ui->accountsTable->rowCount() == 1)
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.h (16475 => 16476)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-23 06:17:09 UTC (rev 16475)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-23 06:50:13 UTC (rev 16476)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> void writeConfig();
</span><span class="cx">
</span><span class="cx"> public slots:
</span><del>- void readConfig();
</del><ins>+ void readConfig(bool reload=true);
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void addAccountBtnClicked();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>