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

Open Session - Drone on Windows now sends actual /Device/NPF_XXXX as port names - client sets up the ifX style alias and uses that all places; this was needed for comparison of port names while opening sessions for Drones running on Windows

Browse Source
This commit is contained in:
Srivats P 2016-05-18 18:37:48 +05:30
parent 8bea5636ab
commit b6a6b776e1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/port.cpp
View File

@ -81,6 +81,10 @@ void Port::updatePortConfig(OstProto::Port *port)
d.MergeFrom(*port); d.MergeFrom(*port);
// Setup a user-friendly alias for Win32 ports
if (name().startsWith("\\Device\\NPF_"))
setAlias(QString("if%1").arg(id()));
if (recalc) if (recalc)
recalculateAverageRates(); recalculateAverageRates();
} }

5
client/port.h
View File

@ -79,7 +79,8 @@ public:
~Port(); ~Port();
quint32 portGroupId() const { return mPortGroupId; } quint32 portGroupId() const { return mPortGroupId; }
const QString& userAlias() const { return mUserAlias; } const QString userAlias() const
{ return mUserAlias.isEmpty() ? name() : mUserAlias; }
quint32 id() const quint32 id() const
{ return d.port_id().id(); } { return d.port_id().id(); }
@ -103,7 +104,7 @@ public:
{ return avgBitsPerSec_; } { return avgBitsPerSec_; }
//void setAdminEnable(AdminStatus status) { mAdminStatus = status; } //void setAdminEnable(AdminStatus status) { mAdminStatus = status; }
void setAlias(QString &alias) { mUserAlias = alias; } void setAlias(QString alias) { mUserAlias = alias; }
//void setExclusive(bool flag); //void setExclusive(bool flag);
int numStreams() { return mStreams.size(); } int numStreams() { return mStreams.size(); }

3
client/portgroup.cpp
View File

@ -425,7 +425,6 @@ void PortGroup::processPortConfigList(PbRpcController *controller)
{ {
Port *port = mPorts[j]; Port *port = mPorts[j];
// FIXME: How to handle the generated ifX Win32 port names
if (port->name() == pc->port_config().name().c_str()) if (port->name() == pc->port_config().name().c_str())
{ {
if (!port->userName().isEmpty() // rsvd? if (!port->userName().isEmpty() // rsvd?
@ -436,7 +435,7 @@ void PortGroup::processPortConfigList(PbRpcController *controller)
"Port will not be reconfigured.") "Port will not be reconfigured.")
.arg(serverFullName()) .arg(serverFullName())
.arg(j) .arg(j)
.arg(port->name()) .arg(port->userAlias())
.arg(port->userName()); .arg(port->userName());
QMessageBox::warning(NULL, tr("Open Session"), warning); QMessageBox::warning(NULL, tr("Open Session"), warning);
qWarning(qPrintable(warning)); qWarning(qPrintable(warning));

2
client/portmodel.cpp
View File

@ -179,7 +179,7 @@ QVariant PortModel::data(const QModelIndex &index, int role) const
return QString("Port %1: %2 %3(%4)") return QString("Port %1: %2 %3(%4)")
.arg(port->id()) .arg(port->id())
.arg(port->name()) .arg(port->userAlias())
.arg(rsvdBy) .arg(rsvdBy)
.arg(port->description()); .arg(port->description());
} }

4
server/pcapport.cpp
View File

@ -101,12 +101,8 @@ PcapPort::PcapPort(int id, const char *device)
{ {
if (strcmp(device, dev->name) == 0) if (strcmp(device, dev->name) == 0)
{ {
#ifdef Q_OS_WIN32
data_.set_name(QString("if%1").arg(id).toStdString());
#else
if (dev->name) if (dev->name)
data_.set_name(dev->name); data_.set_name(dev->name);
#endif
if (dev->description) if (dev->description)
data_.set_description(dev->description); data_.set_description(dev->description);