matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide descriptive text and further pointer to user if a port group has no ports

Browse Source
This commit is contained in:
Srivats P. 2010-12-27 16:20:30 +05:30
parent 7b673a0d57
commit 71a8140abf
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/portgroup.cpp
View File

@ -67,6 +67,9 @@ PortGroup::PortGroup(QHostAddress ip, quint16 port)
this, SLOT(on_rpcChannel_disconnected())); this, SLOT(on_rpcChannel_disconnected()));
connect(rpcChannel, SIGNAL(error(QAbstractSocket::SocketError)), connect(rpcChannel, SIGNAL(error(QAbstractSocket::SocketError)),
this, SLOT(on_rpcChannel_error(QAbstractSocket::SocketError))); this, SLOT(on_rpcChannel_error(QAbstractSocket::SocketError)));
connect(this, SIGNAL(portListChanged(quint32)),
this, SLOT(when_portListChanged(quint32)), Qt::QueuedConnection);
} }
PortGroup::~PortGroup() PortGroup::~PortGroup()
@ -155,6 +158,23 @@ void PortGroup::on_rpcChannel_error(QAbstractSocket::SocketError socketError)
} }
} }
void PortGroup::when_portListChanged(quint32 /*portGroupId*/)
{
if (state() == QAbstractSocket::ConnectedState && numPorts() <= 0)
{
QMessageBox::warning(NULL, tr("Ostinato"),
QString("The portgroup %1:%2 does not contain any ports!\n\n"
"Packet Transmit/Capture requires elevated privileges. "
"Please ensure that you are running 'drone' - the server "
"component of Ostinato with admin/root OR setuid privilege.\n\n"
"For more information see "
"http://ostinato.googlecode.com/wiki/FAQ#"
"Q._Port_group_has_no_interfaces")
.arg(serverAddress().toString())
.arg(int(serverPort())));
}
}
void PortGroup::processPortIdList(PbRpcController *controller) void PortGroup::processPortIdList(PbRpcController *controller)
{ {
OstProto::PortIdList *portIdList OstProto::PortIdList *portIdList
@ -221,7 +241,7 @@ void PortGroup::processPortConfigList(PbRpcController *controller)
goto _error_exit; goto _error_exit;
} }
emit portListAboutToBeChanged(mPortGroupId); //emit portListAboutToBeChanged(mPortGroupId);
for(int i = 0; i < portConfigList->port_size(); i++) for(int i = 0; i < portConfigList->port_size(); i++)
{ {
@ -232,7 +252,7 @@ void PortGroup::processPortConfigList(PbRpcController *controller)
mPorts[id]->updatePortConfig(portConfigList->mutable_port(i)); mPorts[id]->updatePortConfig(portConfigList->mutable_port(i));
} }
emit portListChanged(mPortGroupId); //emit portListChanged(mPortGroupId);
// FIXME: check if we need new signals since we are not changing the // FIXME: check if we need new signals since we are not changing the
// number of ports, just the port data // number of ports, just the port data
@ -735,6 +755,9 @@ void PortGroup::getPortStats()
if (state() != QAbstractSocket::ConnectedState) if (state() != QAbstractSocket::ConnectedState)
goto _exit; goto _exit;
if (numPorts() <= 0)
goto _exit;
if (isGetStatsPending_) if (isGetStatsPending_)
goto _exit; goto _exit;

2
client/portgroup.h
View File

@ -135,6 +135,8 @@ private slots:
void on_rpcChannel_disconnected(); void on_rpcChannel_disconnected();
void on_rpcChannel_error(QAbstractSocket::SocketError socketError); void on_rpcChannel_error(QAbstractSocket::SocketError socketError);
void when_portListChanged(quint32 portGroupId);
public slots: public slots:
void when_configApply(int portIndex); void when_configApply(int portIndex);